Commit f873e5cbab48a6d67d1ee51cc65a0e7bb3aba28a - tk8.6

+155

-0

.github/workflows/linux-build.yml less more

	0	name: Linux
	1	on: [push]
	2	defaults:
	3	run:
	4	shell: bash
	5	working-directory: tk/unix
	6	env:
	7	ERROR_ON_FAILURES: 1
	8	jobs:
	9	build:
	10	runs-on: ubuntu-20.04
	11	strategy:
	12	matrix:
	13	compiler:
	14	- "gcc"
	15	- "clang"
	16	symbols:
	17	- "no"
	18	- "mem"
	19	disables:
	20	- ""
	21	- "--disable-shared"
	22	- "--disable-xft"
	23	- "--disable-xss"
	24	steps:
	25	- name: Checkout
	26	uses: actions/checkout@v2
	27	with:
	28	path: tk
	29	- name: Checkout Tcl
	30	uses: actions/checkout@v2
	31	with:
	32	repository: tcltk/tcl
	33	ref: core-8-6-branch
	34	path: tcl
	35	- name: Setup Environment (compiler=${{ matrix.compiler }})
	36	run: \|
	37	sudo apt-get install tcl8.6-dev libxss-dev
	38	mkdir "$HOME/install dir"
	39	touch tk/doc/man.macros tk/generic/tkStubInit.c
	40	echo "CFGOPT=$CFGOPT --with-tcl=/usr/lib/tcl8.6" >> $GITHUB_ENV
	41	echo "CC=$COMPILER" >> $GITHUB_ENV
	42	echo "TOOL_DIR=$(cd tcl/tools;pwd)" >> $GITHUB_ENV
	43	echo "BUILD_CONFIG_ID=$OPTS" >> $GITHUB_ENV
	44	working-directory: "."
	45	env:
	46	CFGOPT: --enable-symbols=${{ matrix.symbols }} ${{ matrix.disables }}
	47	COMPILER: ${{ matrix.compiler }}
	48	OPTS: ${{ matrix.compiler }}-${{ matrix.symbols }}${{ matrix.disables }}
	49	- name: Configure (symbols=${{ matrix.symbols }} opts=${{ matrix.disables }})
	50	run: \|
	51	./configure $CFGOPT "--prefix=$HOME/install dir" \|\| {
	52	cat config.log
	53	echo "::error::Failure during Configure"
	54	exit 1
	55	}
	56	- name: Build
	57	run: \|
	58	make binaries libraries \|\| {
	59	echo "::error::Failure during Build"
	60	exit 1
	61	}
	62	- name: Build Test Harness
	63	run: \|
	64	make tktest \|\| {
	65	echo "::error::Failure during Build"
	66	exit 1
	67	}
	68	- name: Test-Drive Installation
	69	run: \|
	70	make install \|\| {
	71	echo "::error::Failure during Install"
	72	exit 1
	73	}
	74	- name: Create Distribution Package
	75	run: \|
	76	make dist \|\| {
	77	echo "::error::Failure during Distribute"
	78	exit 1
	79	}
	80	- name: Convert Documentation to HTML
	81	run: \|
	82	make html-tk TOOL_DIR=$TOOL_DIR \|\| {
	83	echo "::error::Failure during Distribute"
	84	exit 1
	85	}
	86	- name: Discover Version ID
	87	if: ${{ env.BUILD_CONFIG_ID == 'gcc-no' }}
	88	run: \|
	89	cd /tmp/dist
	90	echo "VERSION=`ls -d tk* \| sed 's/tk//'`" >> $GITHUB_ENV
	91	- name: Upload Source Distribution
	92	if: ${{ env.BUILD_CONFIG_ID == 'gcc-no' }}
	93	uses: actions/upload-artifact@v2
	94	with:
	95	name: Tk ${{ env.VERSION }} Source distribution (unofficial)
	96	path: \|
	97	/tmp/dist/tk*
	98	!/tmp/dist/tk/html/*
	99	- name: Upload Documentation Distribution
	100	if: ${{ env.BUILD_CONFIG_ID == 'gcc-no' }}
	101	uses: actions/upload-artifact@v2
	102	with:
	103	name: Tk ${{ env.VERSION }} HTML documentation (unofficial)
	104	path: /tmp/dist/tk*/html
	105	test:
	106	runs-on: ubuntu-20.04
	107	strategy:
	108	matrix:
	109	compiler:
	110	- "gcc"
	111	symbols:
	112	- "no"
	113	- "mem"
	114	steps:
	115	- name: Checkout
	116	uses: actions/checkout@v2
	117	with:
	118	path: tk
	119	- name: Setup Environment (compiler=${{ matrix.compiler }})
	120	run: \|
	121	sudo apt-get install tcl8.6-dev libxss-dev xvfb
	122	mkdir "$HOME/install dir"
	123	touch tk/doc/man.macros tk/generic/tkStubInit.c
	124	echo "CFGOPT=$CFGOPT --with-tcl=/usr/lib/tcl8.6" >> $GITHUB_ENV
	125	echo "CC=$COMPILER" >> $GITHUB_ENV
	126	working-directory: "."
	127	env:
	128	CFGOPT: --enable-symbols=${{ matrix.symbols }}
	129	COMPILER: ${{ matrix.compiler }}
	130	- name: Configure (symbols=${{ matrix.symbols }})
	131	run: \|
	132	./configure $CFGOPT "--prefix=$HOME/install dir" \|\| {
	133	cat config.log
	134	echo "::error::Failure during Configure"
	135	exit 1
	136	}
	137	- name: Build
	138	run: \|
	139	make binaries libraries tktest \|\| {
	140	echo "::error::Failure during Build"
	141	exit 1
	142	}
	143	- name: Run Tests
	144	run: \|
	145	xvfb-run --auto-servernum make test-classic \| tee out-classic.txt
	146	xvfb-run --auto-servernum make test-ttk \| tee out-ttk.txt
	147	grep -q "Failed 0" out-classic.txt \|\| {
	148	echo "::error::Failure during Test"
	149	exit 1
	150	}
	151	grep -q "Failed 0" out-ttk.txt \|\| {
	152	echo "::error::Failure during Test"
	153	exit 1
	154	}

+152

-0

.github/workflows/mac-build.yml less more

	0	name: macOS
	1	on: [push]
	2	env:
	3	ERROR_ON_FAILURES: 1
	4	jobs:
	5	xcode:
	6	runs-on: macos-11.0
	7	defaults:
	8	run:
	9	shell: bash
	10	working-directory: tk/macosx
	11	steps:
	12	- name: Check out Tk
	13	uses: actions/checkout@v2
	14	with:
	15	path: tk
	16	- name: Check out Tcl
	17	uses: actions/checkout@v2
	18	with:
	19	repository: tcltk/tcl
	20	ref: core-8-6-branch
	21	path: tcl
	22	- name: Prepare checked out repositories
	23	run: \|
	24	touch tk/generic/tkStubInit.c
	25	mkdir build
	26	echo "BUILD_DIR=`cd build && pwd`" >> $GITHUB_ENV
	27	echo "DESTDIR=`cd build && pwd`" >> $GITHUB_ENV
	28	working-directory: .
	29	- name: Build Tcl
	30	run: \|
	31	make all
	32	working-directory: tcl/macosx
	33	- name: Build
	34	run: \|
	35	make all install \|\| {
	36	echo "::error::Failure during Build"
	37	exit 1
	38	}
	39	clang:
	40	runs-on: macos-11.0
	41	strategy:
	42	matrix:
	43	symbols:
	44	- 'no'
	45	- 'mem'
	46	options:
	47	- '--enable-aqua'
	48	- '--disable-aqua'
	49	defaults:
	50	run:
	51	shell: bash
	52	working-directory: tk/unix
	53	steps:
	54	- name: Check out Tk
	55	uses: actions/checkout@v2
	56	with:
	57	path: tk
	58	- name: Check out Tcl
	59	uses: actions/checkout@v2
	60	with:
	61	repository: tcltk/tcl
	62	ref: core-8-6-branch
	63	path: tcl
	64	- name: Prepare checked out repositories
	65	run: \|
	66	touch tkStubInit.c
	67	mkdir "$HOME/install dir"
	68	echo "USE_XVFB=$SET_DISPLAY" >> $GITHUB_ENV
	69	working-directory: tk/generic
	70	env:
	71	SET_DISPLAY: ${{ contains(matrix.options, '--disable-aqua') }}
	72	- name: Add X11 (if required)
	73	if: ${{ env.USE_XVFB }}
	74	# This involves black magic
	75	run: \|
	76	brew cask install xquartz
	77	sudo /opt/X11/lib/X11/xinit/privileged_startx.d/10-tmpdirs \|\| true
	78	working-directory: .
	79	- name: Build Tcl
	80	# Note that macOS is always a 64 bit platform
	81	run: \|
	82	./configure --enable-64bit ${CFGOPT} "--prefix=$HOME/install dir" \|\| {
	83	cat config.log
	84	echo "::error::Failure during Tcl Configure"
	85	exit 1
	86	}
	87	make all \|\| {
	88	echo "::error::Failure during Tcl Build"
	89	exit 1
	90	}
	91	make install \|\| {
	92	echo "::error::Failure during Tcl Install"
	93	exit 1
	94	}
	95	working-directory: tcl/unix
	96	env:
	97	CFGOPT: --enable-symbols=${{ matrix.symbols }}
	98	- name: Configure (symbols=${{ matrix.symbols }} ${{matrix.options }})
	99	# Note that macOS is always a 64 bit platform
	100	run: \|
	101	./configure --enable-64bit ${CFGOPT} "--prefix=$HOME/install dir" \|\| {
	102	cat config.log
	103	echo "::error::Failure during Configure"
	104	exit 1
	105	}
	106	env:
	107	CFGOPT: --enable-symbols=${{ matrix.symbols }} ${{matrix.options }}
	108	- name: Build
	109	run: \|
	110	make all tktest \|\| {
	111	echo "::error::Failure during Build"
	112	exit 1
	113	}
	114	- name: Run Tests
	115	run: \|
	116	if [ $USE_XVFB == true ]; then
	117	function runXvfb {
	118	PATH=$PATH:/opt/X11/bin
	119	Xvfb $1 &
	120	XVFB_PID=$!
	121	echo Launched Xvfb $1 as process $XVFB_PID >&2
	122	trap "echo killing process $XVFB_PID... >&2; kill $XVFB_PID" 0
	123	export DISPLAY=$1
	124	sleep 2
	125	}
	126	else
	127	function runXvfb {
	128	: do nothing
	129	}
	130	fi
	131	( runXvfb :0; make test-classic; exit $? ) \| tee out-classic.txt \|\| {
	132	echo "::error::Failure during Test"
	133	exit 1
	134	}
	135	( runXvfb :0; make test-ttk; exit $? ) \| tee out-ttk.txt \|\| {
	136	echo "::error::Failure during Test"
	137	exit 1
	138	}
	139	cat out-classic.txt out-ttk.txt \| grep -q "Failed[[:space:]][[:space:]]*[1-9]" && {
	140	echo "::error::Failure during Test"
	141	exit 1
	142	}
	143	env:
	144	MAC_CI: 1
	145	- name: Carry out trial installation
	146	run: \|
	147	make install \|\| {
	148	cat config.log
	149	echo "::error::Failure during Install"
	150	exit 1
	151	}

+158

-0

.github/workflows/win-build.yml less more

	0	name: Windows
	1	on: [push]
	2	env:
	3	ERROR_ON_FAILURES: 1
	4	jobs:
	5	msvc:
	6	runs-on: windows-2019
	7	defaults:
	8	run:
	9	shell: powershell
	10	working-directory: tk/win
	11	# Using powershell means we need to explicitly stop on failure
	12	steps:
	13	- name: Checkout
	14	uses: actions/checkout@v2
	15	with:
	16	path: tk
	17	- name: Checkout
	18	uses: actions/checkout@v2
	19	with:
	20	repository: tcltk/tcl
	21	ref: core-8-6-branch
	22	path: tcl
	23	- name: Init MSVC
	24	uses: ilammy/msvc-dev-cmd@v1
	25	- name: Make Install Location
	26	working-directory: tcl
	27	run: \|
	28	echo "TCLDIR=`pwd`" >> $GITHUB_ENV
	29	cd ..
	30	mkdir install
	31	cd install
	32	echo "INSTALLDIR=`pwd`" >> $GITHUB_ENV
	33	- name: Build Tcl
	34	run: \|
	35	&nmake -f makefile.vc release install
	36	if ($lastexitcode -ne 0) {
	37	throw "nmake exit code: $lastexitcode"
	38	}
	39	working-directory: tcl/win
	40	- name: Build
	41	run: \|
	42	&nmake -f makefile.vc all
	43	if ($lastexitcode -ne 0) {
	44	throw "nmake exit code: $lastexitcode"
	45	}
	46	- name: Build Test Harness
	47	run: \|
	48	&nmake -f makefile.vc tktest
	49	if ($lastexitcode -ne 0) {
	50	throw "nmake exit code: $lastexitcode"
	51	}
	52	- name: Run Tests
	53	run: \|
	54	nmake -f makefile.vc test-classic \| tee out-classic.txt \|\| {
	55	echo "::error::Failure during Test"
	56	exit 1
	57	}
	58	nmake -f makefile.vc test-ttk \| tee out-ttk.txt \|\| {
	59	echo "::error::Failure during Test"
	60	exit 1
	61	}
	62	grep -q "Failed 0" out-classic.txt \|\| {
	63	echo "::error::Failure during Test"
	64	exit 1
	65	}
	66	grep -q "Failed 0" out-ttk.txt \|\| {
	67	echo "::error::Failure during Test"
	68	exit 1
	69	}
	70	env:
	71	CI_BUILD_WITH_MSVC: 1
	72	shell: bash
	73	- name: Build Help
	74	run: \|
	75	&nmake -f makefile.vc htmlhelp
	76	if ($lastexitcode -ne 0) {
	77	throw "nmake exit code: $lastexitcode"
	78	}
	79	- name: Install
	80	run: \|
	81	&nmake -f makefile.vc install
	82	if ($lastexitcode -ne 0) {
	83	throw "nmake exit code: $lastexitcode"
	84	}
	85	gcc:
	86	runs-on: windows-2019
	87	defaults:
	88	run:
	89	shell: bash
	90	working-directory: win
	91	strategy:
	92	matrix:
	93	symbols:
	94	- "no"
	95	- "mem"
	96	- "all"
	97	# Using powershell means we need to explicitly stop on failure
	98	steps:
	99	- name: Checkout
	100	uses: actions/checkout@v2
	101	- name: Checkout
	102	uses: actions/checkout@v2
	103	with:
	104	repository: tcltk/tcl
	105	ref: core-8-6-branch
	106	path: tcl
	107	- name: Install MSYS2, Make
	108	run: choco install -y msys2 make
	109	- name: Prepare
	110	run: \|
	111	touch tkStubInit.c
	112	touch "${HOME}/forWinDialog-5.12.7"
	113	mkdir "${HOME}/install_dir"
	114	echo "INSTALL_DIR=${HOME}/install_dir" >> $GITHUB_ENV
	115	working-directory: generic
	116	- name: Configure and Build Tcl
	117	run: \|
	118	./configure ${CFGOPT} "--prefix=$INSTALL_DIR" \|\| {
	119	cat config.log
	120	echo "::warning::Failure during Tcl Configure"
	121	exit 1
	122	}
	123	make all install \|\| {
	124	echo "::warning::Failure during Tcl Build"
	125	exit 1
	126	}
	127	echo "TCL_CONFIG_PATH=`pwd`" >> $GITHUB_ENV
	128	env:
	129	CFGOPT: --enable-64bit --enable-symbols=${{ matrix.symbols }}
	130	working-directory: tcl/win
	131	- name: Configure (symbols=${{ matrix.symbols }})
	132	run: \|
	133	./configure ${CFGOPT} "--prefix=$HOME/INSTALL_DIR" "--with-tcl=$TCL_CONFIG_PATH" \|\| {
	134	cat config.log
	135	echo "::error::Failure during Configure"
	136	exit 1
	137	}
	138	env:
	139	CFGOPT: --enable-64bit --enable-symbols=${{ matrix.symbols }}
	140	- name: Build
	141	run: \|
	142	make all tktest \|\| {
	143	echo "::error::Failure during Build"
	144	exit 1
	145	}
	146	- name: Run Tests
	147	run: \|
	148	make test-classic \| tee out-classic.txt
	149	make test-ttk \| tee out-ttk.txt
	150	grep -q "Failed 0" out-classic.txt \|\| {
	151	echo "::error::Failure during Test"
	152	exit 1
	153	}
	154	grep -q "Failed 0" out-ttk.txt \|\| {
	155	echo "::error::Failure during Test"
	156	exit 1
	157	}

+236

-0

.travis.yml less more

	0	language: c
	1	addons:
	2	apt:
	3	sources:
	4	- ubuntu-toolchain-r-test
	5	packages:
	6	- binutils-mingw-w64-i686
	7	- binutils-mingw-w64-x86-64
	8	- gcc-mingw-w64
	9	- gcc-mingw-w64-base
	10	- gcc-mingw-w64-i686
	11	- gcc-mingw-w64-x86-64
	12	- gcc-multilib
	13	- tcl8.6-dev
	14	- libx11-dev
	15	- libxss-dev
	16	- xvfb
	17	homebrew:
	18	packages:
	19	- tcl-tk
	20	# casks:
	21	# - xquartz
	22	jobs:
	23	include:
	24	# Testing on Linux GCC
	25	- name: "Linux/GCC/Shared"
	26	os: linux
	27	dist: focal
	28	services:
	29	- xvfb
	30	compiler: gcc
	31	env:
	32	- BUILD_DIR=unix
	33	script: &x11gui
	34	- make binaries libraries tktest
	35	- make install
	36	- make test-classic >out-classic.txt
	37	- cat out-classic.txt
	38	- grep -q "Failed 0" out-classic.txt
	39	- make test-ttk >out-ttk.txt
	40	- cat out-ttk.txt
	41	- grep -q "Failed 0" out-ttk.txt
	42	- name: "Linux/GCC/Shared/no-xft"
	43	os: linux
	44	dist: focal
	45	services:
	46	- xvfb
	47	compiler: gcc
	48	env:
	49	- BUILD_DIR=unix
	50	- CFGOPT="--disable-xft"
	51	script: *x11gui
	52	- name: "Linux/GCC/Shared/bionic"
	53	os: linux
	54	dist: bionic
	55	services:
	56	- xvfb
	57	compiler: gcc
	58	env:
	59	- BUILD_DIR=unix
	60	script: *x11gui
	61	- name: "Linux/GCC/Shared/xenial"
	62	os: linux
	63	dist: xenial
	64	services:
	65	- xvfb
	66	compiler: gcc
	67	env:
	68	- BUILD_DIR=unix
	69	script: *x11gui
	70	- name: "Linux/GCC/Static"
	71	os: linux
	72	dist: focal
	73	compiler: gcc
	74	env:
	75	- BUILD_DIR=unix
	76	- CFGOPT="--disable-shared"
	77	- name: "Linux/GCC/Debug"
	78	os: linux
	79	dist: focal
	80	compiler: gcc
	81	env:
	82	- BUILD_DIR=unix
	83	- CFGOPT="--enable-symbols"
	84	# Newer/Older versions of GCC
	85	- name: "Linux/GCC 10/Shared"
	86	os: linux
	87	dist: focal
	88	compiler: gcc-10
	89	addons:
	90	apt:
	91	packages:
	92	- g++-10
	93	env:
	94	- BUILD_DIR=unix
	95	- name: "Linux/GCC 5/Shared"
	96	os: linux
	97	dist: bionic
	98	compiler: gcc-5
	99	addons:
	100	apt:
	101	packages:
	102	- g++-5
	103	env:
	104	- BUILD_DIR=unix
	105	# Testing on Linux Clang
	106	- name: "Linux/Clang/Shared"
	107	os: linux
	108	dist: focal
	109	compiler: clang
	110	env:
	111	- BUILD_DIR=unix
	112	- name: "Linux/Clang/Shared/no-xft"
	113	os: linux
	114	dist: focal
	115	compiler: clang
	116	env:
	117	- BUILD_DIR=unix
	118	- CFGOPT="--disable-xft"
	119	- name: "Linux/Clang/Static"
	120	os: linux
	121	dist: focal
	122	compiler: clang
	123	env:
	124	- CFGOPT="--disable-shared"
	125	- BUILD_DIR=unix
	126	- name: "Linux/Clang/Debug"
	127	os: linux
	128	dist: focal
	129	compiler: clang
	130	env:
	131	- BUILD_DIR=unix
	132	- CFGOPT="--enable-symbols"
	133	# Testing on Mac, various styles
	134	- name: "macOS/Xcode 12/Shared"
	135	os: osx
	136	osx_image: xcode12
	137	env:
	138	- BUILD_DIR=unix
	139	- CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include"
	140	- name: "macOS/Xcode 12/Static"
	141	os: osx
	142	osx_image: xcode12
	143	env:
	144	- BUILD_DIR=unix
	145	- CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua --disable-shared CFLAGS=-I/usr/local/opt/tcl-tk/include"
	146	- name: "macOS/Xcode 12/Debug"
	147	os: osx
	148	osx_image: xcode12
	149	env:
	150	- BUILD_DIR=unix
	151	- CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua --enable-symbols CFLAGS=-I/usr/local/opt/tcl-tk/include"
	152	# - name: "macOS/Xcode 12/Shared/XQuartz"
	153	# os: osx
	154	# osx_image: xcode12
	155	# env:
	156	# - BUILD_DIR=unix
	157	# - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --disable-corefoundation --x-includes=/opt/X11/include --x-libraries=/opt/X11/lib CFLAGS=-I/usr/local/opt/tcl-tk/include"
	158	# Older MacOS versions
	159	- name: "macOS/Xcode 11/Shared"
	160	os: osx
	161	osx_image: xcode11.7
	162	env:
	163	- BUILD_DIR=unix
	164	- CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include CPPFLAGS=-mmacosx-version-min=10.14"
	165	- name: "macOS/Xcode 10/Shared"
	166	os: osx
	167	osx_image: xcode10.3
	168	addons:
	169	homebrew:
	170	packages:
	171	- tcl-tk
	172	update: true
	173	env:
	174	- BUILD_DIR=unix
	175	- CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include CPPFLAGS=-mmacosx-version-min=10.14"
	176	- name: "macOS/Xcode 9/Shared"
	177	os: osx
	178	osx_image: xcode9.4
	179	addons:
	180	homebrew:
	181	packages:
	182	- tcl-tk
	183	update: true
	184	env:
	185	- BUILD_DIR=unix
	186	- CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include CPPFLAGS=-mmacosx-version-min=10.13"
	187	# Test on Windows with MSVC native
	188	# - name: "Windows/MSVC/Shared"
	189	# os: windows
	190	# compiler: cl
	191	# env: &vcenv
	192	# - BUILD_DIR=win
	193	# - VCDIR="/C/Program Files (x86)/Microsoft Visual Studio/2017/BuildTools/VC/Auxiliary/Build"
	194	# before_install: &vcpreinst
	195	# - PATH="$PATH:$VCDIR"
	196	# - cd ${BUILD_DIR}
	197	# install: []
	198	# script:
	199	# - cmd.exe //C vcvarsall.bat x64 '&&' nmake '-f' makefile.vc all tktest
	200	# "make dist" only
	201	- name: "Linux: make dist"
	202	os: linux
	203	dist: focal
	204	compiler: gcc
	205	env:
	206	- BUILD_DIR=unix
	207	script:
	208	- touch ../doc/man.macros
	209	- make dist
	210	before_install:
	211	- \|-
	212	case $TRAVIS_OS_NAME in
	213	windows)
	214	choco install -y magicsplat-tcl-tk
	215	;;
	216	esac
	217	- cd ${BUILD_DIR}
	218	install:
	219	- mkdir "$HOME/install dir"
	220	- ./configure ${CFGOPT} "--prefix=$HOME/install dir" \|\| (cat config.log && exit 1)
	221	script:
	222	- make binaries libraries tktest
	223	- make install
	224	before_cache:
	225	- \|-
	226	case $TRAVIS_OS_NAME in
	227	osx)
	228	brew cleanup
	229	;;
	230	esac
	231	cache:
	232	directories:
	233	- $HOME/Library/Caches/Homebrew
	234	- $HOME/AppData/Local/Temp/chocolatey
	235	- $HOME/AppData/Local/Apps/Tcl86

+6

-3

README.md less more

0	0	# README: Tk
1	1
2		This is the Tk 8.6.10 source distribution.
	2	This is the Tk 8.6.11 source distribution.
3	3
4	4	You can get any source release of Tk from [our distribution
5	5	site](https://sourceforge.net/projects/tcl/files/Tcl/).
6	6
	7	[![Build Status](https://github.com/tcltk/tk/workflows/Linux/badge.svg?branch=core-8-6-branch)](https://github.com/tcltk/tk/actions?query=workflow%3A%22Linux%22+branch%3Acore-8-6-branch)
	8	[![Build Status](https://github.com/tcltk/tk/workflows/Windows/badge.svg?branch=core-8-6-branch)](https://github.com/tcltk/tk/actions?query=workflow%3A%22Windows%22+branch%3Acore-8-6-branch)
	9	[![Build Status](https://github.com/tcltk/tk/workflows/macOS/badge.svg?branch=core-8-6-branch)](https://github.com/tcltk/tk/actions?query=workflow%3A%22macOS%22+branch%3Acore-8-6-branch)
7	10
8	11	## <a id="intro">1.</a> Introduction
9	12

17	20
18	21	Tk is maintained, enhanced, and distributed freely by the Tcl community.
19	22	Source code development and tracking of bug reports and feature requests
20		takes place at [core.tcl-lang.org](https://core.tcl-lang.org/).
	23	take place at [core.tcl-lang.org](https://core.tcl-lang.org/).
21	24	Tcl/Tk release and mailing list services are [hosted by
22	25	SourceForge](https://sourceforge.net/projects/tcl/)
23	26	with the Tcl Developer Xchange hosted at
24	27	[www.tcl-lang.org](https://www.tcl-lang.org).
25	28
26		Tk is a freely available open source package. You can do virtually
	29	Tk is a freely available open-source package. You can do virtually
27	30	anything you like with it, such as modifying it, redistributing it,
28	31	and selling it either in whole or in part. See the file
29	32	`license.terms` for complete information.

+147

-3

changes less more

7571	7571
7572	7572	2018-11-19 (bug)[0a9c91] crash in text-11a.22 (vogel)
7573	7573
7574		2018-11-20 (bug)[9705d1] crash activating "Alt" theme (culler)
7575
7576		2018-11-24 (bug)[e3b954] cursor offset at full screen display (culler)
	7574	2018-11-20 (bug)[9705d1] crash activating "Alt" theme (culler)
	7575
	7576	2018-11-24 (bug)[e3b954] cursor offset at full screen display (culler)
7577	7577
7578	7578	2019-01-04 (bug)[18a4ba] cross-platform [winfo containing] (culler)
7579	7579

7697	7697	2019-11-19 (new) Partial Emoji support in text displays (nijtmans,culler)
7698	7698
7699	7699	- Released 8.6.10, Nov 21, 2019 - https://core.tcl-lang.org/tk/ for details
	7700
	7701	2019-11-25 (bug)[a95373] TkKeyEvent platform variations (werner)
	7702
	7703	2019-11-26 (bug) workaround Win bug so test bind-34.3 passes (nijtmans)
	7704
	7705	2019-12-03 Aqua: white cursors in dark mode (culler)
	7706
	7707	2019-12-04 (bug)[749bd9] Aqua: systemControlAccentColor (bll,culler)
	7708
	7709	2019-12-14 (bug)[b3b56a] ttk respect -cursor option (vogel)
	7710
	7711	2019-12-14 (bug)[b094cb] Win: $tv -show grows widget width 1 pixel (vogel)
	7712
	7713	2019-12-14 (bug)[02a694] spinbox options used wrong db names (vogel)
	7714
	7715	2020-01-11 (bug)[2b8fa6] MouseWheel for ttk::scrollbar (oehlmann)
	7716
	7717	2020-01-18 (bug)[1771594] icursor and scrollregion, canvText-14.7 (vogel)
	7718
	7719	2020-01-18 (bug)[587937] tag list ops preserve list order (vogel)
	7720
	7721	2020-01-18 (bug)[2830360] lose invalid state at focus event, entry-10.1 (vogel)
	7722
	7723	2020-01-18 (bug)[077d49] string table options support null ok (vogel)
	7724
	7725	2020-01-18 (bug)[bf93d0] Aqua: unresponsive menubar (culler)
	7726
	7727	2020-01-31 (bug)[a196fb] restore support for unthreaded Tcl (porter,sebres)
	7728
	7729	2020-02-09 (bug)[90a4d7] fontconfig crash when no font installed (vogel)
	7730
	7731	2020-02-24 (bug) Aqua: incomplete floating window display (walzer)
	7732
	7733	2020-03-11 (bug)[fb2ec3] OSX 10.15+: full screen options (nicolas,walzer)
	7734
	7735	2020-03-12 (bug)[08e2f8] focus on unmapped windows, focus-7.1 (vogel)
	7736
	7737	2020-03-12 (bug)[2edd84] [$c postscript] result management (gavilan)
	7738
	7739	2020-03-22 (bug)[98662d] restore TK_MAC_DEBUG_DRAWING build (chavez)
	7740
	7741	2020-03-29 (bug)[655fe2] tearoff menu redraw artifacts (vogel)
	7742
	7743	2020-04-03 (bug)[efbedd] Aqua: compund button-like widget appearance (chavez)
	7744
	7745	2020-04-14 (bug)[87bade] Aqua: improved dealing with PressAndHold (culler)
	7746
	7747	2020-04-14 (bug)[376788] X: stop crash w/Noto Color Emoji font (nijtmans)
	7748
	7749	2020-04-15 (bug)[89354d] Aqua: text color w/o clipping (culler)
	7750
	7751	2020-04-15 (new) Aqua: assign Button 3 to the middle button (chavez)
	7752
	7753	2020-04-25 (bug)[3519111] treeview horizontal scroll, entry-2.1.1 (vogel)
	7754
	7755	2020-04-25 (bug)[141881] treeview vertical scroll, treeview-9.2 (vogel)
	7756
	7757	2020-05-01 (bug)[2712f4] X: crash angled text w/o Xft, canvText-20.2 (vogel)
	7758
	7759	2020-05-01 (bug)[cd8714] Win: long angled text (chavez)
	7760
	7761	2020-05-09 (bug)[88c9e0] treeview -selectmode none focus ring (gavilan)
	7762
	7763	2020-05-12 (new) Aqua: Rewrite of the Key event system (culler)
	7764
	7765	2020-05-12 (bug)[411359] Aqua: stop crashes/zombies related to TouchBar (culler)
	7766
	7767	2020-05-12 (new) Aqua: systemLinkColor (chavez)
	7768
	7769	2020-05-16 (bug)[40ada9] crash when active button is destroyed (chavez)
	7770
	7771	2020-05-28 (bug)[3c6660,601cea,4b50b7] Win10: ttk scale (nemethi,lanam)
	7772
	7773	2020-06-08 (bug)[2790615] Some callbacks not eval'd in global scope (nijtmans)
	7774
	7775	2020-06-25 Aqua: Update OSX version tests to support Big Sur (culler)
	7776
	7777	2020-06-27 (bug)[6920b2] dup in spinbox -values causes trouble (lanam)
	7778
	7779	2020-06-27 (bug)[5c51be] invalid mem read buffer in Tk_PhotoPut* (chavez)
	7780
	7781	2020-06-27 (bug)[16ef16] restore bind sequence support, bind-33.(16-21) (vogel)
	7782
	7783	2020-07-02 (bug)[2d2459] default style for combobox (bll)
	7784
	7785	2020-07-06 (bug)[40c4bf] double free, entry-19.21 (vogel)
	7786
	7787	2020-07-06 (bug)[e3888d] grab & warp, bind-36.1 (vogel)
	7788
	7789	2020-07-12 (bug)[2442314] fontchooser i18n (nijtmans)
	7790
	7791	2020-07-13 (bug)[7655f6] [*entry]: selected text drawing reform (chavez)
	7792
	7793	2020-07-14 (bug)[09abd7] workaround invalid key codes from Debian 10 (vogel)
	7794
	7795	2020-07-20 (bug)[cf3853] Aqua: improve bounds on non-Retina displays (chavez)
	7796
	7797	2020-08-01 Aqua: [winfo rgb] light and dark mode support (culler)
	7798
	7799	2020-08-15 (bug)[315104] Aqua: appearance change virtual events (culler)
	7800
	7801	2020-08-21 (bug)[291699] mouse binding for scrollbar grip (bll)
	7802
	7803	2020-09-08 (bug)[6c2425] buffer bounds violation (chavez)
	7804
	7805	2020-09-08 (bug)[2a6d63] OSX 10.6 crash (hellstrom,culler)
	7806
	7807	2020-09-08 (bug)[420feb] undefined behavior due to alignment (chavez,nijtmans)
	7808
	7809	2020-09-10 (bug)[ab1fea] Aqua init issues (culler)
	7810
	7811	2020-09-14 (bug)[71e18c] Aqua: crash in full screen toggle (culler)
	7812
	7813	2020-09-18 (bug)[4f4f03] Aqua: mouse drags across title bar (nab,culler)
	7814
	7815	2020-09-21 (bug)[d91e05] select/copy in disabled text (bll)
	7816
	7817	2020-09-27 (TIP #581) disfavor Master/Slave terminology (nijtmans)
	7818
	7819	2020-09-30 (bug)[59cba3] win: improve theme detection (bll,nijtmans)
	7820
	7821	2020-10-06 (bug)[175a6e] Aqua: support tiled windows (culler)
	7822
	7823	2020-10-07 (bug)[1fa8c3] Aqua: crash on resize during display (nab,culler)
	7824
	7825	2020-10-16 (bug)[c2483b] Aqua: consistent finalization (culler,nijtmans)
	7826
	7827	2020-11-06 (bug)[c9ebac] Aqua: use standard about dialog (culler)
	7828
	7829	2020-11-07 (bug)[4ebcc0] sticky fontchooser options (roseman,vogel)
	7830
	7831	2020-11-10 (bug)[f9fa92] Aqua: crash in color caching scheme (culler)
	7832
	7833	2020-11-20 (bug)[7185d2] Aqua: fixes to special menu support (culler)
	7834
	7835	2020-11-24 (bug)[4a40c6] Aqua: [wm manage] frame offset (chavez)
	7836
	7837	2020-12-04 (bug)[3ef77f] Aqua dark mode combobox focus ring (walzer,culler)
	7838
	7839	2020-12-15 (bug)[80e4c6] Aqua: progressbar animation (nab,culler)
	7840
	7841	2020-12-24 (bug)[6157a8] Aqua: file dialog -filetypes (davis,culler)
	7842
	7843	- Released 8.6.11, Dec 31, 2020 - https://core.tcl-lang.org/tk/ for details

+6

-1

compat/stdlib.h less more

2	2	*
3	3	* Declares facilities exported by the "stdlib" portion of the C library.
4	4	* This file isn't complete in the ANSI-C sense; it only declares things
5		* that are needed by Tcl. This file is needed even on many systems with
	5	* that are needed by Tk. This file is needed even on many systems with
6	6	* their own stdlib.h (e.g. SunOS) because not all stdlib.h files declare
7	7	* all the procedures needed here (such as strtod).
8	8	*

16	16	#ifndef _STDLIB
17	17	#define _STDLIB
18	18
	19	#ifndef _TCL
	20	# include <tcl.h>
	21	#endif
	22
19	23	extern void abort(void);
20	24	extern double atof(const char *string);
21	25	extern int atoi(const char *string);

28	32	extern void qsort(void base, int n, int size, int (compar)(
29	33	const void element1, const void element2));
30	34	extern char * realloc(char *ptr, unsigned int numBytes);
	35	extern double strtod(const char string, char *endPtr);
31	36	extern long strtol(const char string, char *endPtr, int base);
32	37	extern unsigned long strtoul(const char string, char *endPtr, int base);
33	38

+6

-2

compat/unistd.h less more

14	14	#define _UNISTD
15	15
16	16	#include <sys/types.h>
	17	#ifndef _TCL
	18	# include <tcl.h>
	19	#endif
17	20
18	21	#ifndef NULL
19	22	#define NULL 0

36	39	extern int execlp(const char *file, ...);
37	40	extern int execv(const char path, char *argv);
38	41	extern int execve(const char path, char argv, char *envp);
39		extern int execvpw(const char file, char *argv);
	42	extern int execvp(const char file, char *argv);
40	43	extern pid_t fork(void);
41	44	extern char * getcwd(char *buf, size_t size);
42	45	extern gid_t getegid(void);

64	67	extern int ioctl(int fd, int request, ...);
65	68	extern int readlink(const char path, char buf, int bufsize);
66	69	extern int setegid(gid_t group);
67		extern int seteuidw(uid_t user);
	70	extern int seteuid(uid_t user);
68	71	extern int setreuid(int ruid, int euid);
69	72	extern int symlink(const char , const char );
70	73	extern int ttyslot(void);

73	76	#endif /* _POSIX_SOURCE */
74	77
75	78	#endif /* _UNISTD */
	79

+34

-21

doc/CrtImgType.3 less more

8	8	.so man.macros
9	9	.BS
10	10	.SH NAME
11		Tk_CreateImageType, Tk_GetImageMasterData, Tk_InitImageArgs \- define new kind of image
	11	Tk_CreateImageType, Tk_GetImageMasterData, Tk_GetImageModelData, Tk_InitImageArgs \- define new kind of image
12	12	.SH SYNOPSIS
13	13	.nf
14	14	\fB#include <tk.h>\fR

17	17	.sp
18	18	ClientData
19	19	\fBTk_GetImageMasterData\fR(\fIinterp, name, typePtrPtr\fR)
	20	.sp
	21	.VS "TIP 581"
	22	ClientData
	23	\fBTk_GetImageModelData\fR(\fIinterp, name, typePtrPtr\fR)
	24	.VE "TIP 581"
20	25	.sp
21	26	\fBTk_InitImageArgs\fR(\fIinterp, argc, argvPtr\fR)
22	27	.SH ARGUMENTS

70	75	of this entry.
71	76	.PP
72	77	The second major data structure manipulated by an image manager
73		is called an \fIimage master\fR; it contains overall information
	78	is called an \fIimage model\fR; it contains overall information
74	79	about a particular image, such as the values of the configuration
75	80	options specified in an \fBimage create\fR command.
76	81	There will usually be one of these structures for each

112	117	int \fIobjc\fR,
113	118	Tcl_Obj *const \fIobjv\fR[],
114	119	const Tk_ImageType *\fItypePtr\fR,
115		Tk_ImageMaster \fImaster\fR,
116		ClientData *\fImasterDataPtr\fR);
	120	Tk_ImageMaster \fImodel\fR,
	121	ClientData *\fImodelDataPtr\fR);
117	122	.CE
118	123	The \fIinterp\fR argument is the interpreter in which the \fBimage\fR
119	124	command was invoked, and \fIname\fR is the name for the new image,

122	127	The \fIobjc\fR and \fIobjv\fR arguments describe all the configuration
123	128	options for the new image (everything after the name argument to
124	129	\fBimage\fR).
125		The \fImaster\fR argument is a token that refers to Tk's information
	130	The \fImodel\fR argument is a token that refers to Tk's information
126	131	about this image; the image manager must return this token to
127	132	Tk when invoking the \fBTk_ImageChanged\fR procedure.
128	133	Typically \fIcreateProc\fR will parse \fIobjc\fR and \fIobjv\fR
129		and create an image master data structure for the new image.
	134	and create an image model data structure for the new image.
130	135	\fIcreateProc\fR may store an arbitrary one-word value at
131		*\fImasterDataPtr\fR, which will be passed back to the
	136	*\fImodelDataPtr\fR, which will be passed back to the
132	137	image manager when other callbacks are invoked.
133		Typically the value is a pointer to the master data
	138	Typically the value is a pointer to the model data
134	139	structure for the image.
135	140	.PP
136	141	If \fIcreateProc\fR encounters an error, it should leave an error

147	152	.CS
148	153	typedef ClientData \fBTk_ImageGetProc\fR(
149	154	Tk_Window \fItkwin\fR,
150		ClientData \fImasterData\fR);
	155	ClientData \fImodelData\fR);
151	156	.CE
152	157	The \fItkwin\fR argument identifies the window in which the
153		image will be used and \fImasterData\fR is the value
154		returned by \fIcreateProc\fR when the image master was created.
	158	image will be used and \fImodelData\fR is the value
	159	returned by \fIcreateProc\fR when the image model was created.
155	160	\fIgetProc\fR will usually create a data structure for the new
156	161	instance, including such things as the resources needed to
157	162	display the image in the given window.

220	225	\fIdeleteProc\fR must match the following prototype:
221	226	.CS
222	227	typedef void \fBTk_ImageDeleteProc\fR(
223		ClientData \fImasterData\fR);
224		.CE
225		The \fImasterData\fR argument will be the same as the value
226		stored in \fI*masterDataPtr\fR by \fIcreateProc\fR when the
	228	ClientData \fImodelData\fR);
	229	.CE
	230	The \fImodelData\fR argument will be the same as the value
	231	stored in \fI*modelDataPtr\fR by \fIcreateProc\fR when the
227	232	image was created.
228	233	\fIdeleteProc\fR should release any resources associated with
229	234	the image.
230		.SH TK_GETIMAGEMASTERDATA
	235	.SH TK_GETIMAGEMODELDATA
231	236	.PP
232	237	The procedure \fBTk_GetImageMasterData\fR may be invoked to retrieve
233	238	information about an image. For example, an image manager can use this
234		procedure to locate its image master data for an image.
	239	procedure to locate its image model data for an image.
235	240	If there exists an image named \fIname\fR
236	241	in the interpreter given by \fIinterp\fR, then \fI*typePtrPtr\fR is
237	242	filled in with type information for the image (the \fItypePtr\fR value
238	243	passed to \fBTk_CreateImageType\fR when the image type was registered)
239	244	and the return value is the ClientData value returned by the
240	245	\fIcreateProc\fR when the image was created (this is typically a
241		pointer to the image master data structure). If no such image exists
	246	pointer to the image model data structure). If no such image exists
242	247	then NULL is returned and NULL is stored at \fI*typePtrPtr\fR.
	248	.PP
	249	.VS "TIP 581"
	250	\fBTk_GetImageModelData\fR is synonym for \fBTk_GetImageMasterData\fR
	251	.VE "TIP 581"
243	252	.SH "LEGACY INTERFACE SUPPORT"
244	253	.PP
245	254	In Tk 8.2 and earlier, the definition of \fBTk_ImageCreateProc\fR

251	260	int \fIargc\fR,
252	261	char **\fIargv\fR,
253	262	Tk_ImageType *\fItypePtr\fR,
254		Tk_ImageMaster \fImaster\fR,
255		ClientData *\fImasterDataPtr\fR);
	263	Tk_ImageMaster \fImodel\fR,
	264	ClientData *\fImodelDataPtr\fR);
256	265	.CE
257	266	Legacy programs and libraries dating from those days may still
258	267	contain code that defines extended Tk image types using the old
259	268	interface. The Tk header file will still support this legacy
260	269	interface if the code is compiled with the macro \fBUSE_OLD_IMAGE\fR
261	270	defined.
	271	.PP
	272	.VS "TIP 581"
	273	\fITk_ImageModel\fR is synonym for \fITk_ImageMaster\fR
	274	.VE "TIP 581"
262	275	.PP
263	276	When the \fBUSE_OLD_IMAGE\fR legacy support is enabled, you may
264	277	see the routine \fBTk_InitImageArgs\fR in use. This was a migration

279	292	.SH "SEE ALSO"
280	293	Tk_ImageChanged, Tk_GetImage, Tk_FreeImage, Tk_RedrawImage, Tk_SizeOfImage
281	294	.SH KEYWORDS
282		image manager, image type, instance, master
	295	image manager, image type, instance, model

+2

-2

doc/GetScroll.3 less more

24	24	Interpreter to use for error reporting.
25	25	.AP int objc in
26	26	Number of Tcl_Obj's in \fIobjv\fR array.
27		.AP "Tcl_Obj *const" objv[] in
	27	.AP "Tcl_Obj const " objv in
28	28	Argument objects. These represent the entire widget command, of
29	29	which the first word is typically the widget name and the second
30	30	word is typically \fBxview\fR or \fByview\fR.
31	31	.AP int argc in
32	32	Number of strings in \fIargv\fR array.
33		.AP "const char" *argv[] in
	33	.AP "const char **" argv in
34	34	Argument strings. These represent the entire widget command, of
35	35	which the first word is typically the widget name and the second
36	36	word is typically \fBxview\fR or \fByview\fR.

+7

-3

doc/ImgChanged.3 less more

13	13	.nf
14	14	\fB#include <tk.h>\fR
15	15	.sp
16		\fBTk_ImageChanged\fR(\fIimageMaster, x, y, width, height, imageWidth, imageHeight\fR)
	16	\fBTk_ImageChanged\fR(\fImodel, x, y, width, height, imageWidth, imageHeight\fR)
17	17	.SH ARGUMENTS
18	18	.AS Tk_ImageMaster imageHeight
19		.AP Tk_ImageMaster imageMaster in
	19	.AP Tk_ImageMaster model in
20	20	Token for image, which was passed to image's \fIcreateProc\fR when
21	21	the image was created.
22	22	.AP int x in

41	41	As a result of calling \fBTk_ImageChanged\fR, any widgets using
42	42	the image are notified so that they can redisplay themselves
43	43	appropriately.
44		The \fIimageMaster\fR argument identifies the image, and
	44	The \fImodel\fR argument identifies the image, and
45	45	\fIx\fR, \fIy\fR, \fIwidth\fR, and \fIheight\fR
46	46	specify a rectangular region within the image that needs to
47	47	be redrawn.
48	48	\fIimageWidth\fR and \fIimageHeight\fR specify the image's (new) size.
	49	.PP
	50	.VS "TIP 581"
	51	\fITk_ImageModel\fR is synonym for \fITk_ImageMaster\fR
	52	.VE "TIP 581"
49	53	.PP
50	54	An image manager should call \fBTk_ImageChanged\fR during
51	55	its \fIcreateProc\fR to specify the image's initial size and to

+43

-43

doc/MaintGeom.3 less more

13	13	.nf
14	14	\fB#include <tk.h>\fR
15	15	.sp
16		\fBTk_MaintainGeometry\fR(\fIslave, master, x, y, width, height\fR)
	16	\fBTk_MaintainGeometry\fR(\fIwindow, container, x, y, width, height\fR)
17	17	.sp
18		\fBTk_UnmaintainGeometry\fR(\fIslave, master\fR)
	18	\fBTk_UnmaintainGeometry\fR(\fIwindow, container\fR)
19	19	.SH ARGUMENTS
20		.AS Tk_Window master
21		.AP Tk_Window slave in
	20	.AS Tk_Window container
	21	.AP Tk_Window window in
22	22	Window whose geometry is to be controlled.
23		.AP Tk_Window master in
24		Window relative to which \fIslave\fR's geometry will be controlled.
	23	.AP Tk_Window container in
	24	Window relative to which \fIwindow\fR's geometry will be controlled.
25	25	.AP int x in
26		Desired x-coordinate of \fIslave\fR in \fImaster\fR, measured in pixels
27		from the inside of \fImaster\fR's left border to the outside of
28		\fIslave\fR's left border.
	26	Desired x-coordinate of \fIwindow\fR in \fIcontainer\fR, measured in pixels
	27	from the inside of \fIcontainer\fR's left border to the outside of
	28	\fIwindow\fR's left border.
29	29	.AP int y in
30		Desired y-coordinate of \fIslave\fR in \fImaster\fR, measured in pixels
31		from the inside of \fImaster\fR's top border to the outside of
32		\fIslave\fR's top border.
	30	Desired y-coordinate of \fIwindow\fR in \fIcontainer\fR, measured in pixels
	31	from the inside of \fIcontainer\fR's top border to the outside of
	32	\fIwindow\fR's top border.
33	33	.AP int width in
34		Desired width for \fIslave\fR, in pixels.
	34	Desired width for \fIwindow\fR, in pixels.
35	35	.AP int height in
36		Desired height for \fIslave\fR, in pixels.
	36	Desired height for \fIwindow\fR, in pixels.
37	37	.BE
38	38	.SH DESCRIPTION
39	39	.PP
40	40	\fBTk_MaintainGeometry\fR and \fBTk_UnmaintainGeometry\fR make it
41		easier for geometry managers to deal with slaves whose masters are not
	41	easier for geometry managers to deal with windows whose containers are not
42	42	their parents.
43		Three problems arise if the master for a slave is not its parent:
	43	Three problems arise if the container for a window is not its parent:
44	44	.IP [1]
45		The x- and y-position of the slave must be translated from the
46		coordinate system of the master to that of the parent before
47		positioning the slave.
	45	The x- and y-position of the window must be translated from the
	46	coordinate system of the container to that of the parent before
	47	positioning the window.
48	48	.IP [2]
49		If the master window, or any of its ancestors up to the slave's
50		parent, is moved, then the slave must be repositioned within its
	49	If the container window, or any of its ancestors up to the window's
	50	parent, is moved, then the window must be repositioned within its
51	51	parent in order to maintain the correct position relative to the
52		master.
	52	container.
53	53	.IP [3]
54		If the master or one of its ancestors is mapped or unmapped, then
55		the slave must be mapped or unmapped to correspond.
	54	If the container or one of its ancestors is mapped or unmapped, then
	55	the window must be mapped or unmapped to correspond.
56	56	.LP
57		None of these problems is an issue if the parent and master are
58		the same. For example, if the master or one of its ancestors
59		is unmapped, the slave is automatically removed by the screen
	57	None of these problems is an issue if the parent and container are
	58	the same. For example, if the container or one of its ancestors
	59	is unmapped, the window is automatically removed by the screen
60	60	by X.
61	61	.PP
62		\fBTk_MaintainGeometry\fR deals with these problems for slaves
63		whose masters are not their parents, as well as handling the simpler
64		case of slaves whose masters are their parents.
	62	\fBTk_MaintainGeometry\fR deals with these problems for windows
	63	whose containers are not their parents, as well as handling the simpler
	64	case of windows whose container are their parents.
65	65	\fBTk_MaintainGeometry\fR is typically called by a window manager
66		once it has decided where a slave should be positioned relative
67		to its master.
	66	once it has decided where a window should be positioned relative
	67	to its container.
68	68	\fBTk_MaintainGeometry\fR translates the coordinates to the
69		coordinate system of \fIslave\fR's parent and then moves and
70		resizes the slave appropriately.
	69	coordinate system of \fIwindow\fR's parent and then moves and
	70	resizes the window appropriately.
71	71	Furthermore, it remembers the desired position and creates event
72		handlers to monitor the master and all of its ancestors up
73		to (but not including) the slave's parent.
	72	handlers to monitor the container and all of its ancestors up
	73	to (but not including) the window's parent.
74	74	If any of these windows is moved, mapped, or unmapped,
75		the slave will be adjusted so that it is mapped only when the
76		master is mapped and its geometry relative to the master
	75	the window will be adjusted so that it is mapped only when the
	76	container is mapped and its geometry relative to the container
77	77	remains as specified by \fIx\fR, \fIy\fR, \fIwidth\fR, and
78	78	\fIheight\fR.
79	79	.PP

82	82	screen under any conditions, it calls \fBTk_UnmaintainGeometry\fR.
83	83	\fBTk_UnmaintainGeometry\fR unmaps the window and cancels any
84	84	previous calls to \fBTk_MaintainGeometry\fR for the
85		\fImaster\fR\-\fIslave\fR pair, so that the slave's
	85	\fIcontainer\fR\-\fIwindow\fR pair, so that the window's
86	86	geometry and mapped state are no longer maintained
87	87	automatically.
88	88	\fBTk_UnmaintainGeometry\fR need not be called by a geometry
89		manager if the slave, the master, or any of the master's ancestors
	89	manager if the window, the container, or any of the container's ancestors
90	90	is destroyed: Tk will call it automatically.
91	91	.PP
92	92	If \fBTk_MaintainGeometry\fR is called repeatedly for the same
93		\fImaster\fR\-\fIslave\fR pair, the information from the most
	93	\fIcontainer\fR\-\fIwindow\fR pair, the information from the most
94	94	recent call supersedes any older information.
95		If \fBTk_UnmaintainGeometry\fR is called for a \fImaster\fR\-\fIslave\fR
	95	If \fBTk_UnmaintainGeometry\fR is called for a \fIcontainer\fR\-\fIwindow\fR
96	96	pair that is is not currently managed, the call has no effect.
97	97	.SH KEYWORDS
98		geometry manager, map, master, parent, position, slave, unmap
	98	geometry manager, map, container, parent, position, window, unmap

+2

-2

doc/ManageGeom.3 less more

31	31	.PP
32	32	\fBTk_ManageGeometry\fR arranges for a particular geometry manager,
33	33	described by the \fImgrPtr\fR argument, to control the geometry
34		of a particular slave window, given by \fItkwin\fR.
	34	of a particular content window, given by \fItkwin\fR.
35	35	If \fItkwin\fR was previously managed by some other geometry manager,
36	36	the previous manager loses control in favor of the new one.
37	37	If \fImgrPtr\fR is NULL, geometry management is cancelled for

52	52	.PP
53	53	\fIrequestProc\fR is a procedure in the geometry manager that
54	54	will be invoked whenever \fBTk_GeometryRequest\fR is called by the
55		slave to change its desired geometry.
	55	content window to change its desired geometry.
56	56	\fIrequestProc\fR should have arguments and results that match the
57	57	type \fBTk_GeomRequestProc\fR:
58	58	.CS

+4

-0

doc/NameOfImg.3 less more

25	25	This procedure is invoked by image managers to find out the name
26	26	of an image. Given the token for the image, it returns the
27	27	string name for the image.
	28	.PP
	29	.VS "TIP 581"
	30	\fITk_ImageModel\fR is synonym for \fITk_ImageMaster\fR
	31	.VE "TIP 581"
28	32	.SH KEYWORDS
29	33	image manager, image name

+4

-2

doc/SetOptions.3 less more

62	62	this argument.
63	63	.AP int objc in
64	64	Number of values in \fIobjv\fR.
65		.AP Tcl_Obj "*const objv[]" in
	65	.AP Tcl_Obj "const objv" in
66	66	Command-line arguments for setting configuring options.
67	67	.AP Tk_SavedOptions *savePtr out
68	68	If not NULL, the structure pointed to by this argument is filled

442	442	be one of the strings in the table, or a unique abbreviation of
443	443	one of the strings. The internal form is an integer giving the index
444	444	into the table of the matching string, like the return value
445		from \fBTcl_GetStringFromObj\fR.
	445	from \fBTcl_GetStringFromObj\fR. This option type supports the
	446	\fBTK_OPTION_NULL_OK\fR flag; if a NULL value is set, the internal
	447	representation is set to -1.
446	448	.TP
447	449	\fBTK_OPTION_SYNONYM\fR
448	450	This type is used to provide alternative names for an option (for

+25

-7

doc/bind.n less more

200	200	Many contemporary mice support a mouse wheel, which is used
201	201	for scrolling documents without using the scrollbars. By rolling the
202	202	wheel, the system will generate \fBMouseWheel\fR events that the
203		application can use to scroll. Like \fBKey\fR events the event is
204		always routed to the window that currently has focus. When the event
	203	application can use to scroll. The event is routed to the
	204	window currently under the mouse pointer. When the event
205	205	is received you can use the \fB%D\fR substitution to get the
206		\fIdelta\fR field for the event, which is a integer value describing how
	206	\fIdelta\fR field for the event, which is an integer value describing how
207	207	the mouse wheel has moved. The smallest value for which the
208		system will report is defined by the OS. The sign of the
	208	system will report is defined by the OS. The sign of the
209	209	value determines which direction your widget should scroll. Positive
210	210	values should scroll up and negative values should scroll down.
	211	.RS
	212	.PP
	213	Horizontal scrolling uses \fBShift-MouseWheel\fR events, with positive
	214	\fB%D\fR \fIdelta\fR substitution indicating left scrolling and negative
	215	right scrolling.
	216	Only Windows and macOS Aqua typically fire \fBMouseWheel\fR and
	217	\fBShift-MouseWheel\fR events. On
	218	X11 vertical scrolling is rather supported through \fBButton-4\fR and
	219	\fBButton-5\fR events, and horizontal scrolling through \fBShift-Button-4\fR
	220	and \fBShift-Button-5\fR events. Horizontal scrolling events may fire from
	221	many different hardware units such as tilt wheels or touchpads. Horizontal
	222	scrolling can also be emulated by holding Shift and scrolling vertically.
	223	.RE
211	224	.IP "\fBKeyPress\fR, \fBKeyRelease\fR" 5
212	225	The \fBKeyPress\fR and \fBKeyRelease\fR events are generated
213	226	whenever a key is pressed or released. \fBKeyPress\fR and \fBKeyRelease\fR

269	282	When the \fBDestroy\fR event is delivered
270	283	to a widget, it is in a
271	284	.QW half-dead
272		state: the widget still exists, but most operations on it will fail.
	285	state: the widget still exists, but operations that involve it
	286	may return invalid results, or return an error.
273	287	.RE
274	288	.IP "\fBFocusIn\fR, \fBFocusOut\fR" 5
275	289	The \fBFocusIn\fR and \fBFocusOut\fR events are generated

509	523	\fBKeyPress\fR, \fBKeyRelease\fR, and \fBMouseWheel\fR events,
510	524	\fB%x\fR and \fB%y\fR indicate the position of the mouse pointer
511	525	relative to the receiving window.
	526	For key events on the Macintosh these are the coordinates of the
	527	mouse at the moment when an X11 KeyEvent is sent to Tk, which could
	528	be slightly later than the time of the physical press or release.
512	529	For \fBEnter\fR and \fBLeave\fR events, the position where the
513	530	mouse pointer crossed the window, relative to the receiving window.
514	531	For \fBConfigure\fR and \fBCreate\fR requests, the \fIx\fR and \fIy\fR

516	533	.IP \fB%A\fR 5
517	534	Substitutes the UNICODE character corresponding to the event, or
518	535	the empty string if the event does not correspond to a UNICODE character
519		(e.g. the shift key was pressed). \fBXmbLookupString\fR (or
	536	(e.g. the shift key was pressed). On X11, \fBXmbLookupString\fR (or
520	537	\fBXLookupString\fR when input method support is turned off) does all
521	538	the work of translating from the event to a UNICODE character.
522		Valid only for \fBKeyPress\fR and \fBKeyRelease\fR events.
	539	On X11, valid only for \fBKeyPress\fR event. On Windows and macOS/aqua,
	540	valid only for \fBKeyPress\fR and \fBKeyRelease\fR events.
523	541	.IP \fB%B\fR 5
524	542	The \fIborder_width\fR field from the event. Valid only for
525	543	\fBConfigure\fR, \fBConfigureRequest\fR, and \fBCreate\fR events.

+9

-2

doc/canvas.n less more

752	752	\fIpathName \fBmoveto \fItagOrId xPos yPos\fR
753	753	.VS 8.6
754	754	Move the items given by \fItagOrId\fR in the canvas coordinate
755		space so that the first coordinate pair of the bottommost item with
	755	space so that the first coordinate pair (the upper-left corner of the
	756	bounding box) of the first item (the lowest in the display list) with
756	757	tag \fItagOrId\fR is located at
757	758	position (\fIxPos\fR,\fIyPos\fR). \fIxPos\fR and \fIyPos\fR may be
758	759	the empty string, in which case the corresponding coordinate

1121	1122	becomes visible.
1122	1123	.RE
1123	1124	.TP
1124		\fIpathName \fByview \fI?args\fR?
	1125	\fIpathName \fByview ?\fIargs\fR?
1125	1126	.
1126	1127	This command is used to query and change the vertical position of the
1127	1128	information displayed in the canvas's window.

1522	1523	\fBlast\fR (for an arrowhead at the last point of the line), or
1523	1524	\fBboth\fR (for arrowheads at both ends).
1524	1525	This option defaults to \fBnone\fR.
	1526	When requested to draw an arrowhead, Tk internally adjusts the corresponding
	1527	line end point so that the rendered line ends at the neck of the arrowhead
	1528	rather than at its tip so that the line doesn't extend past the edge of the
	1529	arrowhead. This may trigger a \fBLeave\fR event if the mouse is hovering this
	1530	line end. Conversely, when removing an arrowhead Tk adjusts the corresponding
	1531	line point the other way round, which may trigger an \fBEnter\fR event.
1525	1532	.TP
1526	1533	\fB\-arrowshape \fIshape\fR
1527	1534	This option indicates how to draw arrowheads.

+30

-79

doc/colors.n less more

783	783	.TP
784	784	\fBMac OS X\fR
785	785	.
786		On macOS, the following additional system colors are available.
787		This first group contains all colors available in the HIToolbox library.
788		(Note that in some cases the actual color values may depend on the
789		current Appearance.)
	786	On macOS, the following additional system colors are available. This
	787	first group contains all of the HIBrush colors available in the
	788	HIToolbox library. Note that on macOS 10.14 (Mojave) and later these
	789	colors are unlikely to match the color actually used for the purpose
	790	suggested by the color name.
790	791	.RS
791	792	.DS
792	793	systemActiveAreaFill
793		systemAlertActiveText
794	794	systemAlertBackgroundActive
795	795	systemAlertBackgroundInactive
796		systemAlertInactiveText
797	796	systemAlternatePrimaryHighlightColor
798	797	systemAppleGuideCoachmark
799	798	systemBevelActiveDark
800	799	systemBevelActiveLight
801		systemBevelButtonActiveText
802		systemBevelButtonInactiveText
803		systemBevelButtonPressedText
804		systemBevelButtonStickyActiveText
805		systemBevelButtonStickyInactiveText
806	800	systemBevelInactiveDark
807	801	systemBevelInactiveLight
808	802	systemBlack
809		systemBlackText
810	803	systemButtonActiveDarkHighlight
811	804	systemButtonActiveDarkShadow
812	805	systemButtonActiveLightHighlight

826	819	systemButtonPressedDarkShadow
827	820	systemButtonPressedLightHighlight
828	821	systemButtonPressedLightShadow
829		systemButtonText
830	822	systemChasingArrows
831		systemDialogActiveText
832	823	systemDialogBackgroundActive
833	824	systemDialogBackgroundInactive
834		systemDialogInactiveText
835	825	systemDocumentWindowBackground
836		systemDocumentWindowTitleActiveText
837		systemDocumentWindowTitleInactiveText
838	826	systemDragHilite
839	827	systemDrawerBackground
840	828	systemFinderWindowBackground

842	830	systemHighlight
843	831	systemHighlightAlternate
844	832	systemHighlightSecondary
845		systemHighlightText
846	833	systemIconLabelBackground
847	834	systemIconLabelBackgroundSelected
848		systemIconLabelSelectedText
849		systemIconLabelText
850	835	systemListViewBackground
851	836	systemListViewColumnDivider
852	837	systemListViewEvenRowBackground
853	838	systemListViewOddRowBackground
854	839	systemListViewSeparator
855	840	systemListViewSortColumnBackground
856		systemListViewText
857		systemListViewWindowHeaderBackground
858	841	systemMenu
859	842	systemMenuActive
860		systemMenuActiveText
861	843	systemMenuBackground
862	844	systemMenuBackgroundSelected
863		systemMenuDisabled
864		systemMenuItemActiveText
865		systemMenuItemDisabledText
866		systemMenuItemSelectedText
867		systemMenuText
868		systemMetalBackground
869		systemModelessDialogActiveText
870	845	systemModelessDialogBackgroundActive
871	846	systemModelessDialogBackgroundInactive
872		systemModelessDialogInactiveText
873	847	systemMovableModalBackground
874		systemMovableModalWindowTitleActiveText
875		systemMovableModalWindowTitleInactiveText
876		systemNotificationText
877	848	systemNotificationWindowBackground
878		systemPlacardActiveText
879		systemPlacardBackground
880		systemPlacardInactiveText
881		systemPlacardPressedText
882	849	systemPopupArrowActive
883	850	systemPopupArrowInactive
884	851	systemPopupArrowPressed
885		systemPopupButtonActiveText
886		systemPopupButtonInactiveText
887		systemPopupButtonPressedText
888		systemPopupLabelActiveText
889		systemPopupLabelInactiveText
890		systemPopupWindowTitleActiveText
891		systemPopupWindowTitleInactiveText
892	852	systemPrimaryHighlightColor
893		systemPushButtonActiveText
894		systemPushButtonInactiveText
895		systemPushButtonPressedText
896		systemRootMenuActiveText
897		systemRootMenuDisabledText
898		systemRootMenuSelectedText
899	853	systemScrollBarDelimiterActive
900	854	systemScrollBarDelimiterInactive
901		systemSecondaryGroupBoxBackground
902	855	systemSecondaryHighlightColor
903	856	systemSelectedTabTextColor
904	857	systemSheetBackground
905	858	systemSheetBackgroundOpaque
906	859	systemSheetBackgroundTransparent
907	860	systemStaticAreaFill
908		systemSystemDetailText
909		systemTabFrontActiveText
910		systemTabFrontInactiveText
911		systemTabNonFrontActiveText
912		systemTabNonFrontInactiveText
913		systemTabNonFrontPressedText
914		systemTabPaneBackground
915	861	systemToolbarBackground
916	862	systemTransparent
917	863	systemUtilityWindowBackgroundActive
918	864	systemUtilityWindowBackgroundInactive
919		systemUtilityWindowTitleActiveText
920		systemUtilityWindowTitleInactiveText
921	865	systemWhite
922		systemWhiteText
923	866	systemWindowBody
924		systemWindowHeaderActiveText
925		systemWindowHeaderBackground
926		systemWindowHeaderInactiveText
927	867	.DE
928	868	.RE
929	869	.
930		The second group of MacOS colors below are based on Apple's "semantic"
931		NScolors. On OSX 10.14 (Mojave) and later these colors change value
932		when Dark Mode is enabled. However, the change is only observable
933		when the Apple window manager is drawing to the screen. So the
934		\fBwinfo rgb\fR command will return the color coordinates used in the
935		standard Aqua mode, even if Dark Mode has been selected in the system
936		preferences. The numbered systemWindowBackgroundColors are used in
937		the \fBttk::notebook\fR and \fBttk::labelframe\fR widgets to provide a
938		contrasting background. Each numbered color constrasts with its
939		predecessor.
	870	Tk supports all of the NSColors in the macOS System ColorList. The
	871	convention for naming these colors is that the Tk name is generated by
	872	capitalizing the macOS name and adding the prefix "system". On OSX
	873	10.14 (Mojave) and later many of these "semantic" colors will appear
	874	differently depending on whether the NSWindow in which they are used has
	875	the Aqua or DarkAqua appearance. The System ColorList differs between
	876	releases of macOS and some colors, such as systemLinkColor and
	877	systemControlAccentColor, are simulated on older systems which did not
	878	provide them. All of the colors below are available on all supported
	879	macOS releases, but newer systems will support additional colors.
940	880	.RS
941	881	.DS
942	882	systemControlAccentColor
943	883	systemControlTextColor
944	884	systemDisabledControlTextColor
945		systemLabelColor
946		systemSelectedTextBackgroundColor
	885	systemLabelColor
	886	systemLinkColor
	887	systemPlaceholderTextColor
	888	systemSelectedTextBackgroundColor
947	889	systemSelectedTextColor
	890	systemSeparatorColor
948	891	systemTextBackgroundColor
949		systemTextColor
	892	systemTextColor
	893	.DE
	894	.RE
	895	.
	896	The numbered systemWindowBackgroundColors below
	897	are used in the \fBttk::notebook\fR and \fBttk::labelframe\fR widgets
	898	to provide a contrasting background. Each numbered color constrasts
	899	with its predecessor.
	900	.RS
	901	.DS
950	902	systemWindowBackgroundColor
951	903	systemWindowBackgroundColor1
952	904	systemWindowBackgroundColor2

958	910	.DE
959	911	.RE
960	912	.TP
961
962	913
963	914	\fBWindows\fR
964	915	.

+6

-3

doc/console.n less more

24	24	Tk is loaded into a tclsh interpreter with
25	25	.QW "\fBpackage require Tk\fR" ,
26	26	as a conventional terminal is expected to be present in that case.
27		In TkAqua, this command is only available when stdin is \fB/dev/null\fR
28		(as is the case e.g. when the application embedding Tk is started
29		from the Mac OS X Finder).
	27	In TkAqua, this command is disabled when there is a startup script
	28	and stdin is \fB/dev/null\fR (as is the case e.g. when a bundled application
	29	embedding Tk is started by the macOS Launcher). To enable the command
	30	in that case, define the environment variable \fBTK_CONSOLE\fR. This can be
	31	done by modifying the Info.plist file by adding the LSEnvironment key
	32	to the main dict and setting its value to be a dict with the key \fBTK_CONSOLE\fR.
30	33	.PP
31	34	.TP
32	35	\fBconsole eval \fIscript\fR

+4

-3

doc/entry.n less more

447	447	If any normal printing characters are typed in an entry, they are
448	448	inserted at the point of the insertion cursor.
449	449	.IP [7]
450		The view in the entry can be adjusted by dragging with mouse button 2.
451		If mouse button 2 is clicked without moving the mouse, the selection
452		is copied into the entry at the position of the mouse cursor.
	450	The view in the entry can be adjusted by dragging with the middle
	451	mouse button (button 2, or button 3 in TkAqua). If the middle mouse
	452	button is clicked without moving the mouse, the selection is copied
	453	into the entry at the position of the mouse cursor.
453	454	.IP [8]
454	455	If the mouse is dragged out of the entry on the left or right sides
455	456	while button 1 is pressed, the entry will automatically scroll to

+2

-2

doc/frame.n less more

3	3	'\"
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	7	.TH frame n 8.4 Tk "Tk Built-In Commands"
8	8	.so man.macros
9	9	.BS

115	115	\fIOption\fR may have any of the values accepted by the \fBframe\fR
116	116	command.
117	117	.TP
118		\fIpathName \fBconfigure\fR ?\fIoption\fR? \fI?value option value ...\fR?
	118	\fIpathName \fBconfigure\fR ?\fIoption\fR? ?\fIvalue option value ...\fR?
119	119	.
120	120	Query or modify the configuration options of the widget.
121	121	If no \fIoption\fR is specified, returns a list describing all of

+140

-135

doc/grid.n less more

2	2	'\"
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	6	.TH grid n 8.5 Tk "Tk Built-In Commands"
7	7	.so man.macros
8	8	.BS

16	16	.PP
17	17	The \fBgrid\fR command is used to communicate with the grid
18	18	geometry manager that arranges widgets in rows and columns inside
19		of another window, called the geometry master (or master window).
	19	of another window, called the geometry container (or container window).
20	20	The \fBgrid\fR command can have any of several forms, depending
21	21	on the \fIoption\fR argument:
22	22	.TP
23		\fBgrid \fIslave \fR?\fIslave ...\fR? ?\fIoptions\fR?
24		.
25		If the first argument to \fBgrid\fR is suitable as the first slave
	23	\fBgrid \fIwindow \fR?\fIwindow ...\fR? ?\fIoptions\fR?
	24	.
	25	If the first argument to \fBgrid\fR is suitable as the first window
26	26	argument to \fBgrid configure\fR, either a window name (any value
27	27	starting with \fB.\fR) or one of the characters \fBx\fR or \fB^\fR
28	28	(see the \fBRELATIVE PLACEMENT\fR section below), then the command is
29	29	processed in the same way as \fBgrid configure\fR.
30	30	.TP
31		\fBgrid anchor \fImaster\fR ?\fIanchor\fR?
32		.
33		The anchor value controls how to place the grid within the master
	31	\fBgrid anchor \fIwindow\fR ?\fIanchor\fR?
	32	.
	33	The anchor value controls how to place the grid within the container window
34	34	when no row/column has any weight. See \fBTHE GRID ALGORITHM\fR below
35	35	for further details. The default \fIanchor\fR is \fInw\fR.
36	36	.TP
37		\fBgrid bbox \fImaster\fR ?\fIcolumn row\fR? ?\fIcolumn2 row2\fR?
	37	\fBgrid bbox \fIwindow\fR ?\fIcolumn row\fR? ?\fIcolumn2 row2\fR?
38	38	.
39	39	With no arguments,
40	40	the bounding box (in pixels) of the grid is returned.
41	41	The return value consists of 4 integers. The first two are the pixel
42		offset from the master window (x then y) of the top-left corner of the
	42	offset from the container window (x then y) of the top-left corner of the
43	43	grid, and the second two integers are the width and height of the grid,
44	44	also in pixels. If a single \fIcolumn\fR and \fIrow\fR is specified on
45	45	the command line, then the bounding box for that cell is returned, where the

47	47	arguments are specified, then the bounding box spanning the rows and columns
48	48	indicated is returned.
49	49	.TP
50		\fBgrid columnconfigure \fImaster index \fR?\fI\-option value...\fR?
	50	\fBgrid columnconfigure \fIwindow index \fR?\fI\-option value...\fR?
51	51	.
52	52	Query or set the column properties of the \fIindex\fR column of the
53		geometry master, \fImaster\fR.
	53	geometry container, \fIwindow\fR.
54	54	The valid options are \fB\-minsize\fR, \fB\-weight\fR, \fB\-uniform\fR
55	55	and \fB\-pad\fR.
56	56	If one or more options are provided, then \fIindex\fR may be given as
57	57	a list of column indices to which the configuration options will operate on.
58	58	Indices may be integers, window names or the keyword \fIall\fR. For \fIall\fR
59		the options apply to all columns currently occupied be slave windows. For
60		a window name, that window must be a slave of this master and the options
61		apply to all columns currently occupied be the slave.
	59	the options apply to all columns currently occupied be content windows. For
	60	a window name, that window must be a content of this container and the options
	61	apply to all columns currently occupied be the content.
62	62	The \fB\-minsize\fR option sets the minimum size, in screen units,
63	63	that will be permitted for this column.
64	64	The \fB\-weight\fR option (an integer value)

79	79	grid geometry manager requests a size from the containing window.
80	80	If only an option is specified, with no value,
81	81	the current value of that option is returned.
82		If only the master window and index is specified, all the current settings
	82	If only the container window and index is specified, all the current settings
83	83	are returned in a list of
84	84	.QW "\-option value"
85	85	pairs.
86	86	.TP
87		\fBgrid configure \fIslave \fR?\fIslave ...\fR? ?\fIoptions\fR?
88		.
89		The arguments consist of the names of one or more slave windows
	87	\fBgrid configure \fIwindow \fR?\fIwindow ...\fR? ?\fIoptions\fR?
	88	.
	89	The arguments consist of the names of one or more content windows
90	90	followed by pairs of arguments that specify how
91		to manage the slaves.
	91	to manage the content.
92	92	The characters \fB\-\fR, \fBx\fR and \fB^\fR,
93	93	can be specified instead of a window name to alter the default
94		location of a \fIslave\fR, as described in the \fBRELATIVE PLACEMENT\fR
	94	location of a \fIwindow\fR, as described in the \fBRELATIVE PLACEMENT\fR
95	95	section, below.
96	96	The following options are supported:
97	97	.RS
98	98	.TP
99	99	\fB\-column \fIn\fR
100	100	.
101		Insert the slave so that it occupies the \fIn\fRth column in the grid.
	101	Insert the window so that it occupies the \fIn\fRth column in the grid.
102	102	Column numbers start with 0. If this option is not supplied, then the
103		slave is arranged just to the right of previous slave specified on this
	103	window is arranged just to the right of previous window specified on this
104	104	call to \fBgrid\fR, or column
105	105	.QW 0
106		if it is the first slave. For each
107		\fBx\fR that immediately precedes the \fIslave\fR, the column position
	106	if it is the first window. For each
	107	\fBx\fR that immediately precedes the \fIwindow\fR, the column position
108	108	is incremented by one. Thus the \fBx\fR represents a blank column
109	109	for this row in the grid.
110	110	.TP
111	111	\fB\-columnspan \fIn\fR
112	112	.
113		Insert the slave so that it occupies \fIn\fR columns in the grid.
	113	Insert the window so that it occupies \fIn\fR columns in the grid.
114	114	The default is one column, unless the window name is followed by a
115	115	\fB\-\fR, in which case the columnspan is incremented once for each immediately
116	116	following \fB\-\fR.
117	117	.TP
118		\fB\-in \fIother\fR
119		.
120		Insert the slave(s) in the master
121		window given by \fIother\fR. The default is the first slave's
	118	\fB\-in \fIcontainer\fR
	119	.
	120	Insert the window(s) in the container
	121	window given by \fIcontainer\fR. The default is the first window's
122	122	parent window.
123	123	.TP
124	124	\fB\-ipadx \fIamount\fR
125	125	.
126	126	The \fIamount\fR specifies how much horizontal internal padding to
127		leave on each side of the slave(s). This is space is added
128		inside the slave(s) border.
	127	leave on each side of the content. This is space is added
	128	inside the content border.
129	129	The \fIamount\fR must be a valid screen distance, such as \fB2\fR or \fB.5c\fR.
130	130	It defaults to 0.
131	131	.TP
132	132	\fB\-ipady \fIamount\fR
133	133	.
134	134	The \fIamount\fR specifies how much vertical internal padding to
135		leave on the top and bottom of the slave(s).
136		This space is added inside the slave(s) border.
	135	leave on the top and bottom of the content.
	136	This space is added inside the content border.
137	137	The \fIamount\fR defaults to 0.
138	138	.TP
139	139	\fB\-padx \fIamount\fR
140	140	.
141	141	The \fIamount\fR specifies how much horizontal external padding to
142		leave on each side of the slave(s), in screen units.
	142	leave on each side of the content, in screen units.
143	143	\fIAmount\fR may be a list
144	144	of two values to specify padding for left and right separately.
145	145	The \fIamount\fR defaults to 0.
146		This space is added outside the slave(s) border.
	146	This space is added outside the content border.
147	147	.TP
148	148	\fB\-pady \fIamount\fR
149	149	.
150	150	The \fIamount\fR specifies how much vertical external padding to
151		leave on the top and bottom of the slave(s), in screen units.
	151	leave on the top and bottom of the content, in screen units.
152	152	\fIAmount\fR may be a list
153	153	of two values to specify padding for top and bottom separately.
154	154	The \fIamount\fR defaults to 0.
155		This space is added outside the slave(s) border.
	155	This space is added outside the content border.
156	156	.TP
157	157	\fB\-row \fIn\fR
158	158	.
159		Insert the slave so that it occupies the \fIn\fRth row in the grid.
	159	Insert the content so that it occupies the \fIn\fRth row in the grid.
160	160	Row numbers start with 0. If this option is not supplied, then the
161		slave is arranged on the same row as the previous slave specified on this
	161	content is arranged on the same row as the previous content specified on this
162	162	call to \fBgrid\fR, or the next row after the highest occupied row
163		if this is the first slave.
	163	if this is the first content.
164	164	.TP
165	165	\fB\-rowspan \fIn\fR
166	166	.
167		Insert the slave so that it occupies \fIn\fR rows in the grid.
	167	Insert the content so that it occupies \fIn\fR rows in the grid.
168	168	The default is one row. If the next \fBgrid\fR command contains
169		\fB^\fR characters instead of \fIslaves\fR that line up with the columns
170		of this \fIslave\fR, then the \fBrowspan\fR of this \fIslave\fR is
	169	\fB^\fR characters instead of \fIcontent\fR that line up with the columns
	170	of this \fIcontent\fR, then the \fBrowspan\fR of this \fIcontent\fR is
171	171	extended by one.
172	172	.TP
173	173	\fB\-sticky \fIstyle\fR
174	174	.
175		If a slave's cell is larger than its requested dimensions, this
176		option may be used to position (or stretch) the slave within its cell.
	175	If a content's cell is larger than its requested dimensions, this
	176	option may be used to position (or stretch) the content within its cell.
177	177	\fIStyle\fR is a string that contains zero or more of the characters
178	178	\fBn\fR, \fBs\fR, \fBe\fR or \fBw\fR.
179	179	The string can optionally contains spaces or
180	180	commas, but they are ignored. Each letter refers to a side (north, south,
181		east, or west) that the slave will
	181	east, or west) that the content will
182	182	.QW stick
183	183	to. If both \fBn\fR and \fBs\fR (or \fBe\fR and \fBw\fR) are
184		specified, the slave will be stretched to fill the entire
	184	specified, the content will be stretched to fill the entire
185	185	height (or width) of its cavity. The \fB\-sticky\fR option subsumes the
186	186	combination of \fB\-anchor\fR and \fB\-fill\fR that is used by \fBpack\fR.
187	187	The default is
188	188	.QW "" ,
189		which causes the slave to be centered in its cavity, at its requested size.
	189	which causes the content to be centered in its cavity, at its requested size.
190	190	.LP
191		If any of the slaves are already managed by the geometry manager
	191	If any of the content is already managed by the geometry manager
192	192	then any unspecified options for them retain their previous values rather
193	193	than receiving default values.
194	194	.RE
195	195	.TP
196		\fBgrid forget \fIslave \fR?\fIslave ...\fR?
197		.
198		Removes each of the \fIslave\fRs from grid for its
199		master and unmaps their windows.
200		The slaves will no longer be managed by the grid geometry manager.
	196	\fBgrid forget \fIwindow \fR?\fIwindow ...\fR?
	197	.
	198	Removes each of the \fIwindow\fRs from grid for its
	199	container and unmaps their windows.
	200	The content will no longer be managed by the grid geometry manager.
201	201	The configuration options for that window are forgotten, so that if the
202		slave is managed once more by the grid geometry manager, the initial
	202	window is managed once more by the grid geometry manager, the initial
203	203	default settings are used.
204	204	.TP
205		\fBgrid info \fIslave\fR
	205	\fBgrid info \fIwindow\fR
206	206	.
207	207	Returns a list whose elements are the current configuration state of
208		the slave given by \fIslave\fR in the same option-value form that
	208	the content given by \fIwindow\fR in the same option-value form that
209	209	might be specified to \fBgrid configure\fR.
210	210	The first two elements of the list are
211		.QW "\fB\-in \fImaster\fR"
212		where \fImaster\fR is the slave's master.
213		.TP
214		\fBgrid location \fImaster x y\fR
215		.
216		Given \fIx\fR and \fIy\fR values in screen units relative to the master window,
	211	.QW "\fB\-in \fIcontainer\fR"
	212	where \fIcontainer\fR is the windows's container window.
	213	.TP
	214	\fBgrid location \fIwindow x y\fR
	215	.
	216	Given \fIx\fR and \fIy\fR values in screen units relative to the container window,
217	217	the column and row number at that \fIx\fR and \fIy\fR location is returned.
218	218	For locations that are above or to the left of the grid, \fB\-1\fR is
219	219	returned.
220	220	.TP
221		\fBgrid propagate \fImaster\fR ?\fIboolean\fR?
	221	\fBgrid propagate \fIwindow\fR ?\fIboolean\fR?
222	222	.
223	223	If \fIboolean\fR has a true boolean value such as \fB1\fR or \fBon\fR
224		then propagation is enabled for \fImaster\fR, which must be a window
	224	then propagation is enabled for \fIwindow\fR, which must be a window
225	225	name (see \fBGEOMETRY PROPAGATION\fR below).
226	226	If \fIboolean\fR has a false boolean value then propagation is
227		disabled for \fImaster\fR.
	227	disabled for \fIwindow\fR.
228	228	In either of these cases an empty string is returned.
229	229	If \fIboolean\fR is omitted then the command returns \fB0\fR or
230	230	\fB1\fR to indicate whether propagation is currently enabled
231		for \fImaster\fR.
	231	for \fIwindow\fR.
232	232	Propagation is enabled by default.
233	233	.TP
234		\fBgrid rowconfigure \fImaster index \fR?\fI\-option value...\fR?
	234	\fBgrid rowconfigure \fIwindow index \fR?\fI\-option value...\fR?
235	235	.
236	236	Query or set the row properties of the \fIindex\fR row of the
237		geometry master, \fImaster\fR.
	237	geometry window, \fIwindow\fR.
238	238	The valid options are \fB\-minsize\fR, \fB\-weight\fR, \fB\-uniform\fR
239	239	and \fB\-pad\fR.
240	240	If one or more options are provided, then \fIindex\fR may be given as
241	241	a list of row indices to which the configuration options will operate on.
242	242	Indices may be integers, window names or the keyword \fIall\fR. For \fIall\fR
243		the options apply to all rows currently occupied be slave windows. For
244		a window name, that window must be a slave of this master and the options
245		apply to all rows currently occupied be the slave.
	243	the options apply to all rows currently occupied by content windows. For
	244	a window name, that window must be a content window of this container and the options
	245	apply to all rows currently occupied by the container window.
246	246	The \fB\-minsize\fR option sets the minimum size, in screen units,
247	247	that will be permitted for this row.
248	248	The \fB\-weight\fR option (an integer value)

263	263	grid geometry manager requests a size from the containing window.
264	264	If only an option is specified, with no value,
265	265	the current value of that option is returned.
266		If only the master window and index is specified, all the current settings
	266	If only the container window and index is specified, all the current settings
267	267	are returned in a list of
268	268	.QW "-option value"
269	269	pairs.
270	270	.TP
271		\fBgrid remove \fIslave \fR?\fIslave ...\fR?
272		.
273		Removes each of the \fIslave\fRs from grid for its
274		master and unmaps their windows.
275		The slaves will no longer be managed by the grid geometry manager.
	271	\fBgrid remove \fIwindow \fR?\fIwindow ...\fR?
	272	.
	273	Removes each of the \fIwindow\fRs from grid for its
	274	container and unmaps their windows.
	275	The content will no longer be managed by the grid geometry manager.
276	276	However, the configuration options for that window are remembered,
277		so that if the
278		slave is managed once more by the grid geometry manager, the previous
279		values are retained.
280		.TP
281		\fBgrid size \fImaster\fR
282		.
283		Returns the size of the grid (in columns then rows) for \fImaster\fR.
284		The size is determined either by the \fIslave\fR occupying the largest
	277	so that if the content window is managed once more by the grid
	278	geometry manager, the previous values are retained.
	279	.TP
	280	\fBgrid size \fIcontainer\fR
	281	.
	282	Returns the size of the grid (in columns then rows) for \fIcontainer\fR.
	283	The size is determined either by the \fIcontent\fR occupying the largest
285	284	row or column, or the largest column or row with a \fB\-minsize\fR,
286	285	\fB\-weight\fR, or \fB\-pad\fR that is non-zero.
287	286	.TP
288		\fBgrid slaves \fImaster\fR ?\fI\-option value\fR?
289		.
290		If no options are supplied, a list of all of the slaves in \fImaster\fR
291		are returned, most recently manages first.
	287	\fBgrid slaves \fIwindow\fR ?\fI\-option value\fR?
	288	.
	289	If no options are supplied, a list of all of the content in \fIwindow\fR
	290	are returned, most recently managed first.
292	291	\fIOption\fR can be either \fB\-row\fR or \fB\-column\fR which
293		causes only the slaves in the row (or column) specified by \fIvalue\fR
	292	causes only the content in the row (or column) specified by \fIvalue\fR
294	293	to be returned.
	294	.VS "TIP 581"
	295	.TP
	296	\fBgrid content \fIwindow\fR ?\fI\-option value\fR?
	297	.
	298	Synonym for . \fBgrid slaves \fIwindow\fR ?\fI\-option value\fR?
	299	.VE "TIP 581"
295	300	.SH "RELATIVE PLACEMENT"
296	301	.PP
297	302	The \fBgrid\fR command contains a limited set of capabilities that
298	303	permit layouts to be created without specifying the row and column
299		information for each slave. This permits slaves to be rearranged,
	304	information for each content. This permits content to be rearranged,
300	305	added, or removed without the need to explicitly specify row and
301	306	column information.
302		When no column or row information is specified for a \fIslave\fR,
	307	When no column or row information is specified for a \fIcontent\fR,
303	308	default values are chosen for
304	309	\fB\-column\fR, \fB\-row\fR, \fB\-columnspan\fR and \fB\-rowspan\fR
305		at the time the \fIslave\fR is managed. The values are chosen
306		based upon the current layout of the grid, the position of the \fIslave\fR
307		relative to other \fIslave\fRs in the same grid command, and the presence
	310	at the time the \fIcontent\fR is managed. The values are chosen
	311	based upon the current layout of the grid, the position of the \fIcontent\fR
	312	relative to other \fIcontent\fRs in the same grid command, and the presence
308	313	of the characters \fB\-\fR, \fBx\fR, and \fB^\fR in \fBgrid\fR
309		command where \fIslave\fR names are normally expected.
	314	command where \fIcontent\fR names are normally expected.
310	315	.RS
311	316	.TP
312	317	\fB\-\fR
313	318	.
314		This increases the \fB\-columnspan\fR of the \fIslave\fR to the left. Several
	319	This increases the \fB\-columnspan\fR of the \fIcontent\fR to the left. Several
315	320	\fB\-\fR's in a row will successively increase the number of columns spanned. A \fB\-\fR
316		may not follow a \fB^\fR or a \fBx\fR, nor may it be the first \fIslave\fR
	321	may not follow a \fB^\fR or a \fBx\fR, nor may it be the first \fIcontent\fR
317	322	argument to \fBgrid configure\fR.
318	323	.TP
319	324	\fBx\fR
320	325	.
321		This leaves an empty column between the \fIslave\fR on the left and
322		the \fIslave\fR on the right.
	326	This leaves an empty column between the \fIcontent\fR on the left and
	327	the \fIcontent\fR on the right.
323	328	.TP
324	329	\fB^\fR
325	330	.
326		This extends the \fB\-rowspan\fR of the \fIslave\fR above the \fB^\fR's
	331	This extends the \fB\-rowspan\fR of the \fIcontent\fR above the \fB^\fR's
327	332	in the grid. The number of \fB^\fR's in a row must match the number of
328		columns spanned by the \fIslave\fR above it.
	333	columns spanned by the \fIcontent\fR above it.
329	334	.RE
330	335	.SH "THE GRID ALGORITHM"
331	336	.PP
332		The grid geometry manager lays out its slaves in three steps.
333		In the first step, the minimum size needed to fit all of the slaves
	337	The grid geometry manager lays out its content in three steps.
	338	In the first step, the minimum size needed to fit all of the content
334	339	is computed, then (if propagation is turned on), a request is made
335		of the master window to become that size.
	340	of the container window to become that size.
336	341	In the second step, the requested size is compared against the actual size
337		of the master. If the sizes are different, then spaces is added to or taken
	342	of the container. If the sizes are different, then spaces is added to or taken
338	343	away from the layout as needed.
339		For the final step, each slave is positioned in its row(s) and column(s)
	344	For the final step, each content is positioned in its row(s) and column(s)
340	345	based on the setting of its \fIsticky\fR flag.
341	346	.PP
342	347	To compute the minimum size of a layout, the grid geometry manager
343		first looks at all slaves whose \fB\-columnspan\fR and \fB\-rowspan\fR values are one,
	348	first looks at all content whose \fB\-columnspan\fR and \fB\-rowspan\fR values are one,
344	349	and computes the nominal size of each row or column to be either the
345	350	\fIminsize\fR for that row or column, or the sum of the \fIpad\fRding
346		plus the size of the largest slave, whichever is greater. After that
	351	plus the size of the largest content, whichever is greater. After that
347	352	the rows or columns in each uniform group adapt to each other. Then
348		the slaves whose row-spans or column-spans are greater than one are
	353	the content whose row-spans or column-spans are greater than one are
349	354	examined. If a group of rows or columns need to be increased in size
350		in order to accommodate these slaves, then extra space is added to each
	355	in order to accommodate these content, then extra space is added to each
351	356	row or column in the group according to its \fIweight\fR. For each
352	357	group whose weights are all zero, the additional space is apportioned
353	358	equally.

368	373	same weight, then each row or column will have the same size as the
369	374	largest row or column in the group.
370	375	.PP
371		For masters whose size is larger than the requested layout, the additional
	376	For containers whose size is larger than the requested layout, the additional
372	377	space is apportioned according to the row and column weights. If all of
373		the weights are zero, the layout is placed within its master according to
	378	the weights are zero, the layout is placed within its container according to
374	379	the \fIanchor\fR value.
375		For masters whose size is smaller than the requested layout, space is taken
	380	For containers whose size is smaller than the requested layout, space is taken
376	381	away from columns and rows according to their weights. However, once a
377	382	column or row shrinks to its minsize, its weight is taken to be zero.
378	383	If more space needs to be removed from a layout than would be permitted, as

380	385	placed and clipped according to the \fIanchor\fR value.
381	386	.SH "GEOMETRY PROPAGATION"
382	387	.PP
383		The grid geometry manager normally computes how large a master must be to
384		just exactly meet the needs of its slaves, and it sets the
385		requested width and height of the master to these dimensions.
	388	The grid geometry manager normally computes how large a container must be to
	389	just exactly meet the needs of its content, and it sets the
	390	requested width and height of the container to these dimensions.
386	391	This causes geometry information to propagate up through a
387	392	window hierarchy to a top-level window so that the entire
388	393	sub-tree sizes itself to fit the needs of the leaf windows.
389	394	However, the \fBgrid propagate\fR command may be used to
390		turn off propagation for one or more masters.
	395	turn off propagation for one or more containers.
391	396	If propagation is disabled then grid will not set
392		the requested width and height of the master window.
393		This may be useful if, for example, you wish for a master
	397	the requested width and height of the container window.
	398	This may be useful if, for example, you wish for a container
394	399	window to have a fixed size that you specify.
395		.SH "RESTRICTIONS ON MASTER WINDOWS"
396		.PP
397		The master for each slave must either be the slave's parent
398		(the default) or a descendant of the slave's parent.
	400	.SH "RESTRICTIONS ON CONTAINER WINDOWS"
	401	.PP
	402	The container for each content must either be the content's parent
	403	(the default) or a descendant of the content's parent.
399	404	This restriction is necessary to guarantee that the
400		slave can be placed over any part of its master that is
401		visible without danger of the slave being clipped by its parent.
402		In addition, all slaves in one call to \fBgrid\fR must have the same master.
	405	content can be placed over any part of its container that is
	406	visible without danger of the content being clipped by its parent.
	407	In addition, all content in one call to \fBgrid\fR must have the same container.
403	408	.SH "STACKING ORDER"
404	409	.PP
405		If the master for a slave is not its parent then you must make sure
406		that the slave is higher in the stacking order than the master.
407		Otherwise the master will obscure the slave and it will appear as
408		if the slave has not been managed correctly.
409		The easiest way to make sure the slave is higher than the master is
410		to create the master window first: the most recently created window
	410	If the container for a content is not its parent then you must make sure
	411	that the content is higher in the stacking order than the container.
	412	Otherwise the container will obscure the content and it will appear as
	413	if the content has not been managed correctly.
	414	The easiest way to make sure the content is higher than the container is
	415	to create the container window first: the most recently created window
411	416	will be highest in the stacking order.
412	417	.SH CREDITS
413	418	.PP

+1

-1

doc/labelframe.n less more

107	107	\fIOption\fR may have any of the values accepted by the \fBlabelframe\fR
108	108	command.
109	109	.TP
110		\fIpathName \fBconfigure\fR ?\fIoption\fR? \fI?value option value ...\fR?
	110	\fIpathName \fBconfigure\fR ?\fIoption\fR? ?\fIvalue option value ...\fR?
111	111	Query or modify the configuration options of the widget.
112	112	If no \fIoption\fR is specified, returns a list describing all of
113	113	the available options for \fIpathName\fR (see \fBTk_ConfigureInfo\fR for

+7

-7

doc/loadTk.n less more

10	10	.SH NAME
11	11	safe::loadTk \- Load Tk into a safe interpreter.
12	12	.SH SYNOPSIS
13		\fBsafe::loadTk \fIslave\fR ?\fB\-use\fR \fIwindowId\fR? ?\fB\-display\fR \fIdisplayName\fR?
	13	\fBsafe::loadTk \fIchild\fR ?\fB\-use\fR \fIwindowId\fR? ?\fB\-display\fR \fIdisplayName\fR?
14	14	.BE
15	15	.SH DESCRIPTION
16	16	.PP

42	42	Please read the \fBsafe\fR manual page for Tcl to learn about the basic
43	43	security considerations for Safe Tcl.
44	44	.PP
45		\fBsafe::loadTk\fR adds the value of \fBtk_library\fR taken from the master
	45	\fBsafe::loadTk\fR adds the value of \fBtk_library\fR taken from the parent
46	46	interpreter to the virtual access path of the safe interpreter so that
47	47	auto-loading will work in the safe interpreter.
48	48	.PP
49		Tk initialization is now safe with respect to not trusting the slave's state
50		for startup. \fBsafe::loadTk\fR registers the slave's name so when the Tk
51		initialization (\fBTk_SafeInit\fR) is called and in turn calls the master's
	49	Tk initialization is now safe with respect to not trusting the child's state
	50	for startup. \fBsafe::loadTk\fR registers the child's name so when the Tk
	51	initialization (\fBTk_SafeInit\fR) is called and in turn calls the parent's
52	52	\fBsafe::InitTk\fR it will return the desired \fBargv\fR equivalent
53	53	(\fB\-use\fR \fIwindowId\fR, correct \fB\-display\fR, etc.)
54	54	.PP

61	61	.SH "SEE ALSO"
62	62	safe(n), interp(n), library(n), load(n), package(n), source(n), unknown(n)
63	63	.SH KEYWORDS
64		alias, auto-loading, auto_mkindex, load, master interpreter, safe
65		interpreter, slave interpreter, source
	64	alias, auto-loading, auto_mkindex, load, parent interpreter, safe
	65	interpreter, child interpreter, source
66	66	'\" Local Variables:
67	67	'\" mode: nroff
68	68	'\" End:

+10

-8

doc/menu.n less more

39	39	entries will number starting at 1. The default
40	40	menu bindings arrange for the menu to be torn off when the tear-off
41	41	entry is invoked.
42		This option is ignored under Aqua/Mac OS X, where menus cannot
	42	This option is ignored under Aqua/MacOS, where menus cannot
43	43	be torn off.
44	44	.OP \-tearoffcommand tearOffCommand TearOffCommand
45	45	If this option has a non-empty value, then it specifies a Tcl command

53	53	create a new menu \fB.x.tearoff1\fR, then the command
54	54	.QW "\fBa b .x.y .x.tearoff1\fR"
55	55	will be invoked.
56		This option is ignored under Aqua/Mac OS X, where menus cannot
	56	This option is ignored under Aqua/MacOS, where menus cannot
57	57	be torn off.
58	58	.OP \-title title Title
59	59	The string will be used to title the window created when this menu is

522	522	\fB\-activebackground \fIvalue\fR
523	523	.
524	524	Specifies a background color to use for displaying this entry when it
525		is active.
526		If this option is specified as an empty string (the default), then the
	525	is active. This option is ignored on Aqua/MacOS.
	526	If it is specified as an empty string (the default), then the
527	527	\fB\-activebackground\fR option for the overall menu is used.
528	528	If the \fBtk_strictMotif\fR variable has been set to request strict
529	529	Motif compliance, then this option is ignored and the \fB\-background\fR

533	533	\fB\-activeforeground \fIvalue\fR
534	534	.
535	535	Specifies a foreground color to use for displaying this entry when it
536		is active.
	536	is active. This option is ignored on Aqua/macOS.
537	537	If this option is specified as an empty string (the default), then the
538	538	\fB\-activeforeground\fR option for the overall menu is used.
539	539	This option is not available for separator or tear-off entries.

551	551	.
552	552	Specifies a background color to use for displaying this entry when it
553	553	is in the normal state (neither active nor disabled).
554		If this option is specified as an empty string (the default), then the
	554	This option is ignored on Aqua/macOS.
	555	If it is specified as an empty string (the default), then the
555	556	\fB\-background\fR option for the overall menu is used.
556	557	This option is not available for separator or tear-off entries.
557	558	.TP

572	573	When this option is zero, the entry appears below the previous entry. When
573	574	this option is one, the entry appears at the top of a new column in the
574	575	menu.
575		This option is ignored on Aqua/Mac OS X, where menus are always a single
	576	This option is ignored on Aqua/macOS, where menus are always a single
576	577	column.
577	578	.TP
578	579	\fB\-command \fIvalue\fR

602	603	.
603	604	Specifies a foreground color to use for displaying this entry when it
604	605	is in the normal state (neither active nor disabled).
605		If this option is specified as an empty string (the default), then the
	606	This option is ignored on Aqua/macOS.
	607	If it is specified as an empty string (the default), then the
606	608	\fB\-foreground\fR option for the overall menu is used.
607	609	This option is not available for separator or tear-off entries.
608	610	.TP

+108

-102

doc/pack.n less more

3	3	'\"
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	7	.TH pack n 4.0 Tk "Tk Built-In Commands"
8	8	.so man.macros
9	9	.BS

21	21	The \fBpack\fR command can have any of several forms, depending
22	22	on the \fIoption\fR argument:
23	23	.TP
24		\fBpack \fIslave \fR?\fIslave ...\fR? ?\fIoptions\fR?
	24	\fBpack \fIwindow \fR?\fIwindow ...\fR? ?\fIoptions\fR?
25	25	If the first argument to \fBpack\fR is a window name (any value
26	26	starting with
27	27	.QW . ),
28	28	then the command is processed in the same way as \fBpack configure\fR.
29	29	.TP
30		\fBpack configure \fIslave \fR?\fIslave ...\fR? ?\fIoptions\fR?
31		The arguments consist of the names of one or more slave windows
	30	\fBpack configure \fIwindow \fR?\fIwindow ...\fR? ?\fIoptions\fR?
	31	The arguments consist of the names of one or more content windows
32	32	followed by pairs of arguments that specify how
33		to manage the slaves.
	33	to manage the content.
34	34	See \fBTHE PACKER ALGORITHM\fR below for details on how the options
35	35	are used by the packer.
36	36	The following options are supported:

38	38	.TP
39	39	\fB\-after \fIother\fR
40	40	\fIOther\fR must the name of another window.
41		Use its master as the master for the slaves, and insert
42		the slaves just after \fIother\fR in the packing order.
	41	Use its container as the container for the content, and insert
	42	the content just after \fIother\fR in the packing order.
43	43	.TP
44	44	\fB\-anchor \fIanchor\fR
45	45	\fIAnchor\fR must be a valid anchor position such as \fBn\fR
46		or \fBsw\fR; it specifies where to position each slave in its
	46	or \fBsw\fR; it specifies where to position each content in its
47	47	parcel.
48	48	Defaults to \fBcenter\fR.
49	49	.TP
50	50	\fB\-before \fIother\fR
51	51	\fIOther\fR must the name of another window.
52		Use its master as the master for the slaves, and insert
53		the slaves just before \fIother\fR in the packing order.
	52	Use its container as the container for the content, and insert
	53	the content just before \fIother\fR in the packing order.
54	54	.TP
55	55	\fB\-expand \fIboolean\fR
56		Specifies whether the slaves should be expanded to consume
57		extra space in their master.
	56	Specifies whether the content should be expanded to consume
	57	extra space in their container.
58	58	\fIBoolean\fR may have any proper boolean value, such as \fB1\fR
59	59	or \fBno\fR.
60	60	Defaults to 0.
61	61	.TP
62	62	\fB\-fill \fIstyle\fR
63		If a slave's parcel is larger than its requested dimensions, this
64		option may be used to stretch the slave.
	63	If a content's parcel is larger than its requested dimensions, this
	64	option may be used to stretch the content.
65	65	\fIStyle\fR must have one of the following values:
66	66	.RS
67	67	.TP
68	68	\fBnone\fR
69		Give the slave its requested dimensions plus any internal padding
	69	Give the content its requested dimensions plus any internal padding
70	70	requested with \fB\-ipadx\fR or \fB\-ipady\fR. This is the default.
71	71	.TP
72	72	\fBx\fR
73		Stretch the slave horizontally to fill the entire width of its
	73	Stretch the content horizontally to fill the entire width of its
74	74	parcel (except leave external padding as specified by \fB\-padx\fR).
75	75	.TP
76	76	\fBy\fR
77		Stretch the slave vertically to fill the entire height of its
	77	Stretch the content vertically to fill the entire height of its
78	78	parcel (except leave external padding as specified by \fB\-pady\fR).
79	79	.TP
80	80	\fBboth\fR
81		Stretch the slave both horizontally and vertically.
	81	Stretch the content both horizontally and vertically.
82	82	.RE
83	83	.TP
84		\fB\-in \fIother\fR
85		Insert the slave(s) at the end of the packing order for the master
86		window given by \fIother\fR.
	84	\fB\-in \fIcontainer\fR
	85	Insert the window at the end of the packing order for the container
	86	window given by \fIcontainer\fR.
87	87	.TP
88	88	\fB\-ipadx \fIamount\fR
89	89	\fIAmount\fR specifies how much horizontal internal padding to
90		leave on each side of the slave(s).
	90	leave on each side of the content.
91	91	\fIAmount\fR must be a valid screen distance, such as \fB2\fR or \fB.5c\fR.
92	92	It defaults to 0.
93	93	.TP
94	94	\fB\-ipady \fIamount\fR
95	95	\fIAmount\fR specifies how much vertical internal padding to
96		leave on each side of the slave(s).
	96	leave on each side of the content.
97	97	\fIAmount\fR defaults to 0.
98	98	.TP
99	99	\fB\-padx \fIamount\fR
100	100	\fIAmount\fR specifies how much horizontal external padding to
101		leave on each side of the slave(s). \fIAmount\fR may be a list
	101	leave on each side of the content. \fIAmount\fR may be a list
102	102	of two values to specify padding for left and right separately.
103	103	\fIAmount\fR defaults to 0.
104	104	.TP
105	105	\fB\-pady \fIamount\fR
106	106	\fIAmount\fR specifies how much vertical external padding to
107		leave on each side of the slave(s). \fIAmount\fR may be a list
	107	leave on each side of the content. \fIAmount\fR may be a list
108	108	of two values to specify padding for top and bottom separately.
109	109	\fIAmount\fR defaults to 0.
110	110	.TP
111	111	\fB\-side \fIside\fR
112		Specifies which side of the master the slave(s) will be packed against.
	112	Specifies which side of the container the content will be packed against.
113	113	Must be \fBleft\fR, \fBright\fR, \fBtop\fR, or \fBbottom\fR.
114	114	Defaults to \fBtop\fR.
115	115	.LP
116	116	If no \fB\-in\fR, \fB\-after\fR or \fB\-before\fR option is specified
117		then each of the slaves will be inserted at the end of the packing list
	117	then each of the content will be inserted at the end of the packing list
118	118	for its parent unless it is already managed by the packer (in which
119	119	case it will be left where it is).
120		If one of these options is specified then all the slaves will be
	120	If one of these options is specified then all the content will be
121	121	inserted at the specified point.
122		If any of the slaves are already managed by the geometry manager
	122	If any of the content are already managed by the geometry manager
123	123	then any unspecified options for them retain their previous values rather
124	124	than receiving default values.
125	125	.RE
126	126	.TP
127		\fBpack forget \fIslave \fR?\fIslave ...\fR?
128		Removes each of the \fIslave\fRs from the packing order for its
129		master and unmaps their windows.
130		The slaves will no longer be managed by the packer.
131		.TP
132		\fBpack info \fIslave\fR
	127	\fBpack forget \fIwindow \fR?\fIwindow ...\fR?
	128	Removes each of the \fIwindow\fRs from the packing order for its
	129	container and unmaps their windows.
	130	The content will no longer be managed by the packer.
	131	.TP
	132	\fBpack info \fIwindow\fR
133	133	Returns a list whose elements are the current configuration state of
134		the slave given by \fIslave\fR in the same option-value form that
	134	the window given by \fIwindow\fR in the same option-value form that
135	135	might be specified to \fBpack configure\fR.
136	136	The first two elements of the list are
137		.QW "\fB\-in \fImaster\fR"
138		where \fImaster\fR is the slave's master.
139		.TP
140		\fBpack propagate \fImaster\fR ?\fIboolean\fR?
	137	.QW "\fB\-in \fIcontainer\fR"
	138	where \fIcontainer\fR is the window's container.
	139	.TP
	140	\fBpack propagate \fIcontainer\fR ?\fIboolean\fR?
141	141	If \fIboolean\fR has a true boolean value such as \fB1\fR or \fBon\fR
142		then propagation is enabled for \fImaster\fR, which must be a window
	142	then propagation is enabled for \fIcontainer\fR, which must be a window
143	143	name (see \fBGEOMETRY PROPAGATION\fR below).
144	144	If \fIboolean\fR has a false boolean value then propagation is
145		disabled for \fImaster\fR.
	145	disabled for \fIcontainer\fR.
146	146	In either of these cases an empty string is returned.
147	147	If \fIboolean\fR is omitted then the command returns \fB0\fR or
148	148	\fB1\fR to indicate whether propagation is currently enabled
149		for \fImaster\fR.
	149	for \fIcontainer\fR.
150	150	Propagation is enabled by default.
151	151	.TP
152		\fBpack slaves \fImaster\fR
153		Returns a list of all of the slaves in the packing order for \fImaster\fR.
154		The order of the slaves in the list is the same as their order in
	152	\fBpack slaves \fIwindow\fR
	153	Returns a list of all of the content windows in the packing order for \fIwindow\fR.
	154	The order of the content windows in the list is the same as their order in
155	155	the packing order.
156		If \fImaster\fR has no slaves then an empty string is returned.
	156	If \fIwindow\fR has no content then an empty string is returned.
	157	.VS "TIP 581"
	158	.TP
	159	\fBpack content \fIwindow\fR
	160	.
	161	Synonym for . \fBpack slaves \fIwindow\fR
	162	.VE "TIP 581"
157	163	.SH "THE PACKER ALGORITHM"
158	164	.PP
159		For each master the packer maintains an ordered list of slaves
160		called the \fIpacking list\fR.
	165	For each container the packer maintains an ordered list of content
	166	windows called the \fIpacking list\fR.
161	167	The \fB\-in\fR, \fB\-after\fR, and \fB\-before\fR configuration
162		options are used to specify the master for each slave and the slave's
	168	options are used to specify the container for each content and the content's
163	169	position in the packing list.
164		If none of these options is given for a slave then the slave
	170	If none of these options is given for a content then the content
165	171	is added to the end of the packing list for its parent.
166	172	.PP
167		The packer arranges the slaves for a master by scanning the
	173	The packer arranges the content windows for a container by scanning the
168	174	packing list in order.
169		At the time it processes each slave, a rectangular area within
170		the master is still unallocated.
171		This area is called the \fIcavity\fR; for the first slave it
172		is the entire area of the master.
173		.PP
174		For each slave the packer carries out the following steps:
	175	At the time it processes each content, a rectangular area within
	176	the container is still unallocated.
	177	This area is called the \fIcavity\fR; for the first content it
	178	is the entire area of the container.
	179	.PP
	180	For each content the packer carries out the following steps:
175	181	.IP [1]
176		The packer allocates a rectangular \fIparcel\fR for the slave
177		along the side of the cavity given by the slave's \fB\-side\fR option.
	182	The packer allocates a rectangular \fIparcel\fR for the content
	183	along the side of the cavity given by the content's \fB\-side\fR option.
178	184	If the side is top or bottom then the width of the parcel is
179	185	the width of the cavity and its height is the requested height
180		of the slave plus the \fB\-ipady\fR and \fB\-pady\fR options.
	186	of the content plus the \fB\-ipady\fR and \fB\-pady\fR options.
181	187	For the left or right side the height of the parcel is
182	188	the height of the cavity and the width is the requested width
183		of the slave plus the \fB\-ipadx\fR and \fB\-padx\fR options.
	189	of the content plus the \fB\-ipadx\fR and \fB\-padx\fR options.
184	190	The parcel may be enlarged further because of the \fB\-expand\fR
185	191	option (see \fBEXPANSION\fR below)
186	192	.IP [2]
187		The packer chooses the dimensions of the slave.
188		The width will normally be the slave's requested width plus
	193	The packer chooses the dimensions of the content.
	194	The width will normally be the content's requested width plus
189	195	twice its \fB\-ipadx\fR option and the height will normally be
190		the slave's requested height plus twice its \fB\-ipady\fR
	196	the content's requested height plus twice its \fB\-ipady\fR
191	197	option.
192	198	However, if the \fB\-fill\fR option is \fBx\fR or \fBboth\fR
193		then the width of the slave is expanded to fill the width of the parcel,
	199	then the width of the content is expanded to fill the width of the parcel,
194	200	minus twice the \fB\-padx\fR option.
195	201	If the \fB\-fill\fR option is \fBy\fR or \fBboth\fR
196		then the height of the slave is expanded to fill the width of the parcel,
	202	then the height of the content is expanded to fill the width of the parcel,
197	203	minus twice the \fB\-pady\fR option.
198	204	.IP [3]
199		The packer positions the slave over its parcel.
200		If the slave is smaller than the parcel then the \fB\-anchor\fR
201		option determines where in the parcel the slave will be placed.
	205	The packer positions the content over its parcel.
	206	If the content is smaller than the parcel then the \fB\-anchor\fR
	207	option determines where in the parcel the content will be placed.
202	208	If \fB\-padx\fR or \fB\-pady\fR is non-zero, then the given
203	209	amount of external padding will always be left between the
204		slave and the edges of the parcel.
205		.PP
206		Once a given slave has been packed, the area of its parcel
	210	content and the edges of the parcel.
	211	.PP
	212	Once a given content has been packed, the area of its parcel
207	213	is subtracted from the cavity, leaving a smaller rectangular
208		cavity for the next slave.
209		If a slave does not use all of its parcel, the unused space
210		in the parcel will not be used by subsequent slaves.
	214	cavity for the next content.
	215	If a content does not use all of its parcel, the unused space
	216	in the parcel will not be used by subsequent content.
211	217	If the cavity should become too small to meet the needs of
212		a slave then the slave will be given whatever space is
	218	a content then the content will be given whatever space is
213	219	left in the cavity.
214		If the cavity shrinks to zero size, then all remaining slaves
	220	If the cavity shrinks to zero size, then all remaining content
215	221	on the packing list will be unmapped from the screen until
216		the master window becomes large enough to hold them again.
	222	the container window becomes large enough to hold them again.
217	223	.SS "EXPANSION"
218	224	.PP
219		If a master window is so large that there will be extra space
220		left over after all of its slaves have been packed, then the
221		extra space is distributed uniformly among all of the slaves
	225	If a container window is so large that there will be extra space
	226	left over after all of its content have been packed, then the
	227	extra space is distributed uniformly among all of the content
222	228	for which the \fB\-expand\fR option is set.
223	229	Extra horizontal space is distributed among the expandable
224		slaves whose \fB\-side\fR is \fBleft\fR or \fBright\fR,
	230	content whose \fB\-side\fR is \fBleft\fR or \fBright\fR,
225	231	and extra vertical space is distributed among the expandable
226		slaves whose \fB\-side\fR is \fBtop\fR or \fBbottom\fR.
	232	content whose \fB\-side\fR is \fBtop\fR or \fBbottom\fR.
227	233	.SS "GEOMETRY PROPAGATION"
228	234	.PP
229		The packer normally computes how large a master must be to
230		just exactly meet the needs of its slaves, and it sets the
231		requested width and height of the master to these dimensions.
	235	The packer normally computes how large a container must be to
	236	just exactly meet the needs of its content, and it sets the
	237	requested width and height of the container to these dimensions.
232	238	This causes geometry information to propagate up through a
233	239	window hierarchy to a top-level window so that the entire
234	240	sub-tree sizes itself to fit the needs of the leaf windows.
235	241	However, the \fBpack propagate\fR command may be used to
236		turn off propagation for one or more masters.
	242	turn off propagation for one or more containers.
237	243	If propagation is disabled then the packer will not set
238	244	the requested width and height of the packer.
239		This may be useful if, for example, you wish for a master
	245	This may be useful if, for example, you wish for a container
240	246	window to have a fixed size that you specify.
241		.SH "RESTRICTIONS ON MASTER WINDOWS"
242		.PP
243		The master for each slave must either be the slave's parent
244		(the default) or a descendant of the slave's parent.
	247	.SH "RESTRICTIONS ON CONTAINER WINDOWS"
	248	.PP
	249	The container for each content must either be the content's parent
	250	(the default) or a descendant of the content's parent.
245	251	This restriction is necessary to guarantee that the
246		slave can be placed over any part of its master that is
247		visible without danger of the slave being clipped by its parent.
	252	content can be placed over any part of its container that is
	253	visible without danger of the content being clipped by its parent.
248	254	.SH "PACKING ORDER"
249	255	.PP
250		If the master for a slave is not its parent then you must make sure
251		that the slave is higher in the stacking order than the master.
252		Otherwise the master will obscure the slave and it will appear as
253		if the slave has not been packed correctly.
254		The easiest way to make sure the slave is higher than the master is
255		to create the master window first: the most recently created window
	256	If the container for a content is not its parent then you must make sure
	257	that the content is higher in the stacking order than the container.
	258	Otherwise the container will obscure the content and it will appear as
	259	if the content has not been packed correctly.
	260	The easiest way to make sure the content is higher than the container is
	261	to create the container window first: the most recently created window
256	262	will be highest in the stacking order.
257	263	Or, you can use the \fBraise\fR and \fBlower\fR commands to change
258		the stacking order of either the master or the slave.
	264	the stacking order of either the container or the content.
259	265	.SH EXAMPLE
260	266	.PP
261	267	.CS

+1

-1

doc/panedwindow.n less more

329	329	fill, and the containing toplevel is resized), space is added to the final
330	330	(rightmost or bottommost) pane in the window.
331	331	.PP
332		Unlike slave windows managed by e.g. pack or grid, the panes managed by a
	332	Unlike child windows managed by e.g. pack or grid, the panes managed by a
333	333	panedwindow do not change width or height to accommodate changes in the
334	334	requested widths or heights of the panes, once these have become mapped.
335	335	Therefore it may be advisable, particularly when creating layouts

+62

-56

doc/place.n less more

3	3	'\"
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	7	.TH place n "" Tk "Tk Built-In Commands"
8	8	.so man.macros
9	9	.BS

17	17	.PP
18	18	The placer is a geometry manager for Tk.
19	19	It provides simple fixed placement of windows, where you specify
20		the exact size and location of one window, called the \fIslave\fR,
21		within another window, called the \fImaster\fR.
	20	the exact size and location of one window, called the \fIcontent\fR,
	21	within another window, called the \fIcontainer\fR.
22	22	The placer also provides rubber-sheet placement, where you specify the
23		size and location of the slave in terms of the dimensions of
24		the master, so that the slave changes size and location
25		in response to changes in the size of the master.
	23	size and location of the content in terms of the dimensions of
	24	the container, so that the content changes size and location
	25	in response to changes in the size of the container.
26	26	Lastly, the placer allows you to mix these styles of placement so
27		that, for example, the slave has a fixed width and height but is
28		centered inside the master.
	27	that, for example, the content has a fixed width and height but is
	28	centered inside the container.
29	29	.PP
30	30	.TP
31	31	\fBplace \fIwindow option value \fR?\fIoption value ...\fR?
32		Arrange for the placer to manage the geometry of a slave whose
	32	Arrange for the placer to manage the geometry of a content whose
33	33	pathName is \fIwindow\fR. The remaining arguments consist of one or
34	34	more \fIoption\-value\fR pairs that specify the way in which
35	35	\fIwindow\fR's geometry is managed. \fIOption\fR may have any of the
36	36	values accepted by the \fBplace configure\fR command.
37	37	.TP
38	38	\fBplace configure \fIwindow \fR?\fIoption\fR? ?\fIvalue option value ...\fR?
39		Query or modify the geometry options of the slave given by
	39	Query or modify the geometry options of the content given by
40	40	\fIwindow\fR. If no \fIoption\fR is specified, this command returns a
41	41	list describing the available options (see \fBTk_ConfigureInfo\fR for
42	42	information on the format of this list). If \fIoption\fR is specified

58	58	including its border, if any.
59	59	Thus if \fIwhere\fR is \fBse\fR then the lower-right corner of
60	60	\fIwindow\fR's border will appear at the given (x,y) location
61		in the master.
	61	in the container.
62	62	The anchor position defaults to \fBnw\fR.
63	63	.TP
64	64	\fB\-bordermode \fImode\fR
65	65	\fIMode\fR determines the degree to which borders within the
66		master are used in determining the placement of the slave.
	66	container are used in determining the placement of the content.
67	67	The default and most common value is \fBinside\fR.
68		In this case the placer considers the area of the master to
69		be the innermost area of the master, inside any border:
	68	In this case the placer considers the area of the container to
	69	be the innermost area of the container, inside any border:
70	70	an option of \fB\-x 0\fR corresponds to an x-coordinate just
71	71	inside the border and an option of \fB\-relwidth 1.0\fR
72		means \fIwindow\fR will fill the area inside the master's
	72	means \fIwindow\fR will fill the area inside the container's
73	73	border.
74	74	.RS
75	75	.PP
76	76	If \fImode\fR is \fBoutside\fR then the placer considers
77		the area of the master to include its border;
	77	the area of the container to include its border;
78	78	this mode is typically used when placing \fIwindow\fR
79		outside its master, as with the options \fB\-x 0 \-y 0 \-anchor ne\fR.
	79	outside its container, as with the options \fB\-x 0 \-y 0 \-anchor ne\fR.
80	80	Lastly, \fImode\fR may be specified as \fBignore\fR, in which
81		case borders are ignored: the area of the master is considered
	81	case borders are ignored: the area of the container is considered
82	82	to be its official X area, which includes any internal border but
83	83	no external border. A bordermode of \fBignore\fR is probably
84	84	not very useful.

93	93	\fB\-relheight\fR option is specified, then the height requested
94	94	internally by the window will be used.
95	95	.TP
96		\fB\-in \fImaster\fR
97		\fIMaster\fR specifies the path name of the window relative
	96	\fB\-in \fIcontainer\fR
	97	\fIContainer\fR specifies the path name of the window relative
98	98	to which \fIwindow\fR is to be placed.
99		\fIMaster\fR must either be \fIwindow\fR's parent or a descendant
	99	\fIContainer\fR must either be \fIwindow\fR's parent or a descendant
100	100	of \fIwindow\fR's parent.
101		In addition, \fImaster\fR and \fIwindow\fR must both be descendants
	101	In addition, \fIcontainer\fR and \fIwindow\fR must both be descendants
102	102	of the same top-level window.
103	103	These restrictions are necessary to guarantee
104		that \fIwindow\fR is visible whenever \fImaster\fR is visible.
105		If this option is not specified then the master defaults to
	104	that \fIwindow\fR is visible whenever \fIcontainer\fR is visible.
	105	If this option is not specified then the other window defaults to
106	106	\fIwindow\fR's parent.
107	107	.TP
108	108	\fB\-relheight \fIsize\fR
109	109	\fISize\fR specifies the height for \fIwindow\fR.
110	110	In this case the height is specified as a floating-point number
111		relative to the height of the master: 0.5 means \fIwindow\fR will
112		be half as high as the master, 1.0 means \fIwindow\fR will have
113		the same height as the master, and so on.
114		If both \fB\-height\fR and \fB\-relheight\fR are specified for a slave,
	111	relative to the height of the container: 0.5 means \fIwindow\fR will
	112	be half as high as the container, 1.0 means \fIwindow\fR will have
	113	the same height as the container, and so on.
	114	If both \fB\-height\fR and \fB\-relheight\fR are specified for a content,
115	115	their values are summed. For example, \fB\-relheight 1.0 \-height \-2\fR
116		makes the slave 2 pixels shorter than the master.
	116	makes the content 2 pixels shorter than the container.
117	117	.TP
118	118	\fB\-relwidth \fIsize\fR
119	119	\fISize\fR specifies the width for \fIwindow\fR.
120	120	In this case the width is specified as a floating-point number
121		relative to the width of the master: 0.5 means \fIwindow\fR will
122		be half as wide as the master, 1.0 means \fIwindow\fR will have
123		the same width as the master, and so on.
124		If both \fB\-width\fR and \fB\-relwidth\fR are specified for a slave,
	121	relative to the width of the container: 0.5 means \fIwindow\fR will
	122	be half as wide as the container, 1.0 means \fIwindow\fR will have
	123	the same width as the container, and so on.
	124	If both \fB\-width\fR and \fB\-relwidth\fR are specified for a content,
125	125	their values are summed. For example, \fB\-relwidth 1.0 \-width 5\fR
126		makes the slave 5 pixels wider than the master.
	126	makes the content 5 pixels wider than the container.
127	127	.TP
128	128	\fB\-relx \fIlocation\fR
129		\fILocation\fR specifies the x-coordinate within the master window
	129	\fILocation\fR specifies the x-coordinate within the container window
130	130	of the anchor point for \fIwindow\fR.
131	131	In this case the location is specified in a relative fashion
132	132	as a floating-point number: 0.0 corresponds to the left edge
133		of the master and 1.0 corresponds to the right edge of the master.
	133	of the container and 1.0 corresponds to the right edge of the container.
134	134	\fILocation\fR need not be in the range 0.0\-1.0.
135		If both \fB\-x\fR and \fB\-relx\fR are specified for a slave
	135	If both \fB\-x\fR and \fB\-relx\fR are specified for a content
136	136	then their values are summed. For example, \fB\-relx 0.5 \-x \-2\fR
137		positions the left edge of the slave 2 pixels to the left of the
138		center of its master.
	137	positions the left edge of the content 2 pixels to the left of the
	138	center of its container.
139	139	.TP
140	140	\fB\-rely \fIlocation\fR
141		\fILocation\fR specifies the y-coordinate within the master window
	141	\fILocation\fR specifies the y-coordinate within the container window
142	142	of the anchor point for \fIwindow\fR.
143	143	In this case the value is specified in a relative fashion
144	144	as a floating-point number: 0.0 corresponds to the top edge
145		of the master and 1.0 corresponds to the bottom edge of the master.
	145	of the container and 1.0 corresponds to the bottom edge of the container.
146	146	\fILocation\fR need not be in the range 0.0\-1.0.
147		If both \fB\-y\fR and \fB\-rely\fR are specified for a slave
	147	If both \fB\-y\fR and \fB\-rely\fR are specified for a content
148	148	then their values are summed. For example, \fB\-rely 0.5 \-x 3\fR
149		positions the top edge of the slave 3 pixels below the
150		center of its master.
	149	positions the top edge of the content 3 pixels below the
	150	center of its container.
151	151	.TP
152	152	\fB\-width \fIsize\fR
153	153	\fISize\fR specifies the width for \fIwindow\fR in screen units

159	159	internally by the window will be used.
160	160	.TP
161	161	\fB\-x \fIlocation\fR
162		\fILocation\fR specifies the x-coordinate within the master window
	162	\fILocation\fR specifies the x-coordinate within the container window
163	163	of the anchor point for \fIwindow\fR.
164	164	The location is specified in screen units (i.e. any of the forms
165	165	accepted by \fBTk_GetPixels\fR) and need not lie within the bounds
166		of the master window.
	166	of the container window.
167	167	.TP
168	168	\fB\-y \fIlocation\fR
169		\fILocation\fR specifies the y-coordinate within the master window
	169	\fILocation\fR specifies the y-coordinate within the container window
170	170	of the anchor point for \fIwindow\fR.
171	171	The location is specified in screen units (i.e. any of the forms
172	172	accepted by \fBTk_GetPixels\fR) and need not lie within the bounds
173		of the master window.
	173	of the container window.
174	174	.PP
175	175	If the same value is specified separately with
176	176	two different options, such as \fB\-x\fR and \fB\-relx\fR, then

191	191	command.
192	192	.TP
193	193	\fBplace slaves \fIwindow\fR
194		Returns a list of all the slave windows for which \fIwindow\fR is the master.
195		If there are no slaves for \fIwindow\fR then an empty string is returned.
	194	Returns a list of all the content windows for which \fIwindow\fR is the container.
	195	If there is no content for \fIwindow\fR then an empty string is returned.
	196	.VS "TIP 581"
	197	.TP
	198	\fBplace content \fIwindow\fR
	199	.
	200	Synonym for . \fBplace slaves \fIwindow\fR
	201	.VE "TIP 581"
196	202	.PP
197	203	If the configuration of a window has been retrieved with
198	204	\fBplace info\fR, that configuration can be restored later by

201	207	the saved information.
202	208	.SH "FINE POINTS"
203	209	.PP
204		It is not necessary for the master window to be the parent
205		of the slave window.
	210	It is not necessary for the container window to be the parent
	211	of the content window.
206	212	This feature is useful in at least two situations.
207	213	First, for complex window layouts it means you can create a
208	214	hierarchy of subwindows whose only purpose

220	226	without being aware of the structure of the geometry-management
221	227	hierarchy.
222	228	.PP
223		A second reason for having a master different than the slave's
	229	A second reason for having a container different than the content's
224	230	parent is to tie two siblings together.
225	231	For example, the placer can be used to force a window always to
226	232	be positioned centered just below one of its

228	234	.CS
229	235	\fB\-in \fIsibling\fB \-relx 0.5 \-rely 1.0 \-anchor n \-bordermode outside\fR
230	236	.CE
231		Whenever the sibling is repositioned in the future, the slave
	237	Whenever the sibling is repositioned in the future, the content
232	238	will be repositioned as well.
233	239	.PP
234	240	Unlike many other geometry managers (such as the packer)
235	241	the placer does not make any attempt to manipulate the geometry of
236		the master windows or the parents of slave windows (i.e. it does not
	242	the container windows or the parents of content windows (i.e. it does not
237	243	set their requested sizes).
238	244	To control the sizes of these windows, make them windows like
239	245	frames and canvases that provide configuration options for this purpose.

248	254	.SH "SEE ALSO"
249	255	grid(n), pack(n)
250	256	.SH KEYWORDS
251		geometry manager, height, location, master, place, rubber sheet, slave, width
	257	geometry manager, height, location, container, place, rubber sheet, content, width
252	258	'\" Local Variables:
253	259	'\" mode: nroff
254	260	'\" End:

+1

-1

doc/selection.n less more

149	149	.PP
150	150	On X11, the \fBPRIMARY\fR selection is a system-wide feature of the X server, allowing communication between different processes that are X11 clients.
151	151	.PP
152		On Windows, the \fBPRIMARY\fR selection is not provided by the system, but only by Tk, and so it is shared only between windows of a master interpreter and its unsafe slave interpreters. It is not shared between interpreters in different processes or different threads. Each master interpreter has a separate \fBPRIMARY\fR selection that is shared only with its unsafe slaves.
	152	On Windows, the \fBPRIMARY\fR selection is not provided by the system, but only by Tk, and so it is shared only between windows of a parent interpreter and its child interpreters. It is not shared between interpreters in different processes or different threads. Each parent interpreter has a separate \fBPRIMARY\fR selection that is shared only with its child interpreters which are not safe interpreters.
153	153	.PP
154	154	.SH SECURITY
155	155	.PP

+4

-3

doc/spinbox.n less more

513	513	If any normal printing characters are typed in a spinbox, they are
514	514	inserted at the point of the insertion cursor.
515	515	.IP [7]
516		The view in the spinbox can be adjusted by dragging with mouse button 2.
517		If mouse button 2 is clicked without moving the mouse, the selection
518		is copied into the spinbox at the position of the mouse cursor.
	516	The view in the spinbox can be adjusted by dragging with the middle
	517	mouse button (button 2, or button 3 in TkAqua). If the middle mouse
	518	button is clicked without moving the mouse, the selection is copied
	519	into the spinbox at the position of the mouse cursor.
519	520	.IP [8]
520	521	If the mouse is dragged out of the spinbox on the left or right sides
521	522	while button 1 is pressed, the spinbox will automatically scroll to

+12

-10

doc/text.n less more

3	3	'\"
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	7	.TH text n 8.5 Tk "Tk Built-In Commands"
8	8	.so man.macros
9	9	.BS

1081	1081	the same character, if \fIop\fR is < then 1 is returned if \fIindex1\fR refers
1082	1082	to an earlier character in the text than \fIindex2\fR, and so on.
1083	1083	.TP
1084		\fIpathName \fBconfigure\fR ?\fIoption\fR? \fI?value option value ...\fR?
	1084	\fIpathName \fBconfigure\fR ?\fIoption\fR? ?\fIvalue option value ...\fR?
1085	1085	.
1086	1086	Query or modify the configuration options of the widget. If no \fIoption\fR is
1087	1087	specified, returns a list describing all of the available options for

1094	1094	this case the command returns an empty string. \fIOption\fR may have any of
1095	1095	the values accepted by the \fBtext\fR command.
1096	1096	.TP
1097		\fIpathName \fBcount\fR \fI?options\fR? \fIindex1 index2\fR
	1097	\fIpathName \fBcount\fR ?\fIoptions\fR? \fIindex1 index2\fR
1098	1098	.
1099	1099	Counts the number of relevant things between the two indices. If \fIindex1\fR
1100	1100	is after \fIindex2\fR, the result will be a negative number (and this holds

2024	2024	.SH BINDINGS
2025	2025	.PP
2026	2026	Tk automatically creates class bindings for texts that give them the following
2027		default behavior. In the descriptions below,
	2027	default behavior.
	2028	In the descriptions below,
2028	2029	.QW word
2029		is dependent on the value of the \fBtcl_wordchars\fR variable. See
2030		\fBtclvars\fR(n).
	2030	is dependent on the value of
	2031	the \fBtcl_wordchars\fR variable. See \fBtclvars\fR(n).
2031	2032	.IP [1]
2032	2033	Clicking mouse button 1 positions the insertion cursor just before the
2033	2034	character underneath the mouse cursor, sets the input focus to this widget,

2056	2057	If any normal printing characters are typed, they are inserted at the point of
2057	2058	the insertion cursor.
2058	2059	.IP [7]
2059		The view in the widget can be adjusted by dragging with mouse button 2. If
2060		mouse button 2 is clicked without moving the mouse, the selection is copied
2061		into the text at the position of the mouse cursor. The Insert key also inserts
2062		the selection, but at the position of the insertion cursor.
	2060	The view in the widget can be adjusted by dragging with the middle mouse
	2061	button (button 2, or button 3 in TkAqua). If the middle mouse button is
	2062	clicked without moving the mouse, the selection is copied into the text at the
	2063	position of the mouse cursor. The Insert key also inserts the selection,
	2064	but at the position of the insertion cursor.
2063	2065	.IP [8]
2064	2066	If the mouse is dragged out of the widget while button 1 is pressed, the entry
2065	2067	will automatically scroll to make more text visible (if there is more text

+11

-5

doc/tk_mac.n less more

217	217	.TP
218	218	\fB::tk::mac::standardAboutPanel\fR
219	219	.
220		Brings the standard Cocoa about panel to the front, with all its information
221		filled in from your application bundle files (standard about panel with no
222		options specified). See Apple Technote TN2179 and the AppKit documentation for
223		-[NSApplication orderFrontStandardAboutPanelWithOptions:] for details on the
224		Info.plist keys and app bundle files used by the about panel.
	220	Brings the standard Cocoa about panel to the front with information filled in
	221	from the application bundle files. The panel displays the application icon and
	222	the values associated to the info.plist keys named CFBundleName,
	223	CFBundleShortVersionString, NSAboutPanelOptionVersion and
	224	NSHumanReadableCopyright. If a file named \fICredits.html\fR or
	225	\fICredits.rtf\fR exists in the bundle's Resources directory then its contents
	226	will be displayed in a scrolling text box at the bottom of the dialog. See the
	227	documentation for -[NSApplication orderFrontStandardAboutPanelWithOptions:]
	228	for more details. A hook is also provided for a custom About dialog. If a Tcl
	229	proc named tkAboutDialog is defined in the main interpreter then that
	230	procedure will be called instead of opening the standardAboutPanel.
225	231	.SH "SYSTEM CONFIGURATION"
226	232	.PP
227	233	There are a number of additional global configuration options that control the

+10

-8

doc/ttk_Geometry.3 less more

65	65	.AP short bottom in
66	66	Extra padding (in pixels) to add to the bottom of a region.
67	67	.AP Ttk_Box box in
	68	Specifies a rectangular region.
68	69	.AP "Ttk_Box *" box_rtn out
69		Specifies a rectangular region.
	70	A rectangular region.
70	71	.AP int height in
71	72	The height in pixels of a region.
72	73	.AP "Tcl_Interp *" interp in

78	79	to be converted to an enumerated value or bitmask.
79	80	Internal rep may be be modified to cache corresponding value.
80	81	.AP Ttk_Padding padding in
	82	Extra padding to add on the inside of a region.
81	83	.AP "Ttk_Padding *" padding_rtn out
82		Extra padding to add on the inside of a region.
	84	Padding present in the inside of a region.
83	85	.AP Ttk_Box parcel in
84	86	A rectangular region, allocated from a cavity.
85	87	.AP int relief in
86	88	One of the standard Tk relief options
87		(TK_RELIEF_RAISED, TK_RELIEF_SUNKEN, etc.).
	89	(\fBTK_RELIEF_RAISED\fR, \fBTK_RELIEF_SUNKEN\fR, etc.).
88	90	See \fBTk_GetReliefFromObj\fR.
89	91	.AP short right in
90	92	Extra padding (in pixels) to add to the right side of a region.

94	96	.AP unsigned sticky in
95	97	A bitmask containing one or more of the bits
96	98	\fBTTK_STICK_W\fR (west, or left),
97		\fBTTK_STICK_E\fR (east, or right,
	99	\fBTTK_STICK_E\fR (east, or right),
98	100	\fBTTK_STICK_N\fR (north, or top), and
99	101	\fBTTK_STICK_S\fR (south, or bottom).
100		\fBTTK_FILL_X\fR is defined as a synonym for (TTK_STICK_W\|TTK_STICK_E),
101		\fBTTK_FILL_Y\fR is a synonym for (TTK_STICK_N\|TTK_STICK_S),
102		and \fBTTK_FILL_BOTH\fR and \fBTTK_STICK_ALL\fR
103		are synonyms for (TTK_FILL_X\|TTK_FILL_Y).
	102	\fBTTK_FILL_X\fR is defined as a synonym for (\fBTTK_STICK_W\fR\|\fBTTK_STICK_E\fR),
	103	\fBTTK_FILL_Y\fR is a synonym for (\fBTTK_STICK_N\fR\|\fBTTK_STICK_S\fR),
	104	and \fBTTK_FILL_BOTH\fR
	105	is a synonym for (\fBTTK_FILL_X\fR\|\fBTTK_FILL_Y\fR).
104	106	See also: \fIgrid(n)\fR.
105	107	.AP Tk_Window tkwin in
106	108	Window whose screen geometry determines

+2

-0

doc/ttk_combobox.n less more

141	141	.RS
142	142	Can only be changed when using non-native and non-graphical themes.
143	143	.RE
	144	\fB\-insertcolor\fP \fIcolor\fP
	145	.br
144	146	\fB\-insertwidth\fP \fIamount\fP
145	147	.br
146	148	\fB\-lightcolor\fP \fIcolor\fP

+9

-6

doc/ttk_entry.n less more

22	22	Entry widgets support horizontal scrolling with the
23	23	standard \fB\-xscrollcommand\fR option and \fBxview\fR widget command.
24	24	.SO ttk_widget
25		\-class \-cursor \-style
	25	\-class \-cursor
	26	\-font \-foreground
	27	\-style
26	28	\-takefocus \-xscrollcommand
27	29	.SE
28	30	.SH "WIDGET-SPECIFIC OPTIONS"

33	35	the current X selection, selecting outside the widget deselects any
34	36	widget selection, and the widget will respond to selection retrieval
35	37	requests when it has a selection.
36		.\" MAYBE: .OP \-font font Font
37		.\" MAYBE: .OP \-foreground foreground Foreground
38	38	.\" MAYBE: .OP \-insertbackground insertBackground Foreground
39	39	.\" MAYBE: .OP \-insertwidth insertWidth InsertWidth
40	40	.OP \-invalidcommand invalidCommand InvalidCommand

352	352	If any normal printing characters are typed in an entry, they are
353	353	inserted at the point of the insert cursor.
354	354	.IP \0\(bu 4
355		The view in the entry can be adjusted by dragging with mouse button 2.
356		If mouse button 2 is clicked without moving the mouse, the selection
357		is copied into the entry at the position of the mouse cursor.
	355	The view in the entry can be adjusted by dragging with the middle
	356	mouse button (button 2, or button 3 in TkAqua). If the middle mouse
	357	button is clicked without moving the mouse, the selection is copied
	358	into the entry at the position of the mouse cursor.
358	359	.IP \0\(bu 4
359	360	If the mouse is dragged out of the entry on the left or right sides
360	361	while button 1 is pressed, the entry will automatically scroll to

445	446	Some themes use a graphical background and their field background colors cannot be changed.
446	447	.RE
447	448	\fB\-foreground\fP \fIcolor\fP
	449	.br
	450	\fB\-insertcolor\fP \fIcolor\fP
448	451	.br
449	452	\fB\-insertwidth\fP \fIamount\fP
450	453	.br

+2

-2

doc/ttk_intro.n less more

59	59	(which displays a text string) has
60	60	\fB\-text\fR, \fB\-font\fR, \fB\-foreground\fR, \fB\-background\fR,
61	61	\fB\-underline\fR, and \fB\-width\fR options.
62		The value of an element option is taken from:
	62	The value of an element option is taken from (in precedence order):
63	63	.IP \(bu
64	64	an option of the same name and type in the widget containing the element;
65	65	.IP \(bu

85	85	Scrollbar.trough \-children {
86	86	Scrollbar.leftarrow \-side left \-sticky w
87	87	Scrollbar.rightarrow \-side right \-sticky e
88		Scrollbar.thumb \-side left \-expand true \-sticky ew
	88	Scrollbar.thumb \-sticky ew
89	89	}
90	90	}
91	91	.CE

+5

-5

doc/ttk_notebook.n less more

19	19	.SH DESCRIPTION
20	20	A \fBttk::notebook\fR widget manages a collection of windows
21	21	and displays a single one at a time.
22		Each slave window is associated with a \fItab\fR,
	22	Each content window is associated with a \fItab\fR,
23	23	which the user may select to change the currently-displayed window.
24	24	.SO ttk_widget
25	25	\-class \-cursor \-takefocus

55	55	If \fBdisabled\fR, then the tab is not selectable.
56	56	If \fBhidden\fR, then the tab is not shown.
57	57	.OP \-sticky sticky Sticky
58		Specifies how the slave window is positioned within the pane area.
	58	Specifies how the content window is positioned within the pane area.
59	59	Value is a string containing zero or more of the characters
60	60	\fBn, s, e,\fR or \fBw\fR.
61	61	Each letter refers to a side (north, south, east, or west)
62		that the slave window will
	62	that the content window will
63	63	.QW stick
64	64	to, as per the \fBgrid\fR geometry manager.
65	65	.OP \-padding padding Padding

85	85	.IP \(bu
86	86	An integer between zero and the number of tabs;
87	87	.IP \(bu
88		The name of a slave window;
	88	The name of a content window;
89	89	.IP \(bu
90	90	A positional specification of the form
91	91	.QW @\fIx\fR,\fIy\fR ,

155	155	.TP
156	156	\fIpathname \fBselect\fR ?\fItabid\fR?
157	157	Selects the specified tab.
158		The associated slave window will be displayed,
	158	The associated content window will be displayed,
159	159	and the previously-selected window (if different) is unmapped.
160	160	If \fItabid\fR is omitted, returns the widget name of the
161	161	currently selected pane.

+4

-0

doc/ttk_spinbox.n less more

106	106	.br
107	107	\fB\-foreground\fP \fIcolor\fP
108	108	.br
	109	\fB\-insertcolor\fP \fIcolor\fP
	110	.br
	111	\fB\-insertwidth\fP \fIamount\fP
	112	.br
109	113	\fB\-lightcolor\fP \fIcolor\fP
110	114	.br
111	115	\fB\-padding\fP \fIpadding\fP

+60

-31

doc/ttk_style.n less more

33	33	\fBttk::style configure \fIstyle\fR ?\fI\-option\fR ?\fIvalue option value...\fR? ?
34	34	Sets the default value of the specified option(s) in \fIstyle\fR.
35	35	.TP
36		\fBttk::style map \fIstyle\fR ?\fI\-option\fB { \fIstatespec value...\fB }\fR?
37		Sets dynamic values of the specified option(s) in \fIstyle\fR.
38		Each \fIstatespec / value\fR pair is examined in order;
39		the value corresponding to the first matching \fIstatespec\fR
40		is used.
41		.TP
42		\fBttk::style lookup \fIstyle\fR \fI\-option \fR?\fIstate \fR?\fIdefault\fR??
43		Returns the value specified for \fI\-option\fR in style \fIstyle\fR
44		in state \fIstate\fR, using the standard lookup rules for element options.
45		\fIstate\fR is a list of state names; if omitted,
46		it defaults to all bits off (the
47		.QW normal
48		state).
49		If the \fIdefault\fR argument is present, it is used as a fallback
50		value in case no specification for \fI\-option\fR is found.
51		.\" Otherwise -- signal error? return empty string? Leave unspecified for now.
52		.TP
53		\fBttk::style layout \fIstyle\fR ?\fIlayoutSpec\fR?
54		Define the widget layout for style \fIstyle\fR.
55		See \fBLAYOUTS\fR below for the format of \fIlayoutSpec\fR.
56		If \fIlayoutSpec\fR is omitted, return the layout specification
57		for style \fIstyle\fR.
	36	\fBttk::style element\fR \fIargs\fR
	37	.RS
58	38	.TP
59	39	\fBttk::style element create\fR \fIelementName\fR \fItype\fR ?\fIargs...\fR?
60	40	Creates a new element in the current theme of type \fItype\fR.

69	49	.TP
70	50	\fBttk::style element options \fIelement\fR
71	51	Returns the list of \fIelement\fR's options.
	52	.RE
	53	.TP
	54	\fBttk::style layout \fIstyle\fR ?\fIlayoutSpec\fR?
	55	Define the widget layout for style \fIstyle\fR.
	56	See \fBLAYOUTS\fR below for the format of \fIlayoutSpec\fR.
	57	If \fIlayoutSpec\fR is omitted, return the layout specification
	58	for style \fIstyle\fR.
	59	.TP
	60	\fBttk::style lookup \fIstyle\fR \fI\-option \fR?\fIstate \fR?\fIdefault\fR??
	61	Returns the value specified for \fI\-option\fR in style \fIstyle\fR
	62	in state \fIstate\fR, using the standard lookup rules for element options.
	63	\fIstate\fR is a list of state names; if omitted,
	64	it defaults to all bits off (the
	65	.QW normal
	66	state).
	67	If the \fIdefault\fR argument is present, it is used as a fallback
	68	value in case no specification for \fI\-option\fR is found.
	69	.\" Otherwise -- signal error? return empty string? Leave unspecified for now.
	70	.TP
	71	\fBttk::style map \fIstyle\fR ?\fI\-option\fB { \fIstatespec value...\fB }\fR?
	72	Sets dynamic values of the specified option(s) in \fIstyle\fR.
	73	Each \fIstatespec / value\fR pair is examined in order;
	74	the value corresponding to the first matching \fIstatespec\fR
	75	is used.
	76	.TP
	77	\fBttk::style theme\fR \fIargs\fR
	78	.RS
72	79	.TP
73	80	\fBttk::style theme create\fR \fIthemeName\fR ?\fB\-parent \fIbasedon\fR? ?\fB\-settings \fIscript...\fR ?
74	81	Creates a new theme. It is an error if \fIthemeName\fR already exists.

77	84	If \fB\-settings\fR is present, \fIscript\fR is evaluated in the
78	85	context of the new theme as per \fBttk::style theme settings\fR.
79	86	.TP
	87	\fBttk::style theme names\fR
	88	Returns a list of all known themes.
	89	.TP
80	90	\fBttk::style theme settings \fIthemeName\fR \fIscript\fR
81	91	Temporarily sets the current theme to \fIthemeName\fR,
82	92	evaluate \fIscript\fR, then restore the previous theme.
83	93	Typically \fIscript\fR simply defines styles and elements,
84	94	though arbitrary Tcl code may appear.
85	95	.TP
86		\fBttk::style theme names\fR
87		Returns a list of all known themes.
88		.TP
89	96	\fBttk::style theme use\fR ?\fIthemeName\fR?
90	97	Without an argument the result is the name of the current theme.
91	98	Otherwise this command sets the current theme to \fIthemeName\fR,
92	99	and refreshes all widgets.
	100	.RE
93	101	.SH LAYOUTS
94	102	.PP
95	103	A \fIlayout\fR specifies a list of elements, each followed

97	105	The layout mechanism uses a simplified version of the \fBpack\fR
98	106	geometry manager: given an initial cavity,
99	107	each element is allocated a parcel.
	108	Then the parcel actually used by the element is adjusted within
	109	the allocated parcel.
100	110	Valid options are:
	111	.\" -border should remain undocumented for now (dubious usefulness)
	112	.\" .TP
	113	.\" \fB\-border\fR \fIboolean\fR
	114	.\" Specifies whether the element is drawn after its children. Defaults to 0.
	115	.TP
	116	\fB\-children { \fIsublayout...\fB }\fR
	117	Specifies a list of elements to place inside the element.
	118	.TP
	119	\fB\-expand\fR \fIboolean\fR
	120	Specifies whether the allocated parcel is the entire cavity. If so,
	121	simultaneous specification of \fB\-side\fR is ignored.
	122	Defaults to 0.
101	123	.TP
102	124	\fB\-side \fIside\fR
103	125	Specifies which side of the cavity to place the element;
104	126	one of \fBleft\fR, \fBright\fR, \fBtop\fR, or \fBbottom\fR.
105		If omitted, the element occupies the entire cavity.
	127	For instance, \fB\-side top\fR allocates the parcel along the top of
	128	the cavity having width and height respectively the width of the cavity
	129	and the height of the element.
	130	If omitted, the allocated parcel is the entire cavity (same effect
	131	as \fB\-expand\fR 1).
106	132	.TP
107	133	\fB\-sticky\fR \fB[\fInswe\fB]\fR
108		Specifies where the element is placed inside its allocated parcel.
109		.TP
110		\fB\-children { \fIsublayout... \fB}\fR
111		Specifies a list of elements to place inside the element.
112		.\" Also: -border, -unit, -expand: may go away.
	134	Specifies the actual parcel position and size inside the allocated parcel.
	135	If specified as an empty string then the actual parcel is centered in
	136	the allocated parcel. Default is \fBnswe\fR.
	137	.\" -unit should remain undocumented for now (dubious usefulness)
	138	.\" .TP
	139	.\" \fB\-unit\fR \fIboolean\fR
	140	.\" Specifies whether the element propagates its state to its children.
	141	.\" Defaults to 0.
113	142	.PP
114	143	For example:
115	144	.CS

+10

-2

doc/ttk_widget.n less more

73	73	.OP \-compound compound Compound
74	74	Specifies how to display the image relative to the text,
75	75	in the case both \fB\-text\fR and \fB\-image\fR are present.
	76	If set to the empty string (the default), the rules described in the
	77	"Elements" section of \fIttk::intro(n)\fR explain which value is actually
	78	used.
76	79	Valid values are:
77	80	.RS
78	81	.IP text

87	90	.IP right
88	91	Display image above, below, left of, or right of the text, respectively.
89	92	.IP none
90		The default; display the image if present, otherwise the text.
91		.RE
	93	Display the image if present, otherwise the text.
	94	.RE
	95	.OP \-font font Font
	96	Font to use for the text displayed by the widget.
	97	.OP \-foreground textColor TextColor
	98	The widget's foreground color.
	99	If unspecified, the theme default is used.
92	100	.OP \-image image Image
93	101	Specifies an image to display.
94	102	This is a list of 1 or more elements.

+8

-8

doc/wm.n less more

707	707	specified then the command returns the current title for the
708	708	\fIwindow\fR. The title for a window defaults to its name.
709	709	.TP
710		\fBwm transient \fIwindow\fR ?\fImaster\fR?
711		.
712		If \fImaster\fR is specified, then the window manager is informed that
	710	\fBwm transient \fIwindow\fR ?\fIcontainer\fR?
	711	.
	712	If \fIcontainer\fR is specified, then the window manager is informed that
713	713	\fIwindow\fR is a transient window (e.g. pull-down menu) working on
714		behalf of \fImaster\fR (where \fImaster\fR is the path name for a
715		top-level window). If \fImaster\fR is specified as an empty string
	714	behalf of \fIcontainer\fR (where \fIcontainer\fR is the path name for a
	715	top-level window). If \fIcontainer\fR is specified as an empty string
716	716	then \fIwindow\fR is marked as not being a transient window any more.
717	717	Otherwise the command returns the path name of \fIwindow\fR's current
718		master, or an empty string if \fIwindow\fR is not currently a
	718	container, or an empty string if \fIwindow\fR is not currently a
719	719	transient window. A transient window will mirror state changes in the
720		master and inherit the state of the master when initially mapped. The
721		directed graph with an edge from each transient to its master must be
	720	container and inherit the state of the container when initially mapped. The
	721	directed graph with an edge from each transient to its container must be
722	722	acyclic. In particular, it is an error to attempt to make a window a
723	723	transient of itself. The window manager may also decorate a transient
724	724	window differently, removing some features normally present (e.g.,

+22

-5

generic/tk.decls less more

471	471	Tk_Window Tk_IdToWindow(Display *display, Window window)
472	472	}
473	473	declare 117 {
474		void Tk_ImageChanged(Tk_ImageMaster master, int x, int y,
	474	void Tk_ImageChanged(Tk_ImageMaster model, int x, int y,
475	475	int width, int height, int imageWidth, int imageHeight)
476	476	}
477	477	declare 118 {

485	485	int width, int height)
486	486	}
487	487	declare 121 {
488		void Tk_MaintainGeometry(Tk_Window slave,
489		Tk_Window master, int x, int y, int width, int height)
	488	void Tk_MaintainGeometry(Tk_Window window,
	489	Tk_Window container, int x, int y, int width, int height)
490	490	}
491	491	declare 122 {
492	492	Tk_Window Tk_MainWindow(Tcl_Interp *interp)

538	538	CONST84_RETURN char *Tk_NameOfFont(Tk_Font font)
539	539	}
540	540	declare 137 {
541		CONST84_RETURN char *Tk_NameOfImage(Tk_ImageMaster imageMaster)
	541	CONST84_RETURN char *Tk_NameOfImage(Tk_ImageMaster model)
542	542	}
543	543	declare 138 {
544	544	CONST84_RETURN char *Tk_NameOfJoinStyle(int join)

691	691	void Tk_Ungrab(Tk_Window tkwin)
692	692	}
693	693	declare 181 {
694		void Tk_UnmaintainGeometry(Tk_Window slave, Tk_Window master)
	694	void Tk_UnmaintainGeometry(Tk_Window window, Tk_Window container)
695	695	}
696	696	declare 182 {
697	697	void Tk_UnmapWindow(Tk_Window tkwin)

1067	1067	declare 273 {
1068	1068	void Tk_CreateOldPhotoImageFormat(const Tk_PhotoImageFormat *formatPtr)
1069	1069	}
	1070	declare 280 {
	1071	void TkUnusedStubEntry(void)
	1072	}
1070	1073
1071	1074	# Define the platform specific public Tk interface. These functions are
1072	1075	# only available on the designated platform.

1138	1141	declare 10 aqua {
1139	1142	int Tk_MacOSXIsAppInFront(void)
1140	1143	}
	1144	declare 11 aqua {
	1145	Tk_Window Tk_MacOSXGetTkWindow(void *w)
	1146	}
	1147	declare 12 aqua {
	1148	void *Tk_MacOSXGetCGContextForDrawable(Drawable drawable)
	1149	}
	1150	# Replaces TkMacOSXDrawable
	1151	declare 13 aqua {
	1152	void *Tk_MacOSXGetNSWindowForDrawable(Drawable drawable)
	1153	}
	1154	declare 16 aqua {
	1155	void TkGenWMConfigureEvent_(Tk_Window tkwin, int x, int y, int width,
	1156	int height, int flags)
	1157	}
1141	1158
1142	1159	##############################################################################
1143	1160

+23

-15

generic/tk.h less more

74	74	#define TK_MAJOR_VERSION 8
75	75	#define TK_MINOR_VERSION 6
76	76	#define TK_RELEASE_LEVEL TCL_FINAL_RELEASE
77		#define TK_RELEASE_SERIAL 10
	77	#define TK_RELEASE_SERIAL 11
78	78
79	79	#define TK_VERSION "8.6"
80		#define TK_PATCH_LEVEL "8.6.10"
	80	#define TK_PATCH_LEVEL "8.6.11"
81	81
82	82	/*
83	83	* A special definition used to allow this header file to be included from

121	121	* Dummy types that are used by clients:
122	122	*/
123	123
	124	#define Tk_ImageModel Tk_ImageMaster
124	125	typedef struct Tk_BindingTable_ *Tk_BindingTable;
125	126	typedef struct Tk_Canvas_ *Tk_Canvas;
126	127	typedef struct Tk_Cursor_ *Tk_Cursor;

613	614	* the geometry manager to carry out certain functions.
614	615	*/
615	616
	617	#define Tk_GeomLostContentProc Tk_GeomLostSlaveProc
616	618	typedef void (Tk_GeomRequestProc) (ClientData clientData, Tk_Window tkwin);
617		typedef void (Tk_GeomLostSlaveProc) (ClientData clientData, Tk_Window tkwin);
	619	typedef void (Tk_GeomLostContentProc) (ClientData clientData, Tk_Window tkwin);
618	620
619	621	typedef struct Tk_GeomMgr {
620	622	const char name; / Name of the geometry manager (command used
621	623	* to invoke it, or name of widget class that
622	624	* allows embedded widgets). */
623	625	Tk_GeomRequestProc *requestProc;
624		/* Procedure to invoke when a slave's
	626	/* Procedure to invoke when a content's
625	627	* requested geometry changes. */
626		Tk_GeomLostSlaveProc *lostSlaveProc;
627		/* Procedure to invoke when a slave is taken
	628	Tk_GeomLostContentProc *lostSlaveProc;
	629	/* Procedure to invoke when content is taken
628	630	* away from one geometry manager by another.
629	631	* NULL means geometry manager doesn't care
630		* when slaves are lost. */
	632	* when content lost. */
631	633	} Tk_GeomMgr;
632	634
633	635	/*

883	885	* window.
884	886	* TK_WM_MANAGEABLE 1 marks a window as capable of being converted
885	887	* into a toplevel using [wm manage].
	888	* TK_CAN_INPUT_TEXT 1 means that this window accepts text input.
	889	* Used on macOS to indicate that key events can be
	890	* processed with the NSTextInputClient protocol.
	891	* Not currently accessible through the public API.
886	892	*/
887	893
888	894	#define TK_MAPPED 1

896	902	#define TK_EMBEDDED 0x100
897	903	#define TK_CONTAINER 0x200
898	904	#define TK_BOTH_HALVES 0x400
	905
899	906	#define TK_WRAPPER 0x1000
900	907	#define TK_REPARENTED 0x2000
901	908	#define TK_ANONYMOUS_WINDOW 0x4000

904	911	#define TK_TOP_HIERARCHY 0x20000
905	912	#define TK_PROP_PROPCHANGE 0x40000
906	913	#define TK_WM_MANAGEABLE 0x80000
	914	#define TK_CAN_INPUT_TEXT 0x100000
907	915
908	916	/*
909	917	*----------------------------------------------------------------------

1221	1229	typedef struct Tk_ImageType Tk_ImageType;
1222	1230	#ifdef USE_OLD_IMAGE
1223	1231	typedef int (Tk_ImageCreateProc) (Tcl_Interp interp, char name, int argc,
1224		char *argv, Tk_ImageType typePtr, Tk_ImageMaster master,
1225		ClientData *masterDataPtr);
	1232	char *argv, Tk_ImageType typePtr, Tk_ImageMaster model,
	1233	ClientData *clientDataPtr);
1226	1234	#else
1227	1235	typedef int (Tk_ImageCreateProc) (Tcl_Interp interp, CONST86 char name, int objc,
1228		Tcl_Obj const objv[], CONST86 Tk_ImageType typePtr, Tk_ImageMaster master,
1229		ClientData *masterDataPtr);
	1236	Tcl_Obj const objv[], CONST86 Tk_ImageType typePtr, Tk_ImageMaster model,
	1237	ClientData *clientDataPtr);
1230	1238	#endif /* USE_OLD_IMAGE */
1231		typedef ClientData (Tk_ImageGetProc) (Tk_Window tkwin, ClientData masterData);
1232		typedef void (Tk_ImageDisplayProc) (ClientData instanceData, Display *display,
	1239	typedef ClientData (Tk_ImageGetProc) (Tk_Window tkwin, ClientData clientData);
	1240	typedef void (Tk_ImageDisplayProc) (ClientData clientData, Display *display,
1233	1241	Drawable drawable, int imageX, int imageY, int width, int height,
1234	1242	int drawableX, int drawableY);
1235		typedef void (Tk_ImageFreeProc) (ClientData instanceData, Display *display);
1236		typedef void (Tk_ImageDeleteProc) (ClientData masterData);
	1243	typedef void (Tk_ImageFreeProc) (ClientData clientData, Display *display);
	1244	typedef void (Tk_ImageDeleteProc) (ClientData clientData);
1237	1245	typedef void (Tk_ImageChangedProc) (ClientData clientData, int x, int y,
1238	1246	int width, int height, int imageWidth, int imageHeight);
1239	1247	typedef int (Tk_ImagePostscriptProc) (ClientData clientData,

+14

-15

generic/tk3d.c less more

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

126	126	*/
127	127
128	128	if (borderPtr != NULL) {
129		TkBorder *firstBorderPtr = Tcl_GetHashValue(borderPtr->hashPtr);
	129	TkBorder firstBorderPtr = (TkBorder )Tcl_GetHashValue(borderPtr->hashPtr);
130	130
131	131	FreeBorderObj(objPtr);
132	132	for (borderPtr = firstBorderPtr ; borderPtr != NULL;

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

419	419	Display *display = DisplayOfScreen(borderPtr->screen);
420	420	TkBorder *prevPtr;
421	421
422		borderPtr->resourceRefCount--;
423		if (borderPtr->resourceRefCount > 0) {
	422	if (borderPtr->resourceRefCount-- > 1) {
424	423	return;
425	424	}
426	425
427		prevPtr = Tcl_GetHashValue(borderPtr->hashPtr);
	426	prevPtr = (TkBorder *)Tcl_GetHashValue(borderPtr->hashPtr);
428	427	TkpFreeBorder(borderPtr);
429	428	if (borderPtr->bgColorPtr != NULL) {
430	429	Tk_FreeColor(borderPtr->bgColorPtr);

526	525	FreeBorderObj(
527	526	Tcl_Obj objPtr) / The object we are releasing. */
528	527	{
529		TkBorder *borderPtr = objPtr->internalRep.twoPtrValue.ptr1;
	528	TkBorder borderPtr = (TkBorder )objPtr->internalRep.twoPtrValue.ptr1;
530	529
531	530	if (borderPtr != NULL) {
532	531	borderPtr->objRefCount--;

561	560	Tcl_Obj srcObjPtr, / The object we are copying from. */
562	561	Tcl_Obj dupObjPtr) / The object we are copying to. */
563	562	{
564		TkBorder *borderPtr = srcObjPtr->internalRep.twoPtrValue.ptr1;
	563	TkBorder borderPtr = (TkBorder )srcObjPtr->internalRep.twoPtrValue.ptr1;
565	564
566	565	dupObjPtr->typePtr = srcObjPtr->typePtr;
567	566	dupObjPtr->internalRep.twoPtrValue.ptr1 = borderPtr;

593	592	Tk_Window tkwin, /* Window whose background is to be set. */
594	593	Tk_3DBorder border) /* Token for border. */
595	594	{
596		register TkBorder borderPtr = (TkBorder ) border;
	595	TkBorder borderPtr = (TkBorder ) border;
597	596
598	597	Tk_SetWindowBackground(tkwin, borderPtr->bgColorPtr->pixel);
599	598	}

758	757	{
759	758	XPoint poly[4], b1, b2, newB1, newB2;
760	759	XPoint perp, c, shift1, shift2; /* Used for handling parallel lines. */
761		register XPoint p1Ptr, p2Ptr;
	760	XPoint p1Ptr, p2Ptr;
762	761	TkBorder borderPtr = (TkBorder ) border;
763	762	GC gc;
764	763	int i, lightOnLeft, dx, dy, parallel, pointsSeen;

955	954	int relief) /* Indicates 3D effect: TK_RELIEF_FLAT,
956	955	* TK_RELIEF_RAISED, or TK_RELIEF_SUNKEN. */
957	956	{
958		register TkBorder borderPtr = (TkBorder ) border;
	957	TkBorder borderPtr = (TkBorder ) border;
959	958	int doubleBorder;
960	959
961	960	/*

1026	1025	* TK_RELIEF_FLAT, TK_RELIEF_RAISED, or
1027	1026	* TK_RELIEF_SUNKEN. */
1028	1027	{
1029		register TkBorder borderPtr = (TkBorder ) border;
	1028	TkBorder borderPtr = (TkBorder ) border;
1030	1029
1031	1030	XFillPolygon(Tk_Display(tkwin), drawable, borderPtr->bgGC,
1032	1031	pointPtr, numPoints, Complex, CoordModeOrigin);

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

1280	1279	if (hashPtr == NULL) {
1281	1280	goto error;
1282	1281	}
1283		for (borderPtr = Tcl_GetHashValue(hashPtr); borderPtr != NULL;
	1282	for (borderPtr = (TkBorder *)Tcl_GetHashValue(hashPtr); borderPtr != NULL;
1284	1283	borderPtr = borderPtr->nextPtr) {
1285	1284	if ((Tk_Screen(tkwin) == borderPtr->screen)
1286	1285	&& (Tk_Colormap(tkwin) == borderPtr->colormap)) {

1370	1369	resultPtr = Tcl_NewObj();
1371	1370	hashPtr = Tcl_FindHashEntry(&dispPtr->borderTable, name);
1372	1371	if (hashPtr != NULL) {
1373		TkBorder *borderPtr = Tcl_GetHashValue(hashPtr);
	1372	TkBorder borderPtr = (TkBorder )Tcl_GetHashValue(hashPtr);
1374	1373
1375	1374	if (borderPtr == NULL) {
1376	1375	Tcl_Panic("TkDebugBorder found empty hash table entry");

+266

-228

generic/tkBind.c less more

58	58
59	59	/*
60	60	* In old implementation (the one that used an event ring), <Double-1> and <1><1> were
61		* equivalent sequences. However it is logical to give <Double-1> higher precedence.
	61	* equivalent sequences. However it is logical to give <Double-1> higher precedence
	62	* since it is more specific. Indeed <Double-1> includes time and space requirements,
	63	* which is not the case for <1><1>.
62	64	* This can be achieved by setting PREFER_MOST_SPECIALIZED_EVENT to 1.
63	65	*/
64	66

134	136	* this count considers the detail (keySym or button). */
135	137	} Event;
136	138
137		/*
138		* We need a structure providing a list of pattern sequences.
139		*/
140
141		typedef unsigned EventMask;
142		typedef unsigned long ModMask;
143
144	139	struct PatSeq; /* forward declaration */
145	140
146	141	/* We need this array for bookkeeping the last matching modifier mask per pattern. */
147		TK_ARRAY_DEFINE(PSModMaskArr, ModMask);
	142	TK_ARRAY_DEFINE(PSModMaskArr, unsigned);
148	143
149	144	typedef struct PSEntry {
150	145	TK_DLIST_LINKS(PSEntry); /* Makes this struct a double linked list; must be first entry. */

200	195	/* Containing the most recent event for every event type. */
201	196	PromArr promArr; / Contains the promoted pattern sequences. */
202	197	Event curEvent; / Pointing to most recent event. */
203		ModMask curModMask; /* Containing the current modifier mask. */
	198	unsigned curModMask; /* Containing the current modifier mask. */
204	199	LookupTables lookupTables; /* Containing hash tables for fast lookup. */
205	200	Tcl_HashTable objectTable; /* Used to map from an object to a list of patterns associated with
206	201	* that object. Keys are ClientData, values are (PatSeq ). /

262	257	typedef struct {
263	258	unsigned eventType; /* Type of X event, e.g. ButtonPress. */
264	259	unsigned count; /* Multi-event count, e.g. double-clicks, triple-clicks, etc. */
265		ModMask modMask; /* Mask of modifiers that must be present (zero means no modifiers
	260	unsigned modMask; /* Mask of modifiers that must be present (zero means no modifiers
266	261	* are required). */
267	262	Info info; /* Additional information that must match event. Normally this is zero,
268	263	* meaning no additional information must match. For KeyPress and

343	338	#define NEARBY_MS 500
344	339
345	340	/*
346		* Needed as "no-number" constant for integers. The value of this constant is
347		* outside of integer range (type "int"). (Unfortunatly current version of
348		* Tcl/Tk does not provide C99 integer support.)
349		*/
350
351		#define NO_NUMBER (((Tcl_WideInt) (~ (unsigned) 0)) + 1)
352
353		/*
354	341	* The following structure is used in the nameTable of a virtual event table
355	342	* to associate a virtual event with all the physical events that can trigger
356	343	* it.

421	408
422	409	typedef struct {
423	410	const char name; / Name of modifier. */
424		ModMask mask; /* Button/modifier mask value, such as Button1Mask. */
	411	unsigned mask; /* Button/modifier mask value, such as Button1Mask. */
425	412	unsigned flags; /* Various flags; see below for definitions. */
426	413	} ModInfo;
427	414

560	547	#define COLORMAP (1<<16)
561	548	#define VIRTUAL (1<<17)
562	549	#define ACTIVATE (1<<18)
563		#define MAPREQ (1<<19)
564		#define CONFIGREQ (1<<20)
565		#define RESIZEREQ (1<<21)
566		#define CIRCREQ (1<<22)
567
568		#define KEY_BUTTON_MOTION_VIRTUAL (KEY\|BUTTON\|MOTION\|VIRTUAL)
569		#define KEY_BUTTON_MOTION_CROSSING (KEY\|BUTTON\|MOTION\|VIRTUAL\|CROSSING)
	550	#define WHEEL (1<<19)
	551	#define MAPREQ (1<<20)
	552	#define CONFIGREQ (1<<21)
	553	#define RESIZEREQ (1<<22)
	554	#define CIRCREQ (1<<23)
	555
	556	/*
	557	* These structs agree with xkey for the fields type, serial, send_event, display,
	558	* window, root, subwindow, time, x, y, x_root, and y_root. So when accessing
	559	* these fields we may pretend that we are using a struct xkey.
	560	*/
	561
	562	#define HAS_XKEY_HEAD (KEY\|BUTTON\|MOTION\|VIRTUAL\|CROSSING\|WHEEL)
	563
	564	/*
	565	* The xcrossing struct puts the state field in a different location, but the other
	566	* events above agree on where state is located.
	567	*/
	568
	569	#define HAS_XKEY_HEAD_AND_STATE (KEY\|BUTTON\|MOTION\|VIRTUAL\|WHEEL)
	570
	571	/*
	572	* Event types which support -warp.
	573	*/
	574
	575	#define CAN_WARP (KEY\|BUTTON\|MOTION\|WHEEL)
570	576
571	577	static const int flagArray[TK_LASTEVENT] = {
572	578	/* Not used */ 0,

607	613	/* VirtualEvent */ VIRTUAL,
608	614	/* Activate */ ACTIVATE,
609	615	/* Deactivate */ ACTIVATE,
610		/* MouseWheel */ KEY
	616	/* MouseWheel */ WHEEL
611	617	};
612	618
613	619	/*

699	705	unsigned scriptCount, Tcl_DString *dsPtr);
700	706	static PatSeq * FindSequence(Tcl_Interp interp, LookupTables lookupTables,
701	707	ClientData object, const char *eventString, int create,
702		int allowVirtual, EventMask *maskPtr);
	708	int allowVirtual, unsigned *maskPtr);
703	709	static void GetAllVirtualEvents(Tcl_Interp interp, VirtualEventTable vetPtr);
704	710	static const char * GetField(const char p, char copy, unsigned size);
705	711	static Tcl_Obj * GetPatternObj(const PatSeq *psPtr);

715	721	static int NameToWindow(Tcl_Interp *interp, Tk_Window main,
716	722	Tcl_Obj objPtr, Tk_Window tkwinPtr);
717	723	static unsigned ParseEventDescription(Tcl_Interp interp, const char *eventStringPtr,
718		TkPattern patPtr, EventMask eventMaskPtr);
	724	TkPattern patPtr, unsigned eventMaskPtr);
719	725	static void DoWarp(ClientData clientData);
720	726	static PSList * GetLookupForEvent(LookupTables* lookupPtr, const Event *eventPtr,
721	727	Tcl_Obj *object, int onlyConsiderDetailedEvents);

747	753
748	754	static int
749	755	IsSubsetOf(
750		ModMask lhsMask, /* this is a subset */
751		ModMask rhsMask) /* of this bit field? */
	756	unsigned lhsMask, /* this is a subset */
	757	unsigned rhsMask) /* of this bit field? */
752	758	{
753	759	return (lhsMask & rhsMask) == lhsMask;
754	760	}

783	789	}
784	790
785	791	static Time
786		CurrentTimeInMilliSecs()
	792	CurrentTimeInMilliSecs(void)
787	793	{
788	794	Tcl_Time now;
789	795	Tcl_GetTime(&now);

834	840	return sndCount - fstCount;
835	841	}
836	842
	843	int
	844	IsKeyEventType(
	845	unsigned eventType)
	846	{
	847	return eventType == KeyPress \|\| eventType == KeyRelease;
	848	}
	849
	850	int
	851	IsButtonEventType(
	852	unsigned eventType)
	853	{
	854	return eventType == ButtonPress \|\| eventType == ButtonRelease;
	855	}
	856
837	857	static int
838	858	MatchEventNearby(
839	859	const XEvent lhs, / previous button event */

841	861	{
842	862	assert(lhs);
843	863	assert(rhs);
844		assert(lhs->type == ButtonPress \|\| lhs->type == ButtonRelease);
	864	assert(IsButtonEventType(lhs->type));
845	865	assert(lhs->type == rhs->type);
846	866
847	867	/* assert: lhs->xbutton.time <= rhs->xbutton.time */

853	873
854	874	static int
855	875	MatchEventRepeat(
856		const XEvent lhs, / previous key event */
857		const XEvent rhs) / current key event */
	876	const XKeyEvent lhs, / previous key event */
	877	const XKeyEvent rhs) / current key event */
858	878	{
859	879	assert(lhs);
860	880	assert(rhs);
861		assert(lhs->type == KeyPress \|\| lhs->type == KeyRelease);
	881	assert(IsKeyEventType(lhs->type));
862	882	assert(lhs->type == rhs->type);
863	883
864		/* assert: lhs->xkey.time <= rhs->xkey.time */
865		return TestNearbyTime(rhs->xkey.time, lhs->xkey.time);
	884	/* assert: lhs->time <= rhs->time */
	885	return lhs->keycode == rhs->keycode && TestNearbyTime(lhs->time, rhs->time);
866	886	}
867	887
868	888	static void

921	941
922	942	static PSEntry *
923	943	FreePatSeqEntry(
924		PSList *pool,
	944	TCL_UNUSED(PSList *),
925	945	PSEntry *entry)
926	946	{
927	947	PSEntry *next = PSList_Next(entry);

939	959
940	960	if (dispPtr->metaModMask) {
941	961	if (modMask & META_MASK) {
942		modMask &= ~(ModMask)META_MASK;
	962	modMask &= ~META_MASK;
943	963	modMask \|= dispPtr->metaModMask;
944	964	}
945	965	}
946	966	if (dispPtr->altModMask) {
947	967	if (modMask & ALT_MASK) {
948		modMask &= ~(ModMask)ALT_MASK;
	968	modMask &= ~ALT_MASK;
949	969	modMask \|= dispPtr->altModMask;
950	970	}
951	971	}

1022	1042	assert(TEST_PSENTRY(psPtr));
1023	1043
1024	1044	if (PSList_IsEmpty(pool)) {
1025		newEntry = ckalloc(sizeof(PSEntry));
	1045	newEntry = (PSEntry *)ckalloc(sizeof(PSEntry));
1026	1046	newEntry->lastModMaskArr = NULL;
1027	1047	DEBUG(countEntryItems += 1;)
1028	1048	} else {

1099	1119	key.object = object;
1100	1120	key.type = eventPtr->xev.type;
1101	1121	hPtr = Tcl_FindHashEntry(&lookupTables->listTable, (char *) &key);
1102		return hPtr ? Tcl_GetHashValue(hPtr) : NULL;
	1122	return hPtr ? (PSList *)Tcl_GetHashValue(hPtr) : NULL;
1103	1123	}
1104	1124
1105	1125	/*

1137	1157	nextPtr = Tcl_NextHashEntry(&search);
1138	1158
1139	1159	if (object) {
1140		const PatternTableKey *key = Tcl_GetHashKey(&lookupTables->listTable, hPtr);
	1160	const PatternTableKey key = (const PatternTableKey )Tcl_GetHashKey(&lookupTables->listTable, hPtr);
1141	1161	if (key->object != object) {
1142	1162	continue;
1143	1163	}
1144		Tcl_DeleteHashEntry(hPtr);
1145		}
1146
1147		psList = Tcl_GetHashValue(hPtr);
	1164	}
	1165
	1166	psList = (PSList *)Tcl_GetHashValue(hPtr);
1148	1167	PSList_Move(pool, psList);
1149	1168	ckfree(psList);
1150	1169	DEBUG(countListItems -= 1;)
	1170	Tcl_DeleteHashEntry(hPtr);
1151	1171	}
1152	1172	}
1153	1173

1232	1252
1233	1253	/* ensure that our matching algorithm is working (when testing detail) */
1234	1254	assert(sizeof(Detail) == sizeof(Tk_Uid));
1235
1236		/* test that constant NO_NUMBER is indeed out of integer range */
1237		assert(sizeof(NO_NUMBER) > sizeof(int));
1238		assert(((int) NO_NUMBER) == 0 && NO_NUMBER != 0);
1239	1255
1240	1256	/* test expected indices of Button1..Button5, otherwise our button handling is not working */
1241	1257	assert(Button1 == 1 && Button2 == 2 && Button3 == 3 && Button4 == 4 && Button5 == 5);

1358	1374
1359	1375	mainPtr->bindingTable = Tk_CreateBindingTable(mainPtr->interp);
1360	1376
1361		bindInfoPtr = ckalloc(sizeof(BindInfo));
	1377	bindInfoPtr = (BindInfo *)ckalloc(sizeof(BindInfo));
1362	1378	InitVirtualEventTable(&bindInfoPtr->virtualEventTable);
1363	1379	bindInfoPtr->screenInfo.curDispPtr = NULL;
1364	1380	bindInfoPtr->screenInfo.curScreenIndex = -1;

1434	1450	Tcl_Interp interp) / Interpreter to associate with the binding table: commands are
1435	1451	* executed in this interpreter. */
1436	1452	{
1437		BindingTable *bindPtr = ckalloc(sizeof(BindingTable));
	1453	BindingTable bindPtr = (BindingTable )ckalloc(sizeof(BindingTable));
1438	1454	unsigned i;
1439	1455
1440	1456	assert(interp);

1493	1509	PatSeq *nextPtr;
1494	1510	PatSeq *psPtr;
1495	1511
1496		for (psPtr = Tcl_GetHashValue(hPtr); psPtr; psPtr = nextPtr) {
	1512	for (psPtr = (PatSeq *)Tcl_GetHashValue(hPtr); psPtr; psPtr = nextPtr) {
1497	1513	assert(TEST_PSENTRY(psPtr));
1498	1514	nextPtr = psPtr->nextSeqPtr;
1499	1515	FreePatSeq(psPtr);

1560	1576	hPtr = Tcl_CreateHashEntry(&lookupTables->listTable, (char *) &key, &isNew);
1561	1577
1562	1578	if (isNew) {
1563		psList = ckalloc(sizeof(PSList));
	1579	psList = (PSList *)ckalloc(sizeof(PSList));
1564	1580	PSList_Init(psList);
1565	1581	Tcl_SetHashValue(hPtr, psList);
1566	1582	DEBUG(countListItems += 1;)
1567	1583	} else {
1568		psList = Tcl_GetHashValue(hPtr);
	1584	psList = (PSList *)Tcl_GetHashValue(hPtr);
1569	1585	}
1570	1586
1571	1587	psEntry = MakeListEntry(&lookupTables->entryPool, psPtr, 0);

1610	1626	* existing binding will always be replaced. */
1611	1627	{
1612	1628	PatSeq *psPtr;
1613		EventMask eventMask;
	1629	unsigned eventMask;
1614	1630	char *oldStr;
1615	1631	char *newStr;
1616	1632

1653	1669	*/
1654	1670
1655	1671	hPtr = Tcl_CreateHashEntry(&bindPtr->objectTable, (char *) object, &isNew);
1656		psPtr->ptr.nextObj = isNew ? NULL : Tcl_GetHashValue(hPtr);
	1672	psPtr->ptr.nextObj = isNew ? NULL : (PatSeq *)Tcl_GetHashValue(hPtr);
1657	1673	Tcl_SetHashValue(hPtr, psPtr);
1658	1674	InsertPatSeq(&bindPtr->lookupTables, psPtr);
1659	1675	}

1663	1679	size_t length1 = strlen(oldStr);
1664	1680	size_t length2 = strlen(script);
1665	1681
1666		newStr = ckalloc(length1 + length2 + 2);
	1682	newStr = (char *)ckalloc(length1 + length2 + 2);
1667	1683	memcpy(newStr, oldStr, length1);
1668	1684	newStr[length1] = '\n';
1669	1685	memcpy(newStr + length1 + 1, script, length2 + 1);
1670	1686	} else {
1671	1687	size_t length = strlen(script);
1672	1688
1673		newStr = ckalloc(length + 1);
	1689	newStr = (char *)ckalloc(length + 1);
1674	1690	memcpy(newStr, script, length + 1);
1675	1691	}
1676	1692	ckfree(oldStr);

1725	1741	if (!(hPtr = Tcl_FindHashEntry(&bindPtr->objectTable, (char *) object))) {
1726	1742	Tcl_Panic("Tk_DeleteBinding couldn't find object table entry");
1727	1743	}
1728		prevPtr = Tcl_GetHashValue(hPtr);
	1744	prevPtr = (PatSeq *)Tcl_GetHashValue(hPtr);
1729	1745	if (prevPtr == psPtr) {
1730	1746	Tcl_SetHashValue(hPtr, psPtr->ptr.nextObj);
1731	1747	} else {

1826	1842	* For each binding, output information about each of the patterns in its sequence.
1827	1843	*/
1828	1844
1829		for (psPtr = Tcl_GetHashValue(hPtr); psPtr; psPtr = psPtr->ptr.nextObj) {
	1845	for (psPtr = (const PatSeq *)Tcl_GetHashValue(hPtr); psPtr; psPtr = psPtr->ptr.nextObj) {
1830	1846	assert(TEST_PSENTRY(psPtr));
1831	1847	Tcl_ListObjAppendElement(NULL, resultObj, GetPatternObj(psPtr));
1832	1848	}

1865	1881	SetupPatternKey(&key, psPtr);
1866	1882
1867	1883	if ((hPtr = Tcl_FindHashEntry(&lookupTables->listTable, (char *) &key))) {
1868		PSList *psList = Tcl_GetHashValue(hPtr);
	1884	PSList psList = (PSList )Tcl_GetHashValue(hPtr);
1869	1885	PSEntry *psEntry;
1870	1886
1871	1887	TK_DLIST_FOREACH(psEntry, psList) {

1949	1965	assert(!psPtr->added);
1950	1966	assert(!psPtr->owned);
1951	1967
1952		prevPtr = Tcl_GetHashValue(psPtr->hPtr);
	1968	prevPtr = (PatSeq *)Tcl_GetHashValue(psPtr->hPtr);
1953	1969	nextPtr = psPtr->ptr.nextObj;
1954	1970
1955	1971	/*

2020	2036	ClearLookupTable(&bindPtr->lookupTables, object);
2021	2037	ClearPromotionLists(bindPtr, object);
2022	2038
2023		for (psPtr = Tcl_GetHashValue(hPtr); psPtr; psPtr = nextPtr) {
	2039	for (psPtr = (PatSeq *)Tcl_GetHashValue(hPtr); psPtr; psPtr = nextPtr) {
2024	2040	assert(TEST_PSENTRY(psPtr));
2025	2041	DEBUG(psPtr->added = 0;)
2026	2042	nextPtr = DeletePatSeq(psPtr);

2135	2151	TkDisplay *dispPtr;
2136	2152	TkDisplay *oldDispPtr;
2137	2153	Event *curEvent;
2138		TkWindow winPtr = (TkWindow ) tkwin;
	2154	TkWindow winPtr = (TkWindow )tkwin;
2139	2155	BindInfo *bindInfoPtr;
2140	2156	Tcl_InterpState interpState;
2141	2157	LookupTables *physTables;

2177	2193	return;
2178	2194	}
2179	2195
2180		if (flags & KEY_BUTTON_MOTION_VIRTUAL) {
	2196	if (flags & HAS_XKEY_HEAD_AND_STATE) {
2181	2197	bindPtr->curModMask = eventPtr->xkey.state;
2182	2198	} else if (flags & CROSSING) {
2183	2199	bindPtr->curModMask = eventPtr->xcrossing.state;

2191	2207	* Ignore the event completely if it is an Enter, Leave, FocusIn, or
2192	2208	* FocusOut event with detail NotifyInferior. The reason for ignoring
2193	2209	* these events is that we don't want transitions between a window and its
2194		* children to visible to bindings on the parent: this would cause
	2210	* children to be visible to bindings on the parent: this would cause
2195	2211	* problems for mega-widgets, since the internal structure of a
2196	2212	* mega-widget isn't supposed to be visible to people watching the parent.
2197	2213	*

2275	2291	switch (eventPtr->type) {
2276	2292	case KeyPress:
2277	2293	case KeyRelease:
2278		if (MatchEventRepeat(&curEvent->xev, eventPtr)) {
	2294	if (MatchEventRepeat(&curEvent->xev.xkey, &eventPtr->xkey)) {
2279	2295	if (curEvent->xev.xkey.keycode == eventPtr->xkey.keycode) {
2280	2296	++curEvent->countDetailed;
2281	2297	} else {

2345	2361
2346	2362	if ((size_t) numObjects > SIZE_OF_ARRAY(matchPtrBuf)) {
2347	2363	/* it's unrealistic that the buffer size is too small, but who knows? */
2348		matchPtrArr = ckalloc(numObjects*sizeof(matchPtrArr[0]));
	2364	matchPtrArr = (PatSeq *)ckalloc(numObjectssizeof(matchPtrArr[0]));
2349	2365	}
2350	2366	memset(matchPtrArr, 0, numObjects*sizeof(matchPtrArr[0]));
2351	2367

2386	2402	PSList *psSuccList = PromArr_First(bindPtr->promArr);
2387	2403	PatSeq *bestPtr;
2388	2404
2389		psl[0] = GetLookupForEvent(physTables, curEvent, objArr[k], 1);
2390		psl[1] = GetLookupForEvent(physTables, curEvent, objArr[k], 0);
	2405	psl[0] = GetLookupForEvent(physTables, curEvent, (Tcl_Obj *)objArr[k], 1);
	2406	psl[1] = GetLookupForEvent(physTables, curEvent, (Tcl_Obj *)objArr[k], 0);
2391	2407
2392	2408	assert(psl[0] == NULL \|\| psl[0] != psl[1]);
2393	2409

2425	2441	LookupTables *virtTables = &bindInfoPtr->virtualEventTable.lookupTables;
2426	2442	PatSeq *matchPtr = matchPtrArr[k];
2427	2443	PatSeq *mPtr;
2428		PSList *psl[2];
2429	2444
2430	2445	/*
2431	2446	* Note that virtual events cannot promote.

2499	2514	switch (patPtr->eventType) {
2500	2515	case ButtonPress:
2501	2516	case ButtonRelease:
2502		if (curEvent->xev.type == KeyPress \|\| curEvent->xev.type == KeyRelease) {
	2517	if (IsKeyEventType(curEvent->xev.type)) {
2503	2518	RemoveListEntry(&bindPtr->lookupTables.entryPool, psEntry);
2504	2519	}
2505	2520	break;
2506	2521	case KeyPress:
2507	2522	case KeyRelease:
2508		if (curEvent->xev.type == ButtonPress \|\| curEvent->xev.type == ButtonRelease) {
	2523	if (IsButtonEventType(curEvent->xev.type)) {
2509	2524	RemoveListEntry(&bindPtr->lookupTables.entryPool, psEntry);
2510	2525	}
2511	2526	break;

2703	2718	CompareModMasks(
2704	2719	const PSModMaskArr *fstModMaskArr,
2705	2720	const PSModMaskArr *sndModMaskArr,
2706		ModMask fstModMask,
2707		ModMask sndModMask)
	2721	unsigned fstModMask,
	2722	unsigned sndModMask)
2708	2723	{
2709	2724	int fstCount = 0;
2710	2725	int sndCount = 0;

2728	2743	assert(PSModMaskArr_Size(fstModMaskArr) == PSModMaskArr_Size(sndModMaskArr));
2729	2744
2730	2745	for (i = PSModMaskArr_Size(fstModMaskArr) - 1; i >= 0; --i) {
2731		ModMask fstModMask = *PSModMaskArr_Get(fstModMaskArr, i);
2732		ModMask sndModMask = *PSModMaskArr_Get(sndModMaskArr, i);
2733
2734		if (IsSubsetOf(fstModMask, sndModMask)) { ++sndCount; }
2735		if (IsSubsetOf(sndModMask, fstModMask)) { ++fstCount; }
	2746	unsigned fstiModMask = *PSModMaskArr_Get(fstModMaskArr, i);
	2747	unsigned sndiModMask = *PSModMaskArr_Get(sndModMaskArr, i);
	2748
	2749	if (IsSubsetOf(fstiModMask, sndiModMask)) { ++sndCount; }
	2750	if (IsSubsetOf(sndiModMask, fstiModMask)) { ++fstCount; }
2736	2751	}
2737	2752	}
2738	2753

2762	2777	PSEntry *psEntry;
2763	2778	PatSeq *bestPtr;
2764	2779	PatSeq *bestPhysPtr;
2765		ModMask bestModMask;
	2780	unsigned bestModMask;
2766	2781	const PSModMaskArr *bestModMaskArr = NULL;
	2782	int i, isModKeyOnly = 0;
2767	2783
2768	2784	assert(dispPtr);
2769	2785	assert(bindPtr);

2778	2794	bestPhysPtr = NULL;
2779	2795	window = curEvent->xev.xany.window;
2780	2796
	2797	/*
	2798	* Modifier key events interlaced between patterns parts of a
	2799	* sequence shall not prevent a sequence from ultimately
	2800	* matching. Example: when trying to trigger <a><Control-c>
	2801	* from the keyboard, the sequence of events actually seen is
	2802	* <a> then <Control_L> (possibly repeating if the key is hold
	2803	* down), and finally <Control-c>. At the time <Control_L> is
	2804	* seen, we shall keep the <a><Control-c> pattern sequence in
	2805	* the promotion list, otherwise it is impossible to trigger
	2806	* it from the keyboard. See bug [16ef161925].
	2807	*/
	2808	if (IsKeyEventType(curEvent->xev.type)) {
	2809	for (i = 0; i < dispPtr->numModKeyCodes; ++i) {
	2810	if (dispPtr->modKeyCodes[i] == curEvent->xev.xkey.keycode) {
	2811	isModKeyOnly = 1;
	2812	break;
	2813	}
	2814	}
	2815	}
	2816
2781	2817	for (psEntry = PSList_First(psList); psEntry; psEntry = PSList_Next(psEntry)) {
2782	2818	if (patIndex == 0 \|\| psEntry->window == window) {
2783	2819	PatSeq* psPtr = psEntry->psPtr;

2791	2827	? psPtr->object == object
2792	2828	: VirtPatIsBound(bindPtr, psPtr, object, physPtrPtr)) {
2793	2829	TkPattern *patPtr = psPtr->pats + patIndex;
	2830
	2831	/* ignore modifier key events, and KeyRelease events if the current event
	2832	* is of a different type (e.g. a Button event)
	2833	*/
	2834	psEntry->keepIt = isModKeyOnly \|\| \
	2835	((patPtr->eventType != (unsigned) curEvent->xev.type) && curEvent->xev.type == KeyRelease);
2794	2836
2795	2837	if (patPtr->eventType == (unsigned) curEvent->xev.type
2796	2838	&& (curEvent->xev.type != CreateNotify

2802	2844	* cannot be done in ParseEventDescription, otherwise this function would
2803	2845	* be the better place.
2804	2846	*/
2805		ModMask modMask = ResolveModifiers(dispPtr, patPtr->modMask);
2806		ModMask curModMask = ResolveModifiers(dispPtr, bindPtr->curModMask);
	2847	unsigned modMask = ResolveModifiers(dispPtr, patPtr->modMask);
	2848	unsigned curModMask = ResolveModifiers(dispPtr, bindPtr->curModMask);
2807	2849
2808	2850	psEntry->expired = 1; /* remove it from promotion list */
2809
2810		if ((modMask & ~curModMask) == 0) {
	2851	psEntry->keepIt = 0; /* don't keep matching patterns */
	2852
	2853	if (IsSubsetOf(modMask, curModMask)) {
2811	2854	unsigned count = patPtr->info ? curEvent->countDetailed : curEvent->countAny;
2812	2855
2813	2856	if (patIndex < PSModMaskArr_Size(psEntry->lastModMaskArr)) {

2923	2966	evPtr = &eventPtr->xev;
2924	2967	flags = (evPtr->type < TK_LASTEVENT) ? flagArray[evPtr->type] : 0;
2925	2968
	2969	#define SET_NUMBER(value) { number = (value); \
	2970	snprintf(numStorage, sizeof(numStorage), "%" TCL_LL_MODIFIER "d", number); \
	2971	string = numStorage; \
	2972	}
	2973
	2974	#define SET_UNUMBER(value) { unumber = (value); \
	2975	snprintf(numStorage, sizeof(numStorage), "%" TCL_LL_MODIFIER "u", unumber); \
	2976	string = numStorage; \
	2977	}
	2978
2926	2979	while (1) {
2927	2980	char numStorage[TCL_INTEGER_SPACE];
2928	2981	const char *string;
2929		Tcl_WideInt number;
	2982	Tcl_WideInt number; /* signed */
	2983	Tcl_WideUInt unumber; /* unsigned */
2930	2984
2931	2985	/*
2932	2986	* Find everything up to the next % character and append it to the

2947	3001	* There's a percent sequence here. Process it.
2948	3002	*/
2949	3003
2950		number = NO_NUMBER;
2951	3004	string = "??";
2952
2953	3005	switch (before[1]) {
2954	3006	case '#':
2955		number = evPtr->xany.serial;
	3007	SET_UNUMBER(evPtr->xany.serial);
2956	3008	break;
2957	3009	case 'a':
2958	3010	if (flags & CONFIG) {

2962	3014	break;
2963	3015	case 'b':
2964	3016	if (flags & BUTTON) {
2965		number = evPtr->xbutton.button;
	3017	SET_UNUMBER(evPtr->xbutton.button);
2966	3018	}
2967	3019	break;
2968	3020	case 'c':
2969	3021	if (flags & EXPOSE) {
2970		number = evPtr->xexpose.count;
	3022	SET_NUMBER(evPtr->xexpose.count);
2971	3023	}
2972	3024	break;
2973	3025	case 'd':

2987	3039	break;
2988	3040	case 'f':
2989	3041	if (flags & CROSSING) {
2990		number = evPtr->xcrossing.focus;
	3042	SET_NUMBER(evPtr->xcrossing.focus != 0);
2991	3043	}
2992	3044	break;
2993	3045	case 'h':
2994	3046	if (flags & EXPOSE) {
2995		number = evPtr->xexpose.height;
	3047	SET_NUMBER(evPtr->xexpose.height);
2996	3048	} else if (flags & CONFIG) {
2997		number = evPtr->xconfigure.height;
	3049	SET_NUMBER(evPtr->xconfigure.height);
2998	3050	} else if (flags & CREATE) {
2999		number = evPtr->xcreatewindow.height;
	3051	SET_NUMBER(evPtr->xcreatewindow.height);
3000	3052	} else if (flags & CONFIGREQ) {
3001		number = evPtr->xconfigurerequest.height;
	3053	SET_NUMBER(evPtr->xconfigurerequest.height);
3002	3054	} else if (flags & RESIZEREQ) {
3003		number = evPtr->xresizerequest.height;
	3055	SET_NUMBER(evPtr->xresizerequest.height);
3004	3056	}
3005	3057	break;
3006	3058	case 'i':

3016	3068	string = numStorage;
3017	3069	break;
3018	3070	case 'k':
3019		if ((flags & KEY) && evPtr->type != MouseWheelEvent) {
3020		number = evPtr->xkey.keycode;
	3071	if (flags & KEY) {
	3072	SET_UNUMBER(evPtr->xkey.keycode);
3021	3073	}
3022	3074	break;
3023	3075	case 'm':

3029	3081	break;
3030	3082	case 'o':
3031	3083	if (flags & CREATE) {
3032		number = evPtr->xcreatewindow.override_redirect;
	3084	SET_NUMBER(evPtr->xcreatewindow.override_redirect != 0);
3033	3085	} else if (flags & MAP) {
3034		number = evPtr->xmap.override_redirect;
	3086	SET_NUMBER(evPtr->xmap.override_redirect != 0);
3035	3087	} else if (flags & REPARENT) {
3036		number = evPtr->xreparent.override_redirect;
	3088	SET_NUMBER(evPtr->xreparent.override_redirect != 0);
3037	3089	} else if (flags & CONFIG) {
3038		number = evPtr->xconfigure.override_redirect;
	3090	SET_NUMBER(evPtr->xconfigure.override_redirect != 0);
3039	3091	}
3040	3092	break;
3041	3093	case 'p':

3046	3098	}
3047	3099	break;
3048	3100	case 's':
3049		if (flags & KEY_BUTTON_MOTION_VIRTUAL) {
3050		number = evPtr->xkey.state;
	3101	if (flags & HAS_XKEY_HEAD_AND_STATE) {
	3102	SET_UNUMBER(evPtr->xkey.state);
3051	3103	} else if (flags & CROSSING) {
3052		number = evPtr->xcrossing.state;
	3104	SET_UNUMBER(evPtr->xcrossing.state);
3053	3105	} else if (flags & PROP) {
3054	3106	string = TkFindStateString(propNotify, evPtr->xproperty.state);
3055	3107	} else if (flags & VISIBILITY) {

3057	3109	}
3058	3110	break;
3059	3111	case 't':
3060		if (flags & KEY_BUTTON_MOTION_VIRTUAL) {
3061		number = (int) evPtr->xkey.time;
3062		} else if (flags & CROSSING) {
3063		number = (int) evPtr->xcrossing.time;
	3112	if (flags & HAS_XKEY_HEAD) {
	3113	SET_UNUMBER(evPtr->xkey.time);
3064	3114	} else if (flags & PROP) {
3065		number = (int) evPtr->xproperty.time;
	3115	SET_UNUMBER(evPtr->xproperty.time);
3066	3116	}
3067	3117	break;
3068	3118	case 'v':
3069		number = evPtr->xconfigurerequest.value_mask;
	3119	SET_UNUMBER(evPtr->xconfigurerequest.value_mask);
3070	3120	break;
3071	3121	case 'w':
3072	3122	if (flags & EXPOSE) {
3073		number = evPtr->xexpose.width;
	3123	SET_NUMBER(evPtr->xexpose.width);
3074	3124	} else if (flags & CONFIG) {
3075		number = evPtr->xconfigure.width;
	3125	SET_NUMBER(evPtr->xconfigure.width);
3076	3126	} else if (flags & CREATE) {
3077		number = evPtr->xcreatewindow.width;
	3127	SET_NUMBER(evPtr->xcreatewindow.width);
3078	3128	} else if (flags & CONFIGREQ) {
3079		number = evPtr->xconfigurerequest.width;
	3129	SET_NUMBER(evPtr->xconfigurerequest.width);
3080	3130	} else if (flags & RESIZEREQ) {
3081		number = evPtr->xresizerequest.width;
	3131	SET_NUMBER(evPtr->xresizerequest.width);
3082	3132	}
3083	3133	break;
3084	3134	case 'x':
3085		if (flags & KEY_BUTTON_MOTION_VIRTUAL) {
3086		number = evPtr->xkey.x;
3087		} else if (flags & CROSSING) {
3088		number = evPtr->xcrossing.x;
	3135	if (flags & HAS_XKEY_HEAD) {
	3136	SET_NUMBER(evPtr->xkey.x);
3089	3137	} else if (flags & EXPOSE) {
3090		number = evPtr->xexpose.x;
	3138	SET_NUMBER(evPtr->xexpose.x);
3091	3139	} else if (flags & (CREATE\|CONFIG\|GRAVITY)) {
3092		number = evPtr->xcreatewindow.x;
	3140	SET_NUMBER(evPtr->xcreatewindow.x);
3093	3141	} else if (flags & REPARENT) {
3094		number = evPtr->xreparent.x;
3095		} else if (flags & CREATE) {
3096		number = evPtr->xcreatewindow.x;
	3142	SET_NUMBER(evPtr->xreparent.x);
3097	3143	} else if (flags & CONFIGREQ) {
3098		number = evPtr->xconfigurerequest.x;
	3144	SET_NUMBER(evPtr->xconfigurerequest.x);
3099	3145	}
3100	3146	break;
3101	3147	case 'y':
3102		if (flags & KEY_BUTTON_MOTION_VIRTUAL) {
3103		number = evPtr->xkey.y;
	3148	if (flags & HAS_XKEY_HEAD) {
	3149	SET_NUMBER(evPtr->xkey.y);
3104	3150	} else if (flags & EXPOSE) {
3105		number = evPtr->xexpose.y;
	3151	SET_NUMBER(evPtr->xexpose.y);
3106	3152	} else if (flags & (CREATE\|CONFIG\|GRAVITY)) {
3107		number = evPtr->xcreatewindow.y;
	3153	SET_NUMBER(evPtr->xcreatewindow.y);
3108	3154	} else if (flags & REPARENT) {
3109		number = evPtr->xreparent.y;
3110		} else if (flags & CROSSING) {
3111		number = evPtr->xcrossing.y;
3112		} else if (flags & CREATE) {
3113		number = evPtr->xcreatewindow.y;
	3155	SET_NUMBER(evPtr->xreparent.y);
3114	3156	} else if (flags & CONFIGREQ) {
3115		number = evPtr->xconfigurerequest.y;
	3157	SET_NUMBER(evPtr->xconfigurerequest.y);
3116	3158	}
3117	3159	break;
3118	3160	case 'A':
3119		if ((flags & KEY) && evPtr->type != MouseWheelEvent) {
	3161	if (flags & KEY) {
3120	3162	Tcl_DStringFree(&buf);
3121	3163	string = TkpGetString(winPtr, evPtr, &buf);
3122	3164	}
3123	3165	break;
3124	3166	case 'B':
3125	3167	if (flags & CREATE) {
3126		number = evPtr->xcreatewindow.border_width;
	3168	SET_NUMBER(evPtr->xcreatewindow.border_width);
3127	3169	} else if (flags & CONFIGREQ) {
3128		number = evPtr->xconfigurerequest.border_width;
	3170	SET_NUMBER(evPtr->xconfigurerequest.border_width);
3129	3171	} else if (flags & CONFIG) {
3130		number = evPtr->xconfigure.border_width;
	3172	SET_NUMBER(evPtr->xconfigure.border_width);
3131	3173	}
3132	3174	break;
3133	3175	case 'D':
3134		/*
3135		* This is used only by the MouseWheel event.
3136		*/
3137		if ((flags & KEY) && evPtr->type == MouseWheelEvent) {
3138		number = evPtr->xkey.keycode;
	3176	if (flags & WHEEL) {
	3177	SET_NUMBER((int)evPtr->xbutton.button); /* mis-use button field for this */
3139	3178	}
3140	3179	break;
3141	3180	case 'E':
3142		number = (int) evPtr->xany.send_event;
	3181	SET_NUMBER(evPtr->xany.send_event != 0);
3143	3182	break;
3144	3183	case 'K':
3145		if ((flags & KEY) && evPtr->type != MouseWheelEvent) {
	3184	if (flags & KEY) {
3146	3185	const char *name = TkKeysymToString(eventPtr->detail.info);
3147	3186	if (name) {
3148	3187	string = name;

3150	3189	}
3151	3190	break;
3152	3191	case 'M':
3153		number = scriptCount;
	3192	SET_UNUMBER(scriptCount);
3154	3193	break;
3155	3194	case 'N':
3156		if ((flags & KEY) && evPtr->type != MouseWheelEvent) {
3157		number = (int) eventPtr->detail.info;
	3195	if (flags & KEY) {
	3196	SET_UNUMBER(eventPtr->detail.info);
3158	3197	}
3159	3198	break;
3160	3199	case 'P':

3163	3202	}
3164	3203	break;
3165	3204	case 'R':
3166		if (flags & KEY_BUTTON_MOTION_CROSSING) {
	3205	if (flags & HAS_XKEY_HEAD) {
3167	3206	TkpPrintWindowId(numStorage, evPtr->xkey.root);
3168	3207	string = numStorage;
3169	3208	}
3170	3209	break;
3171	3210	case 'S':
3172		if (flags & KEY_BUTTON_MOTION_CROSSING) {
	3211	if (flags & HAS_XKEY_HEAD) {
3173	3212	TkpPrintWindowId(numStorage, evPtr->xkey.subwindow);
3174	3213	string = numStorage;
3175	3214	}
3176	3215	break;
3177	3216	case 'T':
3178		number = evPtr->type;
	3217	SET_NUMBER(evPtr->type);
3179	3218	break;
3180	3219	case 'W': {
3181	3220	Tk_Window tkwin = Tk_IdToWindow(evPtr->xany.display, evPtr->xany.window);

3185	3224	break;
3186	3225	}
3187	3226	case 'X':
3188		if (flags & KEY_BUTTON_MOTION_CROSSING) {
3189		number = evPtr->xkey.x_root;
	3227	if (flags & HAS_XKEY_HEAD) {
	3228	SET_NUMBER(evPtr->xkey.x_root);
3190	3229	}
3191	3230	break;
3192	3231	case 'Y':
3193		if (flags & KEY_BUTTON_MOTION_CROSSING) {
3194		number = evPtr->xkey.y_root;
	3232	if (flags & HAS_XKEY_HEAD) {
	3233	SET_NUMBER(evPtr->xkey.y_root);
3195	3234	}
3196	3235	break;
3197	3236	default:

3199	3238	numStorage[1] = '\0';
3200	3239	string = numStorage;
3201	3240	break;
3202		}
3203
3204		if (number != NO_NUMBER) {
3205		snprintf(numStorage, sizeof(numStorage), "%d", (int) number);
3206		string = numStorage;
3207	3241	}
3208	3242	{ /* local scope */
3209	3243	int cvtFlags;

3217	3251	before += 2;
3218	3252	}
3219	3253	}
	3254
	3255	#undef SET_NUMBER
	3256	#undef SET_UNUMBER
3220	3257
3221	3258	Tcl_DStringFree(&buf);
3222	3259	}

3429	3466	PatSeq *nextPtr;
3430	3467	PatSeq *psPtr;
3431	3468
3432		for (psPtr = Tcl_GetHashValue(hPtr); psPtr; psPtr = nextPtr) {
	3469	for (psPtr = (PatSeq *)Tcl_GetHashValue(hPtr); psPtr; psPtr = nextPtr) {
3433	3470	assert(TEST_PSENTRY(psPtr));
3434	3471	nextPtr = psPtr->nextSeqPtr;
3435	3472	DEBUG(psPtr->owned = 0;)

3443	3480	ckfree(Tcl_GetHashValue(hPtr));
3444	3481	}
3445	3482	Tcl_DeleteHashTable(&vetPtr->nameTable);
	3483
	3484	ClearLookupTable(&vetPtr->lookupTables, NULL);
3446	3485	Tcl_DeleteHashTable(&vetPtr->lookupTables.listTable);
3447	3486
3448		ClearLookupTable(&vetPtr->lookupTables, NULL);
3449	3487	DEBUG(countEntryItems -= PSList_Size(&vetPtr->lookupTables.entryPool);)
3450	3488	PSList_Traverse(&vetPtr->lookupTables.entryPool, FreePatSeqEntry);
3451	3489	}

3459	3497	* already defined, the new definition augments those that already exist.
3460	3498	*
3461	3499	* Results:
3462		* The return value is TCL_ERROR if an error occured while creating the
	3500	* The return value is TCL_ERROR if an error occurred while creating the
3463	3501	* virtual binding. In this case, an error message will be left in the
3464	3502	* interp's result. If all went well then the return value is TCL_OK.
3465	3503	*

3510	3548	* Make virtual event own the physical event.
3511	3549	*/
3512	3550
3513		owned = Tcl_GetHashValue(vhPtr);
	3551	owned = (PhysOwned *)Tcl_GetHashValue(vhPtr);
3514	3552
3515	3553	if (!PhysOwned_Contains(owned, psPtr)) {
3516	3554	PhysOwned_Append(&owned, psPtr);

3572	3610	if (!(vhPtr = Tcl_FindHashEntry(&vetPtr->nameTable, virtUid))) {
3573	3611	return TCL_OK;
3574	3612	}
3575		owned = Tcl_GetHashValue(vhPtr);
	3613	owned = (PhysOwned *)Tcl_GetHashValue(vhPtr);
3576	3614
3577	3615	eventPSPtr = NULL;
3578	3616	if (eventString) {

3704	3742	}
3705	3743
3706	3744	resultObj = Tcl_NewObj();
3707		owned = Tcl_GetHashValue(vhPtr);
	3745	owned = (const PhysOwned *)Tcl_GetHashValue(vhPtr);
3708	3746	for (iPhys = 0; iPhys < PhysOwned_Size(owned); ++iPhys) {
3709	3747	Tcl_ListObjAppendElement(NULL, resultObj, GetPatternObj(PhysOwned_Get(owned, iPhys)));
3710	3748	}

3793	3831	int objc, /* Number of arguments. */
3794	3832	Tcl_Obj const objv[]) / Argument objects. */
3795	3833	{
3796		union { XEvent general; XVirtualEvent virtual; } event;
	3834	union { XEvent general; XVirtualEvent virt; } event;
3797	3835
3798	3836	const char *p;
3799	3837	const char *name;

3803	3841	Tk_Window tkwin;
3804	3842	Tk_Window tkwin2;
3805	3843	TkWindow *mainPtr;
3806		EventMask eventMask;
	3844	unsigned eventMask;
3807	3845	Tcl_Obj *userDataObj;
3808	3846	int synch;
3809	3847	int warp;

3889	3927	Tk_DestroyWindow(tkwin);
3890	3928	return TCL_OK;
3891	3929	}
3892		if (flags & KEY_BUTTON_MOTION_VIRTUAL) {
	3930	if (flags & HAS_XKEY_HEAD_AND_STATE) {
3893	3931	event.general.xkey.state = pat.modMask;
3894		if ((flags & KEY) && event.general.xany.type != MouseWheelEvent) {
	3932	if (flags & KEY) {
3895	3933	TkpSetKeycodeAndState(tkwin, pat.info, &event.general);
3896	3934	} else if (flags & BUTTON) {
3897	3935	event.general.xbutton.button = pat.info;
3898	3936	} else if (flags & VIRTUAL) {
3899		event.virtual.name = pat.name;
	3937	event.virt.name = pat.name;
3900	3938	}
3901	3939	}
3902	3940	if (flags & (CREATE\|UNMAP\|MAP\|REPARENT\|CONFIG\|GRAVITY\|CIRC)) {
3903	3941	event.general.xcreatewindow.window = event.general.xany.window;
3904	3942	}
3905	3943
3906		if (flags & KEY_BUTTON_MOTION_CROSSING) {
	3944	if (flags & HAS_XKEY_HEAD) {
3907	3945	event.general.xkey.x_root = -1;
3908	3946	event.general.xkey.y_root = -1;
3909	3947	}

3951	3989	if (Tcl_GetBooleanFromObj(interp, valuePtr, &warp) != TCL_OK) {
3952	3990	return TCL_ERROR;
3953	3991	}
3954		if (!(flags & KEY_BUTTON_MOTION_VIRTUAL)) {
	3992	if (!(flags & CAN_WARP)) {
3955	3993	badOpt = 1;
3956	3994	}
3957	3995	break;

4018	4056	if (Tcl_GetIntFromObj(interp, valuePtr, &number) != TCL_OK) {
4019	4057	return TCL_ERROR;
4020	4058	}
4021		if ((flags & KEY) && event.general.xkey.type == MouseWheelEvent) {
4022		event.general.xkey.keycode = number;
	4059	if (flags & WHEEL) {
	4060	event.general.xbutton.button = (unsigned)number; /* mis-use button field for this */
4023	4061	} else {
4024	4062	badOpt = 1;
4025	4063	}

4063	4101	if (Tcl_GetIntFromObj(interp, valuePtr, &number) != TCL_OK) {
4064	4102	return TCL_ERROR;
4065	4103	}
4066		if ((flags & KEY) && event.general.xkey.type != MouseWheelEvent) {
	4104	if (flags & KEY) {
4067	4105	event.general.xkey.keycode = number;
4068	4106	} else {
4069	4107	badOpt = 1;

4087	4125	Tcl_SetErrorCode(interp, "TK", "LOOKUP", "KEYCODE", value, NULL);
4088	4126	return TCL_ERROR;
4089	4127	}
4090		if (!(flags & KEY) \|\| (event.general.xkey.type == MouseWheelEvent)) {
	4128	if (!(flags & KEY)) {
4091	4129	badOpt = 1;
4092	4130	}
4093	4131	break;

4134	4172	if (!NameToWindow(interp, tkwin, valuePtr, &tkwin2)) {
4135	4173	return TCL_ERROR;
4136	4174	}
4137		if (flags & KEY_BUTTON_MOTION_CROSSING) {
	4175	if (flags & HAS_XKEY_HEAD) {
4138	4176	event.general.xkey.root = Tk_WindowId(tkwin2);
4139	4177	} else {
4140	4178	badOpt = 1;

4144	4182	if (Tk_GetPixelsFromObj(interp, tkwin, valuePtr, &number) != TCL_OK) {
4145	4183	return TCL_ERROR;
4146	4184	}
4147		if (flags & KEY_BUTTON_MOTION_CROSSING) {
	4185	if (flags & HAS_XKEY_HEAD) {
4148	4186	event.general.xkey.x_root = number;
4149	4187	} else {
4150	4188	badOpt = 1;

4154	4192	if (Tk_GetPixelsFromObj(interp, tkwin, valuePtr, &number) != TCL_OK) {
4155	4193	return TCL_ERROR;
4156	4194	}
4157		if (flags & KEY_BUTTON_MOTION_CROSSING) {
	4195	if (flags & HAS_XKEY_HEAD) {
4158	4196	event.general.xkey.y_root = number;
4159	4197	} else {
4160	4198	badOpt = 1;

4193	4231	event.general.xany.serial = number;
4194	4232	break;
4195	4233	case EVENT_STATE:
4196		if (flags & KEY_BUTTON_MOTION_CROSSING) {
	4234	if (flags & HAS_XKEY_HEAD) {
4197	4235	if (Tcl_GetIntFromObj(interp, valuePtr, &number) != TCL_OK) {
4198	4236	return TCL_ERROR;
4199	4237	}
4200		if (flags & KEY_BUTTON_MOTION_VIRTUAL) {
	4238	if (flags & HAS_XKEY_HEAD_AND_STATE) {
4201	4239	event.general.xkey.state = number;
4202	4240	} else {
4203	4241	event.general.xcrossing.state = number;

4215	4253	if (!NameToWindow(interp, tkwin, valuePtr, &tkwin2)) {
4216	4254	return TCL_ERROR;
4217	4255	}
4218		if (flags & KEY_BUTTON_MOTION_CROSSING) {
	4256	if (flags & HAS_XKEY_HEAD) {
4219	4257	event.general.xkey.subwindow = Tk_WindowId(tkwin2);
4220	4258	} else {
4221	4259	badOpt = 1;

4229	4267	} else if (Tcl_GetIntFromObj(interp, valuePtr, &number) != TCL_OK) {
4230	4268	return TCL_ERROR;
4231	4269	}
4232		if (flags & KEY_BUTTON_MOTION_CROSSING) {
	4270	if (flags & HAS_XKEY_HEAD) {
4233	4271	event.general.xkey.time = number;
4234	4272	} else if (flags & PROP) {
4235	4273	event.general.xproperty.time = number;

4264	4302	if (Tk_GetPixelsFromObj(interp, tkwin, valuePtr, &number) != TCL_OK) {
4265	4303	return TCL_ERROR;
4266	4304	}
4267		if (flags & KEY_BUTTON_MOTION_CROSSING) {
	4305	if (flags & HAS_XKEY_HEAD) {
4268	4306	event.general.xkey.x = number;
4269	4307
4270	4308	/*

4291	4329	if (Tk_GetPixelsFromObj(interp, tkwin, valuePtr, &number) != TCL_OK) {
4292	4330	return TCL_ERROR;
4293	4331	}
4294		if (flags & KEY_BUTTON_MOTION_CROSSING) {
	4332	if (flags & HAS_XKEY_HEAD) {
4295	4333	event.general.xkey.y = number;
4296	4334
4297	4335	/*

4336	4374	* refcount before firing it into the low-level event subsystem; the
4337	4375	* refcount will be decremented once the event has been processed.
4338	4376	*/
4339		event.virtual.user_data = userDataObj;
	4377	event.virt.user_data = userDataObj;
4340	4378	Tcl_IncrRefCount(userDataObj);
4341		}
4342
4343		/*
4344		* Now we have constructed the event, inject it into the event handling
4345		* code.
4346		*/
4347
4348		if (synch) {
4349		Tk_HandleEvent(&event.general);
4350		} else {
4351		Tk_QueueWindowEvent(&event.general, pos);
4352	4379	}
4353	4380
4354	4381	/*

4359	4386	TkDisplay *dispPtr = TkGetDisplay(event.general.xmotion.display);
4360	4387
4361	4388	Tk_Window warpWindow = Tk_IdToWindow(dispPtr->display, event.general.xmotion.window);
4362
4363		if (!(dispPtr->flags & TK_DISPLAY_IN_WARP)) {
4364		Tcl_DoWhenIdle(DoWarp, dispPtr);
4365		dispPtr->flags \|= TK_DISPLAY_IN_WARP;
4366		}
4367	4389
4368	4390	if (warpWindow != dispPtr->warpWindow) {
4369	4391	if (warpWindow) {

4377	4399	dispPtr->warpMainwin = mainWin;
4378	4400	dispPtr->warpX = event.general.xmotion.x;
4379	4401	dispPtr->warpY = event.general.xmotion.y;
	4402
	4403	if (!(dispPtr->flags & TK_DISPLAY_IN_WARP)) {
	4404	Tcl_DoWhenIdle(DoWarp, dispPtr);
	4405	dispPtr->flags \|= TK_DISPLAY_IN_WARP;
	4406	}
	4407	}
	4408
	4409	/*
	4410	* Now we have constructed the event, inject it into the event handling
	4411	* code.
	4412	*/
	4413
	4414	if (synch) {
	4415	Tk_HandleEvent(&event.general);
	4416	} else {
	4417	Tk_QueueWindowEvent(&event.general, pos);
4380	4418	}
4381	4419	}
4382	4420

4575	4613	* 1 means create. */
4576	4614	int allowVirtual, /* 0 means that virtual events are not allowed in the sequence.
4577	4615	* 1 otherwise. */
4578		EventMask maskPtr) / *maskPtr is filled in with the event types on which this
	4616	unsigned maskPtr) / *maskPtr is filled in with the event types on which this
4579	4617	* pattern sequence depends. */
4580	4618	{
4581	4619	unsigned patsBufSize = 1;

4589	4627	int isNew;
4590	4628	unsigned count;
4591	4629	unsigned maxCount = 0;
4592		EventMask eventMask = 0;
4593		ModMask modMask = 0;
	4630	unsigned eventMask = 0;
	4631	unsigned modMask = 0;
4594	4632	PatternTableKey key;
4595	4633
4596	4634	assert(lookupTables);
4597	4635	assert(eventString);
4598	4636
4599		psPtr = ckalloc(PATSEQ_MEMSIZE(patsBufSize));
	4637	psPtr = (PatSeq *)ckalloc(PATSEQ_MEMSIZE(patsBufSize));
4600	4638
4601	4639	/*
4602	4640	*------------------------------------------------------------------

4608	4646	if (numPats >= patsBufSize) {
4609	4647	unsigned pos = patPtr - psPtr->pats;
4610	4648	patsBufSize += patsBufSize;
4611		psPtr = ckrealloc(psPtr, PATSEQ_MEMSIZE(patsBufSize));
	4649	psPtr = (PatSeq *)ckrealloc(psPtr, PATSEQ_MEMSIZE(patsBufSize));
4612	4650	patPtr = psPtr->pats + pos;
4613	4651	}
4614	4652

4657	4695	return NULL;
4658	4696	}
4659	4697	if (patsBufSize > numPats) {
4660		psPtr = ckrealloc(psPtr, PATSEQ_MEMSIZE(numPats));
	4698	psPtr = (PatSeq *)ckrealloc(psPtr, PATSEQ_MEMSIZE(numPats));
4661	4699	}
4662	4700
4663	4701	patPtr = psPtr->pats;
4664		psPtr->object = object;
	4702	psPtr->object = (Tcl_Obj *)object;
4665	4703	SetupPatternKey(&key, psPtr);
4666	4704	hPtr = Tcl_CreateHashEntry(&lookupTables->patternTable, (char *) &key, &isNew);
4667	4705	if (!isNew) {
4668	4706	unsigned sequenceSize = numPats*sizeof(TkPattern);
4669	4707	PatSeq *psPtr2;
4670	4708
4671		for (psPtr2 = Tcl_GetHashValue(hPtr); psPtr2; psPtr2 = psPtr2->nextSeqPtr) {
	4709	for (psPtr2 = (PatSeq *)Tcl_GetHashValue(hPtr); psPtr2; psPtr2 = psPtr2->nextSeqPtr) {
4672	4710	assert(TEST_PSENTRY(psPtr2));
4673	4711	if (numPats == psPtr2->numPats && memcmp(patPtr, psPtr2->pats, sequenceSize) == 0) {
4674	4712	ckfree(psPtr);

4704	4742	psPtr->added = 0;
4705	4743	psPtr->modMaskUsed = (modMask != 0);
4706	4744	psPtr->script = NULL;
4707		psPtr->nextSeqPtr = Tcl_GetHashValue(hPtr);
	4745	psPtr->nextSeqPtr = (PatSeq *)Tcl_GetHashValue(hPtr);
4708	4746	psPtr->hPtr = hPtr;
4709	4747	psPtr->ptr.nextObj = NULL;
4710	4748	assert(psPtr->ptr.owners == NULL);

4764	4802	const char *eventStringPtr,/ On input, holds a pointer to start of event string. On exit,
4765	4803	* gets pointer to rest of string after parsed event. */
4766	4804	TkPattern patPtr, / Filled with the pattern parsed from the event string. */
4767		EventMask eventMaskPtr) / Filled with event mask of matched event. */
	4805	unsigned eventMaskPtr) / Filled with event mask of matched event. */
4768	4806	{
4769	4807	const char *p;
4770		EventMask eventMask = 0;
	4808	unsigned eventMask = 0;
4771	4809	unsigned count = 1;
4772	4810
4773	4811	assert(eventStringPtr);

4846	4884
4847	4885	size = p - field;
4848	4886	if (size >= sizeof(buf)) {
4849		bufPtr = ckalloc(size + 1);
	4887	bufPtr = (char *)ckalloc(size + 1);
4850	4888	}
4851	4889	strncpy(bufPtr, field, size);
4852	4890	bufPtr[size] = '\0';

4878	4916	if (!(hPtr = Tcl_FindHashEntry(&modTable, field))) {
4879	4917	break;
4880	4918	}
4881		modPtr = Tcl_GetHashValue(hPtr);
	4919	modPtr = (ModInfo *)Tcl_GetHashValue(hPtr);
4882	4920	patPtr->modMask \|= modPtr->mask;
4883	4921	if (modPtr->flags & MULT_CLICKS) {
4884	4922	unsigned i = modPtr->flags & MULT_CLICKS;

4893	4931
4894	4932	eventFlags = 0;
4895	4933	if ((hPtr = Tcl_FindHashEntry(&eventTable, field))) {
4896		const EventInfo *eiPtr = Tcl_GetHashValue(hPtr);
	4934	const EventInfo eiPtr = (const EventInfo )Tcl_GetHashValue(hPtr);
4897	4935
4898	4936	patPtr->eventType = eiPtr->type;
4899	4937	eventFlags = flagArray[eiPtr->type];

5080	5118	assert(patPtr->name);
5081	5119	Tcl_AppendPrintfToObj(patternObj, "<<%s>>", patPtr->name);
5082	5120	} else {
5083		ModMask modMask;
	5121	unsigned modMask;
5084	5122	const ModInfo *modPtr;
5085	5123
5086	5124	/*

5129	5167	case ButtonPress:
5130	5168	case ButtonRelease:
5131	5169	assert(patPtr->info <= Button5);
5132		Tcl_AppendPrintfToObj(patternObj, "-%d", (int) patPtr->info);
	5170	Tcl_AppendPrintfToObj(patternObj, "-%u", (unsigned) patPtr->info);
5133	5171	break;
5134	5172	#if PRINT_SHORT_MOTION_SYNTAX
5135	5173	case MotionNotify: {
5136		ModMask mask = patPtr->modMask;
	5174	unsigned mask = patPtr->modMask;
5137	5175	while (mask & ALL_BUTTONS) {
5138	5176	unsigned button = ButtonNumberFromState(mask);
5139	5177	Tcl_AppendPrintfToObj(patternObj, "-%u", button);

5217	5255	Tcl_HashEntry hPtr = Tcl_FindHashEntry(&nameTable, (char )keysym);
5218	5256
5219	5257	if (hPtr) {
5220		return Tcl_GetHashValue(hPtr);
	5258	return (const char *)Tcl_GetHashValue(hPtr);
5221	5259	}
5222	5260	#endif /* REDO_KEYSYM_LOOKUP */
5223	5261

+18

-20

generic/tkBusy.c less more

53	53	Window parent);
54	54	static inline Tk_Window NextChild(Tk_Window tkwin);
55	55	static void RefWinEventProc(ClientData clientData,
56		register XEvent *eventPtr);
	56	XEvent *eventPtr);
57	57	static inline void SetWindowInstanceData(Tk_Window tkwin,
58	58	ClientData instanceData);
59	59

121	121	*----------------------------------------------------------------------
122	122	*/
123	123
124		/* ARGSUSED */
125	124	static void
126	125	BusyCustodyProc(
127	126	ClientData clientData, /* Information about the busy window. */
128		Tk_Window tkwin) /* Not used. */
129		{
130		Busy *busyPtr = clientData;
	127	TCL_UNUSED(Tk_Window)) /* Not used. */
	128	{
	129	Busy busyPtr = (Busy )clientData;
131	130
132	131	Tk_DeleteEventHandler(busyPtr->tkBusy, StructureNotifyMask, BusyEventProc,
133	132	busyPtr);

155	154	*----------------------------------------------------------------------
156	155	*/
157	156
158		/* ARGSUSED */
159	157	static void
160	158	BusyGeometryProc(
161		ClientData clientData, /* Information about window that got new
	159	TCL_UNUSED(void ), / Information about window that got new
162	160	* preferred geometry. */
163		Tk_Window tkwin) /* Other Tk-related information about the
	161	TCL_UNUSED(Tk_Window)) /* Other Tk-related information about the
164	162	* window. */
165	163	{
166	164	/* Should never get here */

248	246	static void
249	247	RefWinEventProc(
250	248	ClientData clientData, /* Busy window record */
251		register XEvent eventPtr) / Event which triggered call to routine */
252		{
253		register Busy *busyPtr = clientData;
	249	XEvent eventPtr) / Event which triggered call to routine */
	250	{
	251	Busy busyPtr = (Busy )clientData;
254	252
255	253	switch (eventPtr->type) {
256	254	case ReparentNotify:

332	330	DestroyBusy(
333	331	void data) / Busy window structure record */
334	332	{
335		register Busy *busyPtr = data;
	333	Busy busyPtr = (Busy )data;
336	334
337	335	if (busyPtr->hashPtr != NULL) {
338	336	Tcl_DeleteHashEntry(busyPtr->hashPtr);

376	374	ClientData clientData, /* Busy window record */
377	375	XEvent eventPtr) / Event which triggered call to routine */
378	376	{
379		Busy *busyPtr = clientData;
	377	Busy busyPtr = (Busy )clientData;
380	378
381	379	if (eventPtr->type == DestroyNotify) {
382	380	busyPtr->tkBusy = NULL;

526	524	Window parent;
527	525	Tk_FakeWin *winPtr;
528	526
529		busyPtr = ckalloc(sizeof(Busy));
	527	busyPtr = (Busy *)ckalloc(sizeof(Busy));
530	528	x = y = 0;
531	529	length = strlen(Tk_Name(tkRef));
532		name = ckalloc(length + 6);
	530	name = (char *)ckalloc(length + 6);
533	531	if (Tk_IsTopLevel(tkRef)) {
534	532	fmt = "_Busy"; /* Child */
535	533	tkParent = tkRef;

695	693	Tcl_GetString(windowObj), NULL);
696	694	return NULL;
697	695	}
698		return Tcl_GetHashValue(hPtr);
	696	return (Busy *)Tcl_GetHashValue(hPtr);
699	697	}
700	698
701	699	/*

745	743	Tcl_SetHashValue(hPtr, busyPtr);
746	744	busyPtr->hashPtr = hPtr;
747	745	} else {
748		busyPtr = Tcl_GetHashValue(hPtr);
	746	busyPtr = (Busy *)Tcl_GetHashValue(hPtr);
749	747	}
750	748
751	749	busyPtr->tablePtr = busyTablePtr;

788	786	int objc, /* Number of arguments. */
789	787	Tcl_Obj const objv[]) / Argument objects. */
790	788	{
791		Tk_Window tkwin = clientData;
	789	Tk_Window tkwin = (Tk_Window)clientData;
792	790	Tcl_HashTable busyTablePtr = &((TkWindow ) tkwin)->mainPtr->busyTable;
793	791	Busy *busyPtr;
794	792	Tcl_Obj *objPtr;

854	852	}
855	853	Tcl_Preserve(busyPtr);
856	854	if (objc <= 4) {
857		objPtr = Tk_GetOptionInfo(interp, (char *) busyPtr,
	855	objPtr = Tk_GetOptionInfo(interp, (char *)busyPtr,
858	856	busyPtr->optionTable, (objc == 4) ? objv[3] : NULL,
859	857	busyPtr->tkBusy);
860	858	if (objPtr == NULL) {

876	874	objPtr = Tcl_NewObj();
877	875	for (hPtr = Tcl_FirstHashEntry(busyTablePtr, &cursor); hPtr != NULL;
878	876	hPtr = Tcl_NextHashEntry(&cursor)) {
879		busyPtr = Tcl_GetHashValue(hPtr);
	877	busyPtr = (Busy *)Tcl_GetHashValue(hPtr);
880	878	if (pattern == NULL \|\|
881	879	Tcl_StringCaseMatch(Tk_PathName(busyPtr->tkRef), pattern, 0)) {
882	880	Tcl_ListObjAppendElement(interp, objPtr,

+1

-1

generic/tkButton.h less more

305	305	*/
306	306
307	307	#ifndef TkpButtonSetDefaults
308		MODULE_SCOPE void TkpButtonSetDefaults();
	308	MODULE_SCOPE void TkpButtonSetDefaults(void);
309	309	#endif
310	310	MODULE_SCOPE void TkButtonWorldChanged(ClientData instanceData);
311	311	MODULE_SCOPE void TkpComputeButtonGeometry(TkButton *butPtr);

+22

-24

generic/tkCanvArc.c less more

351	351	objs[2] = Tcl_NewDoubleObj(arcPtr->bbox[2]);
352	352	objs[3] = Tcl_NewDoubleObj(arcPtr->bbox[3]);
353	353	Tcl_SetObjResult(interp, Tcl_NewListObj(4, objs));
354		} else if ((objc == 1)\|\|(objc == 4)) {
355		if (objc==1) {
	354	} else if ((objc == 1) \|\| (objc == 4)) {
	355	if (objc == 1) {
356	356	if (Tcl_ListObjGetElements(interp, objv[0], &objc,
357	357	(Tcl_Obj ***) &objv) != TCL_OK) {
358	358	return TCL_ERROR;

509	509	if (arcPtr->disabledFillStipple!=None) {
510	510	stipple = arcPtr->disabledFillStipple;
511	511	}
512		}
	512	}
513	513
514	514	if (arcPtr->style == ARC_STYLE) {
515	515	newGC = NULL;

575	575
576	576	static void
577	577	DeleteArc(
578		Tk_Canvas canvas, /* Info about overall canvas. */
	578	TCL_UNUSED(Tk_Canvas), /* Info about overall canvas. */
579	579	Tk_Item itemPtr, / Item that is being deleted. */
580	580	Display display) / Display containing window for canvas. */
581	581	{
582		ArcItem arcPtr = (ArcItem ) itemPtr;
	582	ArcItem arcPtr = (ArcItem )itemPtr;
583	583
584	584	Tk_DeleteOutline(display, &(arcPtr->outline));
585	585	if (arcPtr->numOutlinePoints != 0) {

625	625	*--------------------------------------------------------------
626	626	*/
627	627
628		/* ARGSUSED */
629	628	static void
630	629	ComputeArcBbox(
631	630	Tk_Canvas canvas, /* Canvas that contains item. */

662	661	*/
663	662
664	663	if (arcPtr->bbox[1] > arcPtr->bbox[3]) {
665		double tmp = arcPtr->bbox[3];
	664	tmp = arcPtr->bbox[3];
666	665
667	666	arcPtr->bbox[3] = arcPtr->bbox[1];
668	667	arcPtr->bbox[1] = tmp;
669	668	}
670	669	if (arcPtr->bbox[0] > arcPtr->bbox[2]) {
671		double tmp = arcPtr->bbox[2];
	670	tmp = arcPtr->bbox[2];
672	671
673	672	arcPtr->bbox[2] = arcPtr->bbox[0];
674	673	arcPtr->bbox[0] = tmp;

677	676	ComputeArcOutline(canvas,arcPtr);
678	677
679	678	/*
680		* To compute the bounding box, start with the the bbox formed by the two
	679	* To compute the bounding box, start with the bbox formed by the two
681	680	* endpoints of the arc. Then add in the center of the arc's oval (if
682	681	* relevant) and the 3-o'clock, 6-o'clock, 9-o'clock, and 12-o'clock
683	682	* positions, if they are relevant.

768	767	Tk_Item itemPtr, / Item to be displayed. */
769	768	Display display, / Display on which to draw item. */
770	769	Drawable drawable, /* Pixmap or window in which to draw item. */
771		int x, int y, /* Describes region of canvas that must be */
772		int width, int height) /* redisplayed (not used). */
	770	TCL_UNUSED(int), /* Describes region of canvas that must be */
	771	TCL_UNUSED(int), /* redisplayed (not used). */
	772	TCL_UNUSED(int),
	773	TCL_UNUSED(int))
773	774	{
774	775	ArcItem arcPtr = (ArcItem ) itemPtr;
775	776	short x1, y1, x2, y2;

941	942	*--------------------------------------------------------------
942	943	*/
943	944
944		/* ARGSUSED */
945	945	static double
946	946	ArcToPoint(
947	947	Tk_Canvas canvas, /* Canvas containing item. */

1106	1106	*--------------------------------------------------------------
1107	1107	*/
1108	1108
1109		/* ARGSUSED */
1110	1109	static int
1111	1110	ArcToArea(
1112	1111	Tk_Canvas canvas, /* Canvas containing item. */

1446	1445	*/
1447	1446
1448	1447	if (arcPtr->numOutlinePoints == 0) {
1449		arcPtr->outlinePtr = ckalloc(26 * sizeof(double));
	1448	arcPtr->outlinePtr = (double )ckalloc(26 sizeof(double));
1450	1449	arcPtr->numOutlinePoints = 22;
1451	1450	}
1452	1451	outlinePtr = arcPtr->outlinePtr;

1460	1459	* curved arc segment, which are marked with X's in the figure below:
1461	1460	*
1462	1461	*
1463		* * * *
	1462	* * * *
1464	1463	* * *
1465	1464	* * * * *
1466	1465	* * * * *

1813	1812	Tcl_Interp interp, / Leave Postscript or error message here. */
1814	1813	Tk_Canvas canvas, /* Information about overall canvas. */
1815	1814	Tk_Item itemPtr, / Item for which Postscript is wanted. */
1816		int prepass) /* 1 means this is a prepass to collect font
	1815	TCL_UNUSED(int)) /* 1 means this is a prepass to collect font
1817	1816	* information; 0 means final Postscript is
1818	1817	* being created. */
1819	1818	{

2027	2026
2028	2027	static int
2029	2028	StyleParseProc(
2030		ClientData clientData, /* some flags.*/
	2029	TCL_UNUSED(void *),
2031	2030	Tcl_Interp interp, / Used for reporting errors. */
2032		Tk_Window tkwin, /* Window containing canvas widget. */
	2031	TCL_UNUSED(Tk_Window), /* Window containing canvas widget. */
2033	2032	const char value, / Value of option. */
2034	2033	char widgRec, / Pointer to record for item. */
2035	2034	int offset) /* Offset into item. */
2036	2035	{
2037	2036	int c;
2038	2037	size_t length;
2039
2040		register Style stylePtr = (Style ) (widgRec + offset);
	2038	Style stylePtr = (Style ) (widgRec + offset);
2041	2039
2042	2040	if (value == NULL \|\| *value == 0) {
2043	2041	*stylePtr = PIESLICE_STYLE;

2091	2089
2092	2090	static const char *
2093	2091	StylePrintProc(
2094		ClientData clientData, /* Ignored. */
2095		Tk_Window tkwin, /* Ignored. */
	2092	TCL_UNUSED(void ), / Ignored. */
	2093	TCL_UNUSED(Tk_Window), /* Ignored. */
2096	2094	char widgRec, / Pointer to record for item. */
2097	2095	int offset, /* Offset into item. */
2098		Tcl_FreeProc *freeProcPtr) / Pointer to variable to fill in with
	2096	TCL_UNUSED(Tcl_FreeProc *)) / Pointer to variable to fill in with
2099	2097	* information about how to reclaim storage
2100	2098	* for return string. */
2101	2099	{
2102		register Style stylePtr = (Style ) (widgRec + offset);
	2100	Style stylePtr = (Style ) (widgRec + offset);
2103	2101
2104	2102	if (*stylePtr == ARC_STYLE) {
2105	2103	return "arc";

+28

-35

generic/tkCanvLine.c less more

405	405
406	406	numPoints = objc/2;
407	407	if (linePtr->numPoints != numPoints) {
408		coordPtr = ckalloc(sizeof(double) * objc);
	408	coordPtr = (double )ckalloc(sizeof(double) objc);
409	409	if (linePtr->coordPtr != NULL) {
410	410	ckfree(linePtr->coordPtr);
411	411	}

601	601
602	602	static void
603	603	DeleteLine(
604		Tk_Canvas canvas, /* Info about overall canvas widget. */
	604	TCL_UNUSED(Tk_Canvas), /* Info about overall canvas widget. */
605	605	Tk_Item itemPtr, / Item that is being deleted. */
606	606	Display display) / Display containing window for canvas. */
607	607	{

705	705
706	706	tsoffset = &linePtr->outline.tsoffset;
707	707	if (tsoffset->flags & TK_OFFSET_INDEX) {
708		double *coordPtr = linePtr->coordPtr
	708	coordPtr = linePtr->coordPtr
709	709	+ (tsoffset->flags & ~TK_OFFSET_INDEX);
710	710
711	711	if (tsoffset->flags <= 0) {

829	829	Tk_Item itemPtr, / Item to be displayed. */
830	830	Display display, / Display on which to draw item. */
831	831	Drawable drawable, /* Pixmap or window in which to draw item. */
832		int x, int y, int width, int height)
833		/* Describes region of canvas that must be
834		* redisplayed (not used). */
	832	TCL_UNUSED(int), /* Describes region of canvas that must be */
	833	TCL_UNUSED(int), /* redisplayed (not used). */
	834	TCL_UNUSED(int),
	835	TCL_UNUSED(int))
835	836	{
836	837	LineItem linePtr = (LineItem ) itemPtr;
837	838	XPoint staticPoints[MAX_STATIC_POINTS*3];

874	875	if (numPoints <= MAX_STATIC_POINTS) {
875	876	pointPtr = staticPoints;
876	877	} else {
877		pointPtr = ckalloc(numPoints * 3 * sizeof(XPoint));
	878	pointPtr = (XPoint )ckalloc(numPoints 3 * sizeof(XPoint));
878	879	}
879	880
880	881	if ((linePtr->smooth) && (linePtr->numPoints > 2)) {

983	984	linePtr->coordPtr[length-2] = linePtr->lastArrowPtr[0];
984	985	linePtr->coordPtr[length-1] = linePtr->lastArrowPtr[1];
985	986	}
986		newCoordPtr = ckalloc(sizeof(double) * (length + objc));
	987	newCoordPtr = (double )ckalloc(sizeof(double) (length + objc));
987	988	for (i=0; i<beforeThis; i++) {
988	989	newCoordPtr[i] = linePtr->coordPtr[i];
989	990	}

1318	1319	*--------------------------------------------------------------
1319	1320	*/
1320	1321
1321		/* ARGSUSED */
1322	1322	static double
1323	1323	LineToPoint(
1324	1324	Tk_Canvas canvas, /* Canvas containing item. */

1364	1364	if (numPoints <= MAX_STATIC_POINTS) {
1365	1365	linePoints = staticSpace;
1366	1366	} else {
1367		linePoints = ckalloc(2 * numPoints * sizeof(double));
	1367	linePoints = (double )ckalloc(2 numPoints * sizeof(double));
1368	1368	}
1369	1369	numPoints = linePtr->smooth->coordProc(canvas, linePtr->coordPtr,
1370	1370	linePtr->numPoints, linePtr->splineSteps, NULL, linePoints);

1546	1546	*--------------------------------------------------------------
1547	1547	*/
1548	1548
1549		/* ARGSUSED */
1550	1549	static int
1551	1550	LineToArea(
1552	1551	Tk_Canvas canvas, /* Canvas containing item. */

1599	1598	if (numPoints <= MAX_STATIC_POINTS) {
1600	1599	linePoints = staticSpace;
1601	1600	} else {
1602		linePoints = ckalloc(2 * numPoints * sizeof(double));
	1601	linePoints = (double )ckalloc(2 numPoints * sizeof(double));
1603	1602	}
1604	1603	numPoints = linePtr->smooth->coordProc(canvas, linePtr->coordPtr,
1605	1604	linePtr->numPoints, linePtr->splineSteps, NULL, linePoints);

1694	1693	linePtr->firstArrowPtr = NULL;
1695	1694	}
1696	1695	if (linePtr->lastArrowPtr != NULL) {
1697		int i;
1698
1699	1696	i = 2*(linePtr->numPoints-1);
1700	1697	linePtr->coordPtr[i] = linePtr->lastArrowPtr[0];
1701	1698	linePtr->coordPtr[i+1] = linePtr->lastArrowPtr[1];

1872	1869	*--------------------------------------------------------------
1873	1870	*/
1874	1871
1875		/* ARGSUSED */
1876	1872	static int
1877	1873	ParseArrowShape(
1878		ClientData clientData, /* Not used. */
	1874	TCL_UNUSED(void ), / Not used. */
1879	1875	Tcl_Interp interp, / Used for error reporting. */
1880		Tk_Window tkwin, /* Not used. */
	1876	TCL_UNUSED(Tk_Window), /* Not used. */
1881	1877	const char value, / Textual specification of arrow shape. */
1882	1878	char recordPtr, / Pointer to item record in which to store
1883	1879	* arrow information. */

1941	1937	*--------------------------------------------------------------
1942	1938	*/
1943	1939
1944		/* ARGSUSED */
1945	1940	static const char *
1946	1941	PrintArrowShape(
1947		ClientData clientData, /* Not used. */
1948		Tk_Window tkwin, /* Window associated with linePtr's widget. */
	1942	TCL_UNUSED(void ), / Not used. */
	1943	TCL_UNUSED(Tk_Window), /* Window associated with linePtr's widget. */
1949	1944	char recordPtr, / Pointer to item record containing current
1950	1945	* shape information. */
1951		int offset, /* Offset of arrow information in record. */
	1946	TCL_UNUSED(int), /* Offset of arrow information in record. */
1952	1947	Tcl_FreeProc *freeProcPtr) / Store address of function to call to free
1953	1948	* string here. */
1954	1949	{
1955	1950	LineItem linePtr = (LineItem ) recordPtr;
1956		char *buffer = ckalloc(120);
	1951	char buffer = (char )ckalloc(120);
1957	1952
1958	1953	sprintf(buffer, "%.5g %.5g %.5g", linePtr->arrowShapeA,
1959	1954	linePtr->arrowShapeB, linePtr->arrowShapeC);

1981	1976
1982	1977	static int
1983	1978	ArrowParseProc(
1984		ClientData clientData, /* some flags.*/
	1979	TCL_UNUSED(void *),
1985	1980	Tcl_Interp interp, / Used for reporting errors. */
1986		Tk_Window tkwin, /* Window containing canvas widget. */
	1981	TCL_UNUSED(Tk_Window), /* Window containing canvas widget. */
1987	1982	const char value, / Value of option. */
1988	1983	char widgRec, / Pointer to record for item. */
1989	1984	int offset) /* Offset into item. */
1990	1985	{
1991	1986	int c;
1992	1987	size_t length;
1993
1994		register Arrows arrowPtr = (Arrows ) (widgRec + offset);
	1988	Arrows arrowPtr = (Arrows ) (widgRec + offset);
1995	1989
1996	1990	if (value == NULL \|\| *value == 0) {
1997	1991	*arrowPtr = ARROWS_NONE;

2049	2043
2050	2044	static const char *
2051	2045	ArrowPrintProc(
2052		ClientData clientData, /* Ignored. */
2053		Tk_Window tkwin, /* Window containing canvas widget. */
	2046	TCL_UNUSED(void ), / Ignored. */
	2047	TCL_UNUSED(Tk_Window), /* Window containing canvas widget. */
2054	2048	char widgRec, / Pointer to record for item. */
2055	2049	int offset, /* Offset into item. */
2056		Tcl_FreeProc *freeProcPtr) / Pointer to variable to fill in with
	2050	TCL_UNUSED(Tcl_FreeProc *)) / Pointer to variable to fill in with
2057	2051	* information about how to reclaim storage
2058	2052	* for return string. */
2059	2053	{
2060		register Arrows arrowPtr = (Arrows ) (widgRec + offset);
	2054	Arrows arrowPtr = (Arrows ) (widgRec + offset);
2061	2055
2062	2056	switch (*arrowPtr) {
2063	2057	case ARROWS_FIRST:

2091	2085	*--------------------------------------------------------------
2092	2086	*/
2093	2087
2094		/* ARGSUSED */
2095	2088	static int
2096	2089	ConfigureArrows(
2097	2090	Tk_Canvas canvas, /* Canvas in which arrows will be displayed

2152	2145	if (linePtr->arrow != ARROWS_LAST) {
2153	2146	poly = linePtr->firstArrowPtr;
2154	2147	if (poly == NULL) {
2155		poly = ckalloc(2 * PTS_IN_ARROW * sizeof(double));
	2148	poly = (double )ckalloc(2 PTS_IN_ARROW * sizeof(double));
2156	2149	poly[0] = poly[10] = linePtr->coordPtr[0];
2157	2150	poly[1] = poly[11] = linePtr->coordPtr[1];
2158	2151	linePtr->firstArrowPtr = poly;

2196	2189	coordPtr = linePtr->coordPtr + 2*(linePtr->numPoints-2);
2197	2190	poly = linePtr->lastArrowPtr;
2198	2191	if (poly == NULL) {
2199		poly = ckalloc(2 * PTS_IN_ARROW * sizeof(double));
	2192	poly = (double )ckalloc(2 PTS_IN_ARROW * sizeof(double));
2200	2193	poly[0] = poly[10] = coordPtr[2];
2201	2194	poly[1] = poly[11] = coordPtr[3];
2202	2195	linePtr->lastArrowPtr = poly;

2253	2246	Tcl_Interp interp, / Leave Postscript or error message here. */
2254	2247	Tk_Canvas canvas, /* Information about overall canvas. */
2255	2248	Tk_Item itemPtr, / Item for which Postscript is wanted. */
2256		int prepass) /* 1 means this is a prepass to collect font
	2249	TCL_UNUSED(int)) /* 1 means this is a prepass to collect font
2257	2250	* information; 0 means final Postscript is
2258	2251	* being created. */
2259	2252	{

2365	2358	linePtr->numPoints, linePtr->splineSteps, NULL, NULL);
2366	2359	pointPtr = staticPoints;
2367	2360	if (numPoints > MAX_STATIC_POINTS) {
2368		pointPtr = ckalloc(numPoints * 2 * sizeof(double));
	2361	pointPtr = (double )ckalloc(numPoints 2 * sizeof(double));
2369	2362	}
2370	2363	numPoints = linePtr->smooth->coordProc(canvas, linePtr->coordPtr,
2371	2364	linePtr->numPoints, linePtr->splineSteps, NULL, pointPtr);

+14

-15

generic/tkCanvPoly.c less more

375	375	* another point to close the polygon.
376	376	*/
377	377
378		polyPtr->coordPtr = ckalloc(sizeof(double) * (objc+2));
	378	polyPtr->coordPtr = (double )ckalloc(sizeof(double) (objc+2));
379	379	polyPtr->pointsAllocated = numPoints+1;
380	380	}
381	381	for (i = objc-1; i >= 0; i--) {

563	563
564	564	static void
565	565	DeletePolygon(
566		Tk_Canvas canvas, /* Info about overall canvas widget. */
	566	TCL_UNUSED(Tk_Canvas), /* Info about overall canvas widget. */
567	567	Tk_Item itemPtr, / Item that is being deleted. */
568	568	Display display) / Display containing window for canvas. */
569	569	{

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

873	873	Tk_Item itemPtr, / Item to be displayed. */
874	874	Display display, / Display on which to draw item. */
875	875	Drawable drawable, /* Pixmap or window in which to draw item. */
876		int x, int y, int width, int height)
877		/* Describes region of canvas that must be
878		* redisplayed (not used). */
	876	TCL_UNUSED(int), /* Describes region of canvas that must be */
	877	TCL_UNUSED(int), /* redisplayed (not used). */
	878	TCL_UNUSED(int),
	879	TCL_UNUSED(int))
879	880	{
880	881	PolygonItem polyPtr = (PolygonItem ) itemPtr;
881	882	Tk_State state = itemPtr->state;

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

997	998	*
998	999	* PolygonInsert --
999	1000	*
1000		* Insert coords into a polugon item at a given index.
	1001	* Insert coords into a polygon item at a given index.
1001	1002	*
1002	1003	* Results:
1003	1004	* None.

1037	1038	while (beforeThis < 0) {
1038	1039	beforeThis += length;
1039	1040	}
1040		newCoordPtr = ckalloc(sizeof(double) * (length + 2 + objc));
	1041	newCoordPtr = (double )ckalloc(sizeof(double) (length + 2 + objc));
1041	1042	for (i=0; i<beforeThis; i++) {
1042	1043	newCoordPtr[i] = polyPtr->coordPtr[i];
1043	1044	}

1239	1240	*--------------------------------------------------------------
1240	1241	*/
1241	1242
1242		/* ARGSUSED */
1243	1243	static double
1244	1244	PolygonToPoint(
1245	1245	Tk_Canvas canvas, /* Canvas containing item. */

1287	1287	if (numPoints <= MAX_STATIC_POINTS) {
1288	1288	polyPoints = staticSpace;
1289	1289	} else {
1290		polyPoints = ckalloc(2 * numPoints * sizeof(double));
	1290	polyPoints = (double )ckalloc(2 numPoints * sizeof(double));
1291	1291	}
1292	1292	numPoints = polyPtr->smooth->coordProc(canvas, polyPtr->coordPtr,
1293	1293	polyPtr->numPoints, polyPtr->splineSteps, NULL, polyPoints);

1429	1429	*--------------------------------------------------------------
1430	1430	*/
1431	1431
1432		/* ARGSUSED */
1433	1432	static int
1434	1433	PolygonToArea(
1435	1434	Tk_Canvas canvas, /* Canvas containing item. */

1496	1495	if (numPoints <= MAX_STATIC_POINTS) {
1497	1496	polyPoints = staticSpace;
1498	1497	} else {
1499		polyPoints = ckalloc(2 * numPoints * sizeof(double));
	1498	polyPoints = (double )ckalloc(2 numPoints * sizeof(double));
1500	1499	}
1501	1500	numPoints = polyPtr->smooth->coordProc(canvas, polyPtr->coordPtr,
1502	1501	polyPtr->numPoints, polyPtr->splineSteps, NULL, polyPoints);

1666	1665	static int
1667	1666	GetPolygonIndex(
1668	1667	Tcl_Interp interp, / Used for error reporting. */
1669		Tk_Canvas canvas, /* Canvas containing item. */
	1668	TCL_UNUSED(Tk_Canvas), /* Canvas containing item. */
1670	1669	Tk_Item itemPtr, / Item for which the index is being
1671	1670	* specified. */
1672	1671	Tcl_Obj obj, / Specification of a particular coord in

1796	1795	Tcl_Interp interp, / Leave Postscript or error message here. */
1797	1796	Tk_Canvas canvas, /* Information about overall canvas. */
1798	1797	Tk_Item itemPtr, / Item for which Postscript is wanted. */
1799		int prepass) /* 1 means this is a prepass to collect font
	1798	TCL_UNUSED(int)) /* 1 means this is a prepass to collect font
1800	1799	* information; 0 means final Postscript is
1801	1800	* being created. */
1802	1801	{

+3

-3

generic/tkCanvPs.c less more

192	192	* such.
193	193	*/
194	194
195		result = Tcl_EvalEx(interp, "::tk::ensure_psenc_is_loaded", -1, 0);
	195	result = Tcl_EvalEx(interp, "::tk::ensure_psenc_is_loaded", -1, TCL_EVAL_GLOBAL);
196	196	if (result != TCL_OK) {
197	197	return result;
198	198	}

571	571	continue;
572	572	}
573	573
574		Tcl_ResetResult(interp);
575	574	result = itemPtr->typePtr->postscriptProc(interp,
576	575	(Tk_Canvas) canvasPtr, itemPtr, 0);
577	576	if (result != TCL_OK) {

584	583	Tcl_AppendToObj(psObj, "gsave\n", -1);
585	584	Tcl_AppendObjToObj(psObj, Tcl_GetObjResult(interp));
586	585	Tcl_AppendToObj(psObj, "grestore\n", -1);
	586	Tcl_ResetResult(interp);
587	587
588	588	if (psInfo.chan != NULL) {
589	589	if (Tcl_WriteObj(psInfo.chan, psObj) == -1) {

1600	1600	/*
1601	1601	* Generate data for image in monochrome mode. No attempt at
1602	1602	* dithering is made--instead, just set a threshold. To handle
1603		* transparecies we need to output two lines: one for the black
	1603	* transparencies we need to output two lines: one for the black
1604	1604	* pixels, one for the white ones.
1605	1605	*/
1606	1606

+32

-31

generic/tkCanvText.c less more

956	956	*/
957	957
958	958	if ((selFirstChar >= 0) && (textPtr->selTextGC != textPtr->gc)) {
959		TkDrawAngledTextLayout(display, drawable, textPtr->gc,
960		textPtr->textLayout, drawableX, drawableY, textPtr->angle,
961		0, selFirstChar);
	959	if (0 < selFirstChar) {
	960	TkDrawAngledTextLayout(display, drawable, textPtr->gc,
	961	textPtr->textLayout, drawableX, drawableY, textPtr->angle,
	962	0, selFirstChar);
	963	}
962	964	TkDrawAngledTextLayout(display, drawable, textPtr->selTextGC,
963	965	textPtr->textLayout, drawableX, drawableY, textPtr->angle,
964	966	selFirstChar, selLastChar + 1);
965		TkDrawAngledTextLayout(display, drawable, textPtr->gc,
966		textPtr->textLayout, drawableX, drawableY, textPtr->angle,
967		selLastChar + 1, -1);
	967	if (selLastChar + 1 < textPtr->numChars) {
	968	TkDrawAngledTextLayout(display, drawable, textPtr->gc,
	969	textPtr->textLayout, drawableX, drawableY, textPtr->angle,
	970	selLastChar + 1, textPtr->numChars);
	971	}
968	972	} else {
969	973	TkDrawAngledTextLayout(display, drawable, textPtr->gc,
970	974	textPtr->textLayout, drawableX, drawableY, textPtr->angle,
971		0, -1);
	975	0, textPtr->numChars);
972	976	}
973	977	TkUnderlineAngledTextLayout(display, drawable, textPtr->gc,
974	978	textPtr->textLayout, drawableX, drawableY, textPtr->angle,

1020	1024	if (index > textPtr->numChars) {
1021	1025	index = textPtr->numChars;
1022	1026	}
1023		byteIndex = Tcl_UtfAtIndex(text, index) - text;
	1027	byteIndex = TkUtfAtIndex(text, index) - text;
1024	1028	byteCount = strlen(string);
1025	1029	if (byteCount == 0) {
1026	1030	return;
1027	1031	}
1028	1032
1029		newStr = ckalloc(textPtr->numBytes + byteCount + 1);
1030		memcpy(newStr, text, (size_t) byteIndex);
	1033	newStr = (char *)ckalloc(textPtr->numBytes + byteCount + 1);
	1034	memcpy(newStr, text, byteIndex);
1031	1035	strcpy(newStr + byteIndex, string);
1032	1036	strcpy(newStr + byteIndex + byteCount, text + byteIndex);
1033	1037

1103	1107	}
1104	1108	charsRemoved = last + 1 - first;
1105	1109
1106		byteIndex = Tcl_UtfAtIndex(text, first) - text;
1107		byteCount = Tcl_UtfAtIndex(text + byteIndex, charsRemoved)
	1110	byteIndex = TkUtfAtIndex(text, first) - text;
	1111	byteCount = TkUtfAtIndex(text + byteIndex, charsRemoved)
1108	1112	- (text + byteIndex);
1109	1113
1110		newStr = ckalloc(textPtr->numBytes + 1 - byteCount);
1111		memcpy(newStr, text, (size_t) byteIndex);
	1114	newStr = (char *)ckalloc(textPtr->numBytes + 1 - byteCount);
	1115	memcpy(newStr, text, byteIndex);
1112	1116	strcpy(newStr + byteIndex, text + byteIndex + byteCount);
1113	1117
1114	1118	ckfree(text);

1262	1266	*--------------------------------------------------------------
1263	1267	*/
1264	1268
1265		/* ARGSUSED */
1266	1269	static void
1267	1270	ScaleText(
1268	1271	Tk_Canvas canvas, /* Canvas containing rectangle. */

1333	1336	static int
1334	1337	GetTextIndex(
1335	1338	Tcl_Interp interp, / Used for error reporting. */
1336		Tk_Canvas canvas, /* Canvas containing item. */
	1339	TCL_UNUSED(Tk_Canvas), /* Canvas containing item. */
1337	1340	Tk_Item itemPtr, / Item for which the index is being
1338	1341	* specified. */
1339	1342	Tcl_Obj obj, / Specification of a particular character in

1344	1347	TextItem textPtr = (TextItem ) itemPtr;
1345	1348	int length;
1346	1349	int c;
1347		TkCanvas canvasPtr = (TkCanvas ) canvas;
1348	1350	Tk_CanvasTextInfo *textInfoPtr = textPtr->textInfoPtr;
1349	1351	const char *string = Tcl_GetStringFromObj(obj, &length);
1350	1352
1351	1353	c = string[0];
1352	1354
1353		if ((c == 'e') && (strncmp(string, "end", (unsigned) length) == 0)) {
	1355	if ((c == 'e') && (strncmp(string, "end", length) == 0)) {
1354	1356	*indexPtr = textPtr->numChars;
1355	1357	} else if ((c == 'i')
1356		&& (strncmp(string, "insert", (unsigned) length) == 0)) {
	1358	&& (strncmp(string, "insert", length) == 0)) {
1357	1359	*indexPtr = textPtr->insertPos;
1358	1360	} else if ((c == 's') && (length >= 5)
1359		&& (strncmp(string, "sel.first", (unsigned) length) == 0)) {
	1361	&& (strncmp(string, "sel.first", length) == 0)) {
1360	1362	if (textInfoPtr->selItemPtr != itemPtr) {
1361	1363	Tcl_SetObjResult(interp, Tcl_NewStringObj(
1362	1364	"selection isn't in item", -1));

1365	1367	}
1366	1368	*indexPtr = textInfoPtr->selectFirst;
1367	1369	} else if ((c == 's') && (length >= 5)
1368		&& (strncmp(string, "sel.last", (unsigned) length) == 0)) {
	1370	&& (strncmp(string, "sel.last", length) == 0)) {
1369	1371	if (textInfoPtr->selItemPtr != itemPtr) {
1370	1372	Tcl_SetObjResult(interp, Tcl_NewStringObj(
1371	1373	"selection isn't in item", -1));

1375	1377	*indexPtr = textInfoPtr->selectLast;
1376	1378	} else if (c == '@') {
1377	1379	int x, y;
1378		double tmp, c = textPtr->cosine, s = textPtr->sine;
	1380	double tmp, cs = textPtr->cosine, s = textPtr->sine;
1379	1381	char *end;
1380	1382	const char *p;
1381	1383

1391	1393	goto badIndex;
1392	1394	}
1393	1395	y = (int) ((tmp < 0) ? tmp - 0.5 : tmp + 0.5);
1394		x += canvasPtr->scrollX1 - (int) textPtr->drawOrigin[0];
1395		y += canvasPtr->scrollY1 - (int) textPtr->drawOrigin[1];
	1396	x -= (int) textPtr->drawOrigin[0];
	1397	y -= (int) textPtr->drawOrigin[1];
1396	1398	*indexPtr = Tk_PointToChar(textPtr->textLayout,
1397		(int) (xc - ys), (int) (yc + xs));
	1399	(int) (xcs - ys), (int) (ycs + xs));
1398	1400	} else if (Tcl_GetIntFromObj(NULL, obj, indexPtr) == TCL_OK) {
1399	1401	if (*indexPtr < 0) {
1400	1402	*indexPtr = 0;

1431	1433	*--------------------------------------------------------------
1432	1434	*/
1433	1435
1434		/* ARGSUSED */
1435	1436	static void
1436	1437	SetTextCursor(
1437		Tk_Canvas canvas, /* Record describing canvas widget. */
	1438	TCL_UNUSED(Tk_Canvas), /* Record describing canvas widget. */
1438	1439	Tk_Item itemPtr, / Text item in which cursor position is to be
1439	1440	* set. */
1440	1441	int index) /* Character index of character just before

1473	1474
1474	1475	static int
1475	1476	GetSelText(
1476		Tk_Canvas canvas, /* Canvas containing selection. */
	1477	TCL_UNUSED(Tk_Canvas), /* Canvas containing selection. */
1477	1478	Tk_Item itemPtr, / Text item containing selection. */
1478	1479	int offset, /* Byte offset within selection of first
1479	1480	* character to be returned. */

1493	1494	return 0;
1494	1495	}
1495	1496	text = textPtr->text;
1496		selStart = Tcl_UtfAtIndex(text, textInfoPtr->selectFirst);
1497		selEnd = Tcl_UtfAtIndex(selStart,
	1497	selStart = TkUtfAtIndex(text, textInfoPtr->selectFirst);
	1498	selEnd = TkUtfAtIndex(selStart,
1498	1499	textInfoPtr->selectLast + 1 - textInfoPtr->selectFirst);
1499	1500	byteCount = selEnd - selStart - offset;
1500	1501	if (byteCount > maxBytes) {

1604	1605	Tcl_GetString(Tcl_GetObjResult(interp)));
1605	1606	}
1606	1607
1607		x = 0; y = 0; justify = NULL; /* lint. */
	1608	x = 0; y = 0; justify = NULL;
1608	1609	switch (textPtr->anchor) {
1609	1610	case TK_ANCHOR_NW: x = 0; y = 0; break;
1610	1611	case TK_ANCHOR_N: x = 1; y = 0; break;

+4

-3

generic/tkCanvUtil.c less more

27	27	"true",
28	28	TkMakeBezierCurve,
29	29	(void () (Tcl_Interp interp, Tk_Canvas canvas, double *coordPtr,
30		int numPoints, int numSteps)) TkMakeBezierPostscript,
	30	int numPoints, int numSteps))(void *)TkMakeBezierPostscript,
31	31	};
32	32	static const Tk_SmoothMethod tkRawSmoothMethod = {
33	33	"raw",
34	34	TkMakeRawCurve,
35	35	(void () (Tcl_Interp interp, Tk_Canvas canvas, double *coordPtr,
36		int numPoints, int numSteps)) TkMakeRawCurvePostscript,
	36	int numPoints, int numSteps))(void *)TkMakeRawCurvePostscript,
37	37	};
	38
38	39
39	40	/*
40	41	* Function forward-declarations.

754	755	}
755	756
756	757	/*
757		* Backward compatability hack.
	758	* Backward compatibility hack.
758	759	*/
759	760
760	761	if (strncmp(value, "bezier", length) == 0) {

+13

-13

generic/tkCanvWind.c less more

84	84	static int WinItemCoords(Tcl_Interp *interp,
85	85	Tk_Canvas canvas, Tk_Item *itemPtr, int objc,
86	86	Tcl_Obj *const objv[]);
87		static void WinItemLostSlaveProc(ClientData clientData,
	87	static void WinItemLostContentProc(ClientData clientData,
88	88	Tk_Window tkwin);
89	89	static void WinItemRequestProc(ClientData clientData,
90	90	Tk_Window tkwin);

140	140	static const Tk_GeomMgr canvasGeomType = {
141	141	"canvas", /* name */
142	142	WinItemRequestProc, /* requestProc */
143		WinItemLostSlaveProc, /* lostSlaveProc */
	143	WinItemLostContentProc, /* lostSlaveProc */
144	144	};
145	145
146	146	/*

1052	1052	/*
1053	1053	*--------------------------------------------------------------
1054	1054	*
1055		* WinItemLostSlaveProc --
	1055	* WinItemLostContentProc --
1056	1056	*
1057	1057	* This function is invoked by Tk whenever some other geometry claims
1058		* control over a slave that used to be managed by us.
1059		*
1060		* Results:
1061		* None.
1062		*
1063		* Side effects:
1064		* Forgets all canvas-related information about the slave.
	1058	* control over a content window that used to be managed by us.
	1059	*
	1060	* Results:
	1061	* None.
	1062	*
	1063	* Side effects:
	1064	* Forgets all canvas-related information about the content window.
1065	1065	*
1066	1066	*--------------------------------------------------------------
1067	1067	*/
1068	1068
1069	1069	/* ARGSUSED */
1070	1070	static void
1071		WinItemLostSlaveProc(
1072		ClientData clientData, /* WindowItem structure for slave window that
	1071	WinItemLostContentProc(
	1072	ClientData clientData, /* WindowItem structure for content window that
1073	1073	* was stolen away. */
1074		Tk_Window tkwin) /* Tk's handle for the slave window. */
	1074	Tk_Window tkwin) /* Tk's handle for the content window. */
1075	1075	{
1076	1076	WindowItem *winItemPtr = clientData;
1077	1077	Tk_Window canvasTkwin = Tk_CanvasTkwin(winItemPtr->canvas);

+61

-53

generic/tkCanvas.c less more

516	516	canvasPtr->display, pixmap, screenX1, screenY1, width, height);
517	517	}
518	518
519		static inline int
	519	static int
520	520	ItemIndex(
521	521	TkCanvas *canvasPtr,
522	522	Tk_Item *itemPtr,

637	637	int argc, /* Number of arguments. */
638	638	Tcl_Obj const argv[]) / Argument objects. */
639	639	{
640		Tk_Window tkwin = clientData;
	640	Tk_Window tkwin = (Tk_Window)clientData;
641	641	TkCanvas *canvasPtr;
642	642	Tk_Window newWin;
643	643

661	661	* pointers).
662	662	*/
663	663
664		canvasPtr = ckalloc(sizeof(TkCanvas));
	664	canvasPtr = (TkCanvas *)ckalloc(sizeof(TkCanvas));
665	665	canvasPtr->tkwin = newWin;
666	666	canvasPtr->display = Tk_Display(newWin);
667	667	canvasPtr->interp = interp;

787	787	int objc, /* Number of arguments. */
788	788	Tcl_Obj const objv[]) / Argument objects. */
789	789	{
790		TkCanvas *canvasPtr = clientData;
	790	TkCanvas canvasPtr = (TkCanvas )clientData;
791	791	int c, result;
792	792	Tk_Item itemPtr = NULL; / Initialization needed only to prevent
793	793	* compiler warning. */

834	834	Tcl_Preserve(canvasPtr);
835	835
836	836	result = TCL_OK;
837		switch ((enum options) index) {
	837	switch ((enum options)index) {
838	838	case CANV_ADDTAG:
839	839	if (objc < 4) {
840	840	Tcl_WrongNumArgs(interp, 2, objv, "tag searchCommand ?arg ...?");

896	896	break;
897	897	}
898	898	case CANV_BIND: {
899		ClientData object;
	899	void *object;
900	900
901	901	if ((objc < 3) \|\| (objc > 5)) {
902	902	Tcl_WrongNumArgs(interp, 2, objv, "tagOrId ?sequence? ?command?");

947	947	Tcl_HashEntry *entryPtr;
948	948
949	949	entryPtr = Tcl_FindHashEntry(&canvasPtr->idTable,
950		(char *) INT2PTR(searchPtr->id));
	950	INT2PTR(searchPtr->id));
951	951	if (entryPtr != NULL) {
952		itemPtr = Tcl_GetHashValue(entryPtr);
	952	itemPtr = (Tk_Item *)Tcl_GetHashValue(entryPtr);
953	953	object = itemPtr;
954	954	}
955	955

976	976
977	977	if (objc == 5) {
978	978	int append = 0;
979		unsigned long mask;
	979	unsigned int mask;
980	980	const char *argv4 = Tcl_GetString(objv[4]);
981	981
982	982	if (argv4[0] == 0) {

1026	1026	result = TCL_ERROR;
1027	1027	goto done;
1028	1028	}
1029		if (mask & ~(unsigned long)(ButtonMotionMask\|Button1MotionMask
	1029	if (mask & ~(ButtonMotionMask\|Button1MotionMask
1030	1030	\|Button2MotionMask\|Button3MotionMask\|Button4MotionMask
1031	1031	\|Button5MotionMask\|ButtonPressMask\|ButtonReleaseMask
1032	1032	\|EnterWindowMask\|LeaveWindowMask\|KeyPressMask

1184	1184	tmpObj = Tcl_NewListObj(2, objv+4);
1185	1185
1186	1186	FOR_EVERY_CANVAS_ITEM_MATCHING(objv[2], &searchPtr, goto doneImove) {
1187		int index;
1188	1187	int x1, x2, y1, y2;
1189	1188	int dontRedraw1, dontRedraw2;
1190	1189

1237	1236	case CANV_CREATE: {
1238	1237	Tk_ItemType *typePtr;
1239	1238	Tk_ItemType *matchPtr = NULL;
1240		Tk_Item *itemPtr;
1241	1239	int isNew = 0;
1242	1240	Tcl_HashEntry *entryPtr;
1243	1241	const char *arg;

1296	1294	}
1297	1295
1298	1296	typePtr = matchPtr;
1299		itemPtr = ckalloc(typePtr->itemSize);
1300		itemPtr->id = canvasPtr->nextId;
1301		canvasPtr->nextId++;
	1297	itemPtr = (Tk_Item *)ckalloc(typePtr->itemSize);
	1298	itemPtr->id = canvasPtr->nextId++;
1302	1299	itemPtr->tagPtr = itemPtr->staticTagSpace;
1303	1300	itemPtr->tagSpace = TK_TAG_SPACE;
1304	1301	itemPtr->numTags = 0;

1314	1311
1315	1312	itemPtr->nextPtr = NULL;
1316	1313	entryPtr = Tcl_CreateHashEntry(&canvasPtr->idTable,
1317		(char *) INT2PTR(itemPtr->id), &isNew);
	1314	INT2PTR(itemPtr->id), &isNew);
1318	1315	Tcl_SetHashValue(entryPtr, itemPtr);
1319	1316	itemPtr->prevPtr = canvasPtr->lastItemPtr;
1320	1317	canvasPtr->hotPtr = itemPtr;

1393	1390	ckfree(itemPtr->tagPtr);
1394	1391	}
1395	1392	entryPtr = Tcl_FindHashEntry(&canvasPtr->idTable,
1396		(char *) INT2PTR(itemPtr->id));
	1393	INT2PTR(itemPtr->id));
1397	1394	Tcl_DeleteHashEntry(entryPtr);
1398	1395	if (itemPtr->nextPtr != NULL) {
1399	1396	itemPtr->nextPtr->prevPtr = itemPtr->prevPtr;

1450	1447	FOR_EVERY_CANVAS_ITEM_MATCHING(objv[2], &searchPtr, goto done) {
1451	1448	for (i = itemPtr->numTags-1; i >= 0; i--) {
1452	1449	if (itemPtr->tagPtr[i] == tag) {
1453		itemPtr->tagPtr[i] = itemPtr->tagPtr[itemPtr->numTags-1];
	1450
	1451	/*
	1452	* Don't shuffle the tags sequence: memmove the tags.
	1453	*/
	1454
	1455	memmove((void *)(itemPtr->tagPtr + i),
	1456	itemPtr->tagPtr + i + 1,
	1457	(itemPtr->numTags - (i+1)) * sizeof(Tk_Uid));
1454	1458	itemPtr->numTags--;
1455		}
	1459
	1460	/*
	1461	* There must be no break here: all tags with the same name must
	1462	* be deleted.
	1463	*/
	1464
	1465	}
1456	1466	}
1457	1467	}
1458	1468	break;

1517	1527	}
1518	1528	break;
1519	1529	case CANV_ICURSOR: {
1520		int index;
1521	1530
1522	1531	if (objc != 4) {
1523	1532	Tcl_WrongNumArgs(interp, 2, objv, "tagOrId index");

1542	1551	break;
1543	1552	}
1544	1553	case CANV_INDEX: {
1545		int index;
1546	1554
1547	1555	if (objc != 4) {
1548	1556	Tcl_WrongNumArgs(interp, 2, objv, "tagOrId string");

1642	1650	}
1643	1651	break;
1644	1652	case CANV_LOWER: {
1645		Tk_Item *itemPtr;
1646	1653
1647	1654	if ((objc != 3) && (objc != 4)) {
1648	1655	Tcl_WrongNumArgs(interp, 2, objv, "tagOrId ?belowThis?");

1927	1934	break;
1928	1935	}
1929	1936	case CANV_SELECT: {
1930		int index, optionindex;
	1937	int optionindex;
1931	1938	static const char *const optionStrings[] = {
1932	1939	"adjust", "clear", "from", "item", "to", NULL
1933	1940	};

2399	2406	CanvasWorldChanged(
2400	2407	ClientData instanceData) /* Information about widget. */
2401	2408	{
2402		TkCanvas *canvasPtr = instanceData;
	2409	TkCanvas canvasPtr = (TkCanvas )instanceData;
2403	2410	Tk_Item *itemPtr;
2404	2411
2405	2412	itemPtr = canvasPtr->firstItemPtr;

2437	2444	DisplayCanvas(
2438	2445	ClientData clientData) /* Information about widget. */
2439	2446	{
2440		TkCanvas *canvasPtr = clientData;
	2447	TkCanvas canvasPtr = (TkCanvas )clientData;
2441	2448	Tk_Window tkwin = canvasPtr->tkwin;
2442	2449	Tk_Item *itemPtr;
2443	2450	Pixmap pixmap;

2691	2698	ClientData clientData, /* Information about window. */
2692	2699	XEvent eventPtr) / Information about event. */
2693	2700	{
2694		TkCanvas *canvasPtr = clientData;
	2701	TkCanvas canvasPtr = (TkCanvas )clientData;
2695	2702
2696	2703	if (eventPtr->type == Expose) {
2697	2704	int x, y;

2781	2788	CanvasCmdDeletedProc(
2782	2789	ClientData clientData) /* Pointer to widget record for widget. */
2783	2790	{
2784		TkCanvas *canvasPtr = clientData;
	2791	TkCanvas canvasPtr = (TkCanvas )clientData;
2785	2792	Tk_Window tkwin = canvasPtr->tkwin;
2786	2793
2787	2794	/*

3273	3280	static SearchUids *
3274	3281	GetStaticUids(void)
3275	3282	{
3276		SearchUids *searchUids =
	3283	SearchUids searchUids = (SearchUids )
3277	3284	Tcl_GetThreadData(&dataKey, sizeof(SearchUids));
3278	3285
3279	3286	if (searchUids->allUid == NULL) {

3312	3319	TagSearchExpr expr = exprPtrPtr;
3313	3320
3314	3321	if (expr == NULL) {
3315		expr = ckalloc(sizeof(TagSearchExpr));
	3322	expr = (TagSearchExpr *)ckalloc(sizeof(TagSearchExpr));
3316	3323	expr->allocated = 0;
3317	3324	expr->uids = NULL;
3318	3325	expr->next = NULL;

3393	3400	* Allocate primary search struct on first call.
3394	3401	*/
3395	3402
3396		*searchPtrPtr = searchPtr = ckalloc(sizeof(TagSearch));
	3403	searchPtrPtr = searchPtr = (TagSearch )ckalloc(sizeof(TagSearch));
3397	3404	searchPtr->expr = NULL;
3398	3405
3399	3406	/*

3401	3408	*/
3402	3409
3403	3410	searchPtr->rewritebufferAllocated = 100;
3404		searchPtr->rewritebuffer = ckalloc(searchPtr->rewritebufferAllocated);
	3411	searchPtr->rewritebuffer = (char *)ckalloc(searchPtr->rewritebufferAllocated);
3405	3412	}
3406	3413	TagSearchExprInit(&searchPtr->expr);
3407	3414

3418	3425	if ((unsigned) searchPtr->stringLength >=
3419	3426	searchPtr->rewritebufferAllocated) {
3420	3427	searchPtr->rewritebufferAllocated = searchPtr->stringLength + 100;
3421		searchPtr->rewritebuffer =
	3428	searchPtr->rewritebuffer = (char *)
3422	3429	ckrealloc(searchPtr->rewritebuffer,
3423	3430	searchPtr->rewritebufferAllocated);
3424	3431	}

3601	3608	if (expr->index >= expr->allocated-1) {
3602	3609	expr->allocated += 15;
3603	3610	if (expr->uids) {
3604		expr->uids = ckrealloc(expr->uids,
	3611	expr->uids = (Tk_Uid *)ckrealloc(expr->uids,
3605	3612	expr->allocated * sizeof(Tk_Uid));
3606	3613	} else {
3607		expr->uids = ckalloc(expr->allocated * sizeof(Tk_Uid));
	3614	expr->uids = (Tk_Uid )ckalloc(expr->allocated sizeof(Tk_Uid));
3608	3615	}
3609	3616	}
3610	3617

4014	4021	if ((itemPtr == NULL) \|\| (itemPtr->id != searchPtr->id)
4015	4022	\|\| (lastPtr == NULL) \|\| (lastPtr->nextPtr != itemPtr)) {
4016	4023	entryPtr = Tcl_FindHashEntry(&searchPtr->canvasPtr->idTable,
4017		(char *) INT2PTR(searchPtr->id));
	4024	INT2PTR(searchPtr->id));
4018	4025	if (entryPtr != NULL) {
4019		itemPtr = Tcl_GetHashValue(entryPtr);
	4026	itemPtr = (Tk_Item *)Tcl_GetHashValue(entryPtr);
4020	4027	lastPtr = itemPtr->prevPtr;
4021	4028	} else {
4022	4029	lastPtr = itemPtr = NULL;

4235	4242	Tk_Uid *newTagPtr;
4236	4243
4237	4244	itemPtr->tagSpace += 5;
4238		newTagPtr = ckalloc(itemPtr->tagSpace * sizeof(Tk_Uid));
	4245	newTagPtr = (Tk_Uid )ckalloc(itemPtr->tagSpace sizeof(Tk_Uid));
4239	4246	memcpy((void *) newTagPtr, itemPtr->tagPtr,
4240	4247	itemPtr->numTags * sizeof(Tk_Uid));
4241	4248	if (itemPtr->tagPtr != itemPtr->staticTagSpace) {

4745	4752	ClientData clientData, /* Pointer to canvas structure. */
4746	4753	XEvent eventPtr) / Pointer to X event that just happened. */
4747	4754	{
4748		TkCanvas *canvasPtr = clientData;
4749		unsigned long mask;
	4755	TkCanvas canvasPtr = (TkCanvas )clientData;
	4756	unsigned mask;
4750	4757
4751	4758	Tcl_Preserve(canvasPtr);
4752	4759

4842	4849	* ButtonRelease, or MotionNotify. */
4843	4850	{
4844	4851	double coords[2];
4845		unsigned long buttonDown;
	4852	unsigned int buttonDown;
4846	4853	Tk_Item *prevItemPtr;
4847	4854	#ifndef USE_OLD_TAG_SEARCH
4848	4855	SearchUids *searchUids = GetStaticUids();

4974	4981	if (itemPtr->tagPtr[i] == searchUids->currentUid)
4975	4982	#endif /* USE_OLD_TAG_SEARCH */
4976	4983	/* then */ {
4977		itemPtr->tagPtr[i] = itemPtr->tagPtr[itemPtr->numTags-1];
	4984	memmove((void *)(itemPtr->tagPtr + i),
	4985	itemPtr->tagPtr + i + 1,
	4986	(itemPtr->numTags - (i+1)) * sizeof(Tk_Uid));
4978	4987	itemPtr->numTags--;
4979	4988	break;
4980	4989	}

5107	5116	* processed. */
5108	5117	{
5109	5118	#define NUM_STATIC 3
5110		ClientData staticObjects[NUM_STATIC];
5111		ClientData *objectPtr;
	5119	void *staticObjects[NUM_STATIC];
	5120	void **objectPtr;
5112	5121	int numObjects, i;
5113	5122	Tk_Item *itemPtr;
5114	5123	#ifndef USE_OLD_TAG_SEARCH

5234	5243	CanvasBlinkProc(
5235	5244	ClientData clientData) /* Pointer to record describing entry. */
5236	5245	{
5237		TkCanvas *canvasPtr = clientData;
	5246	TkCanvas canvasPtr = (TkCanvas )clientData;
5238	5247
5239	5248	if (!canvasPtr->textInfo.gotFocus \|\| (canvasPtr->insertOffTime == 0)) {
5240	5249	return;

5390	5399	* not including terminating NULL
5391	5400	* character. */
5392	5401	{
5393		TkCanvas *canvasPtr = clientData;
	5402	TkCanvas canvasPtr = (TkCanvas )clientData;
5394	5403
5395	5404	return ItemSelection(canvasPtr, canvasPtr->textInfo.selItemPtr, offset,
5396	5405	buffer, maxBytes);

5418	5427	CanvasLostSelection(
5419	5428	ClientData clientData) /* Information about entry widget. */
5420	5429	{
5421		TkCanvas *canvasPtr = clientData;
	5430	TkCanvas canvasPtr = (TkCanvas )clientData;
5422	5431
5423	5432	EventuallyRedrawItem(canvasPtr, canvasPtr->textInfo.selItemPtr);
5424	5433	canvasPtr->textInfo.selItemPtr = NULL;

5540	5549	Tcl_DString buf;
5541	5550
5542	5551	/*
5543		* Save all the relevant values from the canvasPtr, because it might be
5544		* deleted as part of either of the two calls to Tcl_VarEval below.
	5552	* Preserve the relevant values from the canvasPtr, because it might be
	5553	* deleted as part of either of the two calls to Tcl_EvalEx below.
5545	5554	*/
5546	5555
5547	5556	interp = canvasPtr->interp;

5572	5581	Tcl_DStringAppend(&buf, xScrollCmd, -1);
5573	5582	Tcl_DStringAppend(&buf, " ", -1);
5574	5583	Tcl_DStringAppend(&buf, Tcl_GetString(fractions), -1);
5575		result = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), -1, 0);
	5584	result = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), -1, TCL_EVAL_GLOBAL);
5576	5585	Tcl_DStringFree(&buf);
5577	5586	Tcl_DecrRefCount(fractions);
5578	5587	if (result != TCL_OK) {

5590	5599	Tcl_DStringAppend(&buf, yScrollCmd, -1);
5591	5600	Tcl_DStringAppend(&buf, " ", -1);
5592	5601	Tcl_DStringAppend(&buf, Tcl_GetString(fractions), -1);
5593		result = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), -1, 0);
	5602	result = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), -1, TCL_EVAL_GLOBAL);
5594	5603	Tcl_DStringFree(&buf);
5595	5604	Tcl_DecrRefCount(fractions);
5596	5605	if (result != TCL_OK) {

5747	5756	*----------------------------------------------------------------------
5748	5757	*/
5749	5758
5750		/* ARGSUSED */
5751	5759	static const char **
5752	5760	TkGetStringsFromObjs(
5753	5761	int objc,
5754	5762	Tcl_Obj *const objv[])
5755	5763	{
5756		register int i;
	5764	int i;
5757	5765	const char **argv;
5758	5766
5759	5767	if (objc <= 0) {
5760	5768	return NULL;
5761	5769	}
5762		argv = ckalloc((objc+1) * sizeof(char *));
	5770	argv = (const char *)ckalloc((objc+1) sizeof(char *));
5763	5771	for (i = 0; i < objc; i++) {
5764	5772	argv[i] = Tcl_GetString(objv[i]);
5765	5773	}

+14

-14

generic/tkClipboard.c less more

55	55	char buffer, / Place to store converted selection. */
56	56	int maxBytes) /* Maximum # of bytes to store at buffer. */
57	57	{
58		TkClipboardTarget *targetPtr = clientData;
	58	TkClipboardTarget targetPtr = (TkClipboardTarget )clientData;
59	59	TkClipboardBuffer *cbPtr;
60	60	char srcPtr, destPtr;
61	61	size_t count = 0;

146	146	if (length > (size_t) maxBytes) {
147	147	length = maxBytes;
148	148	}
149		strncpy(buffer, p, length);
	149	memcpy(buffer, p, length);
	150	buffer[length] = 0;
150	151	return (int)length;
151	152	}
152	153

171	172
172	173	static int
173	174	ClipboardWindowHandler(
174		ClientData clientData, /* Not used. */
175		int offset, /* Return selection bytes starting at this
	175	TCL_UNUSED(void ), / Not used. */
	176	TCL_UNUSED(int), /* Return selection bytes starting at this
176	177	* offset. */
177	178	char buffer, / Place to store converted selection. */
178		int maxBytes) /* Maximum # of bytes to store at buffer. */
	179	TCL_UNUSED(int)) /* Maximum # of bytes to store at buffer. */
179	180	{
180	181	buffer[0] = '.';
181	182	buffer[1] = 0;

204	205	ClipboardLostSel(
205	206	ClientData clientData) /* Pointer to TkDisplay structure. */
206	207	{
207		TkDisplay *dispPtr = clientData;
	208	TkDisplay dispPtr = (TkDisplay )clientData;
208	209
209	210	dispPtr->clipboardActive = 0;
210	211	}

357	358	}
358	359	}
359	360	if (targetPtr == NULL) {
360		targetPtr = ckalloc(sizeof(TkClipboardTarget));
	361	targetPtr = (TkClipboardTarget *)ckalloc(sizeof(TkClipboardTarget));
361	362	targetPtr->type = type;
362	363	targetPtr->format = format;
363	364	targetPtr->firstBufferPtr = targetPtr->lastBufferPtr = NULL;

379	380	* Append a new buffer to the buffer chain.
380	381	*/
381	382
382		cbPtr = ckalloc(sizeof(TkClipboardBuffer));
	383	cbPtr = (TkClipboardBuffer *)ckalloc(sizeof(TkClipboardBuffer));
383	384	cbPtr->nextPtr = NULL;
384	385	if (targetPtr->lastBufferPtr != NULL) {
385	386	targetPtr->lastBufferPtr->nextPtr = cbPtr;

389	390	targetPtr->lastBufferPtr = cbPtr;
390	391
391	392	cbPtr->length = strlen(buffer);
392		cbPtr->buffer = ckalloc(cbPtr->length + 1);
	393	cbPtr->buffer = (char *)ckalloc(cbPtr->length + 1);
393	394	strcpy(cbPtr->buffer, buffer);
394	395
395	396	TkSelUpdateClipboard((TkWindow *) dispPtr->clipWindow, targetPtr);

421	422	int objc, /* Number of arguments. */
422	423	Tcl_Obj const objv[]) / Argument strings. */
423	424	{
424		Tk_Window tkwin = (Tk_Window) clientData;
	425	Tk_Window tkwin = (Tk_Window)clientData;
425	426	const char *path = NULL;
426	427	Atom selection;
427	428	static const char *const optionStrings[] = { "append", "clear", "get", NULL };

634	635
635	636	int
636	637	TkClipInit(
637		Tcl_Interp interp, / Interpreter to use for error reporting. */
638		register TkDisplay dispPtr)/ Display to initialize. */
	638	TCL_UNUSED(Tcl_Interp ), / Interpreter to use for error reporting. */
	639	TkDisplay dispPtr)/ Display to initialize. */
639	640	{
640	641	XSetWindowAttributes atts;
641	642

698	699	*--------------------------------------------------------------
699	700	*/
700	701
701		/* ARGSUSED */
702	702	static int
703	703	ClipboardGetProc(
704	704	ClientData clientData, /* Dynamic string holding partially assembled
705	705	* selection. */
706		Tcl_Interp interp, / Interpreter used for error reporting (not
	706	TCL_UNUSED(Tcl_Interp ), / Interpreter used for error reporting (not
707	707	* used). */
708	708	const char portion) / New information to be appended. */
709	709	{

+54

-45

generic/tkCmds.c less more

98	98	"-displayof", "-nice", NULL
99	99	};
100	100	enum options { TK_BELL_DISPLAYOF, TK_BELL_NICE };
101		Tk_Window tkwin = clientData;
	101	Tk_Window tkwin = (Tk_Window)clientData;
102	102	int i, index, nice = 0;
103	103	Tk_ErrorHandler handler;
104	104

162	162	int objc, /* Number of arguments. */
163	163	Tcl_Obj const objv[]) / Argument objects. */
164	164	{
165		Tk_Window tkwin = clientData;
	165	Tk_Window tkwin = (Tk_Window)clientData;
166	166	TkWindow *winPtr;
167	167	ClientData object;
168	168	const char *string;

186	186	}
187	187	object = (ClientData) winPtr->pathName;
188	188	} else {
189		winPtr = clientData;
	189	winPtr = (TkWindow *)clientData;
190	190	object = (ClientData) Tk_GetUid(string);
191	191	}
192	192

284	284	*/
285	285
286	286	if (winPtr->numTags > MAX_OBJS) {
287		objPtr = ckalloc(winPtr->numTags * sizeof(ClientData));
	287	objPtr = (void *)ckalloc(winPtr->numTags sizeof(void *));
288	288	}
289	289	for (i = 0; i < winPtr->numTags; i++) {
290		p = winPtr->tagPtr[i];
	290	p = (const char *)winPtr->tagPtr[i];
291	291	if (*p == '.') {
292	292	hPtr = Tcl_FindHashEntry(&winPtr->mainPtr->nameTable, p);
293	293	if (hPtr != NULL) {

346	346	int objc, /* Number of arguments. */
347	347	Tcl_Obj const objv[]) / Argument objects. */
348	348	{
349		Tk_Window tkwin = clientData;
	349	Tk_Window tkwin = (Tk_Window)clientData;
350	350	TkWindow winPtr, winPtr2;
351	351	int i, length;
352	352	const char *p;

398	398	}
399	399
400	400	winPtr->numTags = length;
401		winPtr->tagPtr = ckalloc(length * sizeof(ClientData));
	401	winPtr->tagPtr = (void *)ckalloc(length sizeof(void *));
402	402	for (i = 0; i < length; i++) {
403	403	p = Tcl_GetString(tags[i]);
404	404	if (p[0] == '.') {

411	411	* is one.
412	412	*/
413	413
414		copy = ckalloc(strlen(p) + 1);
	414	copy = (char *)ckalloc(strlen(p) + 1);
415	415	strcpy(copy, p);
416	416	winPtr->tagPtr[i] = (ClientData) copy;
417	417	} else {

447	447	const char *p;
448	448
449	449	for (i = 0; i < winPtr->numTags; i++) {
450		p = winPtr->tagPtr[i];
	450	p = (const char *)winPtr->tagPtr[i];
451	451	if (*p == '.') {
452	452	/*
453	453	* Names starting with "." are malloced rather than Uids, so they

487	487	Tcl_Obj const objv[]) / Argument objects. */
488	488	{
489	489	Tk_Window window;
490		Tk_Window tkwin = clientData;
	490	Tk_Window tkwin = (Tk_Window)clientData;
491	491	int i;
492	492
493	493	for (i = 1; i < objc; i++) {

526	526	*----------------------------------------------------------------------
527	527	*/
528	528
529		/* ARGSUSED */
530	529	int
531	530	Tk_LowerObjCmd(
532	531	ClientData clientData, /* Main window associated with interpreter. */

534	533	int objc, /* Number of arguments. */
535	534	Tcl_Obj const objv[]) / Argument objects. */
536	535	{
537		Tk_Window mainwin = clientData;
	536	Tk_Window mainwin = (Tk_Window)clientData;
538	537	Tk_Window tkwin, other;
539	538
540	539	if ((objc != 2) && (objc != 3)) {

586	585	*----------------------------------------------------------------------
587	586	*/
588	587
589		/* ARGSUSED */
590	588	int
591	589	Tk_RaiseObjCmd(
592	590	ClientData clientData, /* Main window associated with interpreter. */

594	592	int objc, /* Number of arguments. */
595	593	Tcl_Obj const objv[]) / Argument objects. */
596	594	{
597		Tk_Window mainwin = clientData;
	595	Tk_Window mainwin = (Tk_Window)clientData;
598	596	Tk_Window tkwin, other;
599	597
600	598	if ((objc != 2) && (objc != 3)) {

682	680	int objc, /* Number of arguments. */
683	681	Tcl_Obj const objv[]) / Argument objects. */
684	682	{
685		Tk_Window tkwin = clientData;
	683	Tk_Window tkwin = (Tk_Window)clientData;
686	684	TkWindow *winPtr;
687	685	const char *string;
688	686

714	712	int objc, /* Number of arguments. */
715	713	Tcl_Obj const objv[]) / Argument objects. */
716	714	{
717		Tk_Window tkwin = clientData;
	715	Tk_Window tkwin = (Tk_Window)clientData;
718	716	int index;
719	717	Tcl_Obj *objPtr;
720	718	TkCaret *caretPtr;

806	804	int objc, /* Number of arguments. */
807	805	Tcl_Obj const objv[]) / Argument objects. */
808	806	{
809		Tk_Window tkwin = clientData;
	807	Tk_Window tkwin = (Tk_Window)clientData;
810	808	Screen *screenPtr;
811	809	int skip, width, height;
812	810	double d;

857	855	int objc, /* Number of arguments. */
858	856	Tcl_Obj const objv[]) / Argument objects. */
859	857	{
860		Tk_Window tkwin = clientData;
	858	Tk_Window tkwin = (Tk_Window)clientData;
861	859	TkDisplay *dispPtr;
862	860	int skip;
863	861

905	903
906	904	int
907	905	WindowingsystemCmd(
908		ClientData clientData, /* Main window associated with interpreter. */
	906	TCL_UNUSED(void ), / Main window associated with interpreter. */
909	907	Tcl_Interp interp, / Current interpreter. */
910	908	int objc, /* Number of arguments. */
911	909	Tcl_Obj const objv[]) / Argument objects. */

934	932	int objc, /* Number of arguments. */
935	933	Tcl_Obj const objv[]) / Argument objects. */
936	934	{
937		Tk_Window tkwin = clientData;
	935	Tk_Window tkwin = (Tk_Window)clientData;
938	936	int skip = TkGetDisplayOf(interp, objc - 1, objv + 1, &tkwin);
939	937
940	938	if (skip < 0) {

990	988	*----------------------------------------------------------------------
991	989	*/
992	990
993		/* ARGSUSED */
994	991	int
995	992	Tk_TkwaitObjCmd(
996	993	ClientData clientData, /* Main window associated with interpreter. */

998	995	int objc, /* Number of arguments. */
999	996	Tcl_Obj const objv[]) / Argument objects. */
1000	997	{
1001		Tk_Window tkwin = clientData;
	998	Tk_Window tkwin = (Tk_Window)clientData;
1002	999	int done, index;
1003	1000	int code = TCL_OK;
1004	1001	static const char *const optionStrings[] = {

1119	1116	return code;
1120	1117	}
1121	1118
1122		/* ARGSUSED */
1123	1119	static char *
1124	1120	WaitVariableProc(
1125	1121	ClientData clientData, /* Pointer to integer to set to 1. */
1126		Tcl_Interp interp, / Interpreter containing variable. */
1127		const char name1, / Name of variable. */
1128		const char name2, / Second part of variable name. */
1129		int flags) /* Information about what happened. */
1130		{
1131		int *donePtr = clientData;
	1122	TCL_UNUSED(Tcl_Interp ), / Interpreter containing variable. */
	1123	TCL_UNUSED(const char ), / Name of variable. */
	1124	TCL_UNUSED(const char ), / Second part of variable name. */
	1125	TCL_UNUSED(int)) /* Information about what happened. */
	1126	{
	1127	int donePtr = (int )clientData;
1132	1128
1133	1129	*donePtr = 1;
1134	1130	return NULL;
1135	1131	}
1136	1132
1137		/ARGSUSED/
1138	1133	static void
1139	1134	WaitVisibilityProc(
1140	1135	ClientData clientData, /* Pointer to integer to set to 1. */
1141	1136	XEvent eventPtr) / Information about event (not used). */
1142	1137	{
1143		int *donePtr = clientData;
	1138	int donePtr = (int )clientData;
1144	1139
1145	1140	if (eventPtr->type == VisibilityNotify) {
1146	1141	*donePtr = 1;

1154	1149	ClientData clientData, /* Pointer to integer to set to 1. */
1155	1150	XEvent eventPtr) / Information about event. */
1156	1151	{
1157		int *donePtr = clientData;
	1152	int donePtr = (int )clientData;
1158	1153
1159	1154	if (eventPtr->type == DestroyNotify) {
1160	1155	*donePtr = 1;

1178	1173	*----------------------------------------------------------------------
1179	1174	*/
1180	1175
1181		/* ARGSUSED */
1182	1176	int
1183	1177	Tk_UpdateObjCmd(
1184		ClientData clientData, /* Main window associated with interpreter. */
	1178	TCL_UNUSED(void ), / Main window associated with interpreter. */
1185	1179	Tcl_Interp interp, / Current interpreter. */
1186	1180	int objc, /* Number of arguments. */
1187	1181	Tcl_Obj const objv[]) / Argument objects. */

1287	1281	int index, x, y, width, height, useX, useY, c_class, skip;
1288	1282	const char *string;
1289	1283	TkWindow *winPtr;
1290		Tk_Window tkwin = clientData;
	1284	Tk_Window tkwin = (Tk_Window)clientData;
1291	1285
1292	1286	static const TkStateMap visualMap[] = {
1293	1287	{PseudoColor, "pseudocolor"},

1578	1572	objv += skip;
1579	1573	string = Tcl_GetString(objv[2]);
1580	1574	Tcl_SetObjResult(interp,
1581		Tcl_NewLongObj((long) Tk_InternAtom(tkwin, string)));
	1575	Tcl_NewWideIntObj(Tk_InternAtom(tkwin, string)));
1582	1576	break;
1583	1577	case WIN_ATOMNAME: {
1584	1578	const char *name;
1585		long id;
	1579	Tcl_WideInt id;
1586	1580
1587	1581	skip = TkGetDisplayOf(interp, objc - 2, objv + 2, &tkwin);
1588	1582	if (skip < 0) {

1593	1587	return TCL_ERROR;
1594	1588	}
1595	1589	objv += skip;
1596		if (Tcl_GetLongFromObj(interp, objv[2], &id) != TCL_OK) {
	1590	if (Tcl_GetWideIntFromObj(interp, objv[2], &id) != TCL_OK) {
1597	1591	return TCL_ERROR;
1598	1592	}
1599	1593	name = Tk_GetAtomName(tkwin, (Atom) id);

1747	1741	if (TkGetWindowFromObj(interp, tkwin, objv[2], &tkwin) != TCL_OK) {
1748	1742	return TCL_ERROR;
1749	1743	}
	1744	#ifdef TK_HAS_DYNAMIC_COLORS
	1745
	1746	/*
	1747	* Make sure that the TkColor used for the winfo rgb command is
	1748	* destroyed when we are through with it, so we do not get stale RGB
	1749	* values next time.
	1750	*/
	1751
	1752	{
	1753	Colormap temp = Tk_Colormap(tkwin);
	1754	Tk_Colormap(tkwin) = TK_DYNAMIC_COLORMAP;
	1755	colorPtr = Tk_GetColor(interp, tkwin, Tcl_GetString(objv[3]));
	1756	Tk_Colormap(tkwin) = temp;
	1757	}
	1758	#else
1750	1759	colorPtr = Tk_GetColor(interp, tkwin, Tcl_GetString(objv[3]));
	1760	#endif
1751	1761	if (colorPtr == NULL) {
1752	1762	return TCL_ERROR;
1753	1763	}

1757	1767	break;
1758	1768	}
1759	1769	case WIN_VISUALSAVAILABLE: {
1760		XVisualInfo template, *visInfoPtr;
	1770	XVisualInfo templ, *visInfoPtr;
1761	1771	int count, i;
1762	1772	int includeVisualId;
1763	1773	Tcl_Obj strPtr, resultPtr;

1778	1788	return TCL_ERROR;
1779	1789	}
1780	1790
1781		template.screen = Tk_ScreenNumber(tkwin);
	1791	templ.screen = Tk_ScreenNumber(tkwin);
1782	1792	visInfoPtr = XGetVisualInfo(Tk_Display(tkwin), VisualScreenMask,
1783		&template, &count);
	1793	&templ, &count);
1784	1794	if (visInfoPtr == NULL) {
1785	1795	Tcl_SetObjResult(interp, Tcl_NewStringObj(
1786	1796	"can't find any visuals for screen", -1));

2077	2087	}
2078	2088	string = Tcl_GetStringFromObj(objv[0], &length);
2079	2089	if ((length >= 2) &&
2080		(strncmp(string, "-displayof", (unsigned) length) == 0)) {
	2090	(strncmp(string, "-displayof", length) == 0)) {
2081	2091	if (objc < 2) {
2082	2092	Tcl_SetObjResult(interp, Tcl_NewStringObj(
2083	2093	"value for \"-displayof\" missing", -1));

2111	2121	*----------------------------------------------------------------------
2112	2122	*/
2113	2123
2114		/* ARGSUSED */
2115	2124	int
2116	2125	TkDeadAppObjCmd(
2117		ClientData clientData, /* Dummy. */
	2126	TCL_UNUSED(void *),
2118	2127	Tcl_Interp interp, / Current interpreter. */
2119		int objc, /* Number of arguments. */
	2128	TCL_UNUSED(int), /* Number of arguments. */
2120	2129	Tcl_Obj const objv[]) / Argument strings. */
2121	2130	{
2122	2131	Tcl_SetObjResult(interp, Tcl_ObjPrintf(

+42

-40

generic/tkConfig.c less more

66	66	* monochrome displays. */
67	67	struct TkOption *synonymPtr;
68	68	/* For synonym options, this points to the
69		* master entry. */
	69	* original entry. */
70	70	const struct Tk_ObjCustomOption *custom;
71	71	/* For TK_OPTION_CUSTOM. */
72	72	} extra;

177	177	const Tk_OptionSpec specPtr, specPtr2;
178	178	Option *optionPtr;
179	179	int numOptions, i;
180		ThreadSpecificData *tsdPtr =
	180	ThreadSpecificData tsdPtr = (ThreadSpecificData )
181	181	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
182	182
183	183	/*

201	201	hashEntryPtr = Tcl_CreateHashEntry(&tsdPtr->hashTable, (char *) templatePtr,
202	202	&newEntry);
203	203	if (!newEntry) {
204		tablePtr = Tcl_GetHashValue(hashEntryPtr);
	204	tablePtr = (OptionTable *)Tcl_GetHashValue(hashEntryPtr);
205	205	tablePtr->refCount++;
206	206	return (Tk_OptionTable) tablePtr;
207	207	}

215	215	for (specPtr = templatePtr; specPtr->type != TK_OPTION_END; specPtr++) {
216	216	numOptions++;
217	217	}
218		tablePtr = ckalloc(sizeof(OptionTable) + (numOptions * sizeof(Option)));
	218	tablePtr = (OptionTable )ckalloc(sizeof(OptionTable) + (numOptions sizeof(Option)));
219	219	tablePtr->refCount = 1;
220	220	tablePtr->hashEntryPtr = hashEntryPtr;
221	221	tablePtr->nextPtr = NULL;

236	236
237	237	if (specPtr->type == TK_OPTION_SYNONYM) {
238	238	/*
239		* This is a synonym option; find the master option that it refers
240		* to and create a pointer from the synonym to the master.
	239	* This is a synonym option; find the original option that it refers
	240	* to and create a pointer from the synonym to the origin.
241	241	*/
242	242
243	243	for (specPtr2 = templatePtr, i = 0; ; specPtr2++, i++) {

265	265	\|\| (specPtr->type == TK_OPTION_BORDER))
266	266	&& (specPtr->clientData != NULL)) {
267	267	optionPtr->extra.monoColorPtr =
268		Tcl_NewStringObj(specPtr->clientData, -1);
	268	Tcl_NewStringObj((const char *)specPtr->clientData, -1);
269	269	Tcl_IncrRefCount(optionPtr->extra.monoColorPtr);
270	270	}
271	271

274	274	* Get the custom parsing, etc., functions.
275	275	*/
276	276
277		optionPtr->extra.custom = specPtr->clientData;
	277	optionPtr->extra.custom = (const Tk_ObjCustomOption *)specPtr->clientData;
278	278	}
279	279	}
280	280	if (((specPtr->type == TK_OPTION_STRING)

299	299
300	300	if (specPtr->clientData != NULL) {
301	301	tablePtr->nextPtr = (OptionTable *)
302		Tk_CreateOptionTable(interp, specPtr->clientData);
	302	Tk_CreateOptionTable(interp, (Tk_OptionSpec *)specPtr->clientData);
303	303	}
304	304
305	305	return (Tk_OptionTable) tablePtr;

331	331	Option *optionPtr;
332	332	int count;
333	333
334		tablePtr->refCount--;
335		if (tablePtr->refCount > 0) {
	334	if (tablePtr->refCount-- > 1) {
336	335	return;
337	336	}
338	337

677	676	case TK_OPTION_STRING_TABLE: {
678	677	int newValue;
679	678
680		if (Tcl_GetIndexFromObjStruct(interp, valuePtr,
681		optionPtr->specPtr->clientData, sizeof(char *),
682		optionPtr->specPtr->optionName+1, 0, &newValue) != TCL_OK) {
683		return TCL_ERROR;
684		}
	679	if (nullOK && ObjectIsEmpty(valuePtr)) {
	680	valuePtr = NULL;
	681	newValue = -1;
	682	} else {
	683	if (Tcl_GetIndexFromObjStruct(interp, valuePtr,
	684	optionPtr->specPtr->clientData, sizeof(char *),
	685	optionPtr->specPtr->optionName+1, 0, &newValue) != TCL_OK) {
	686	return TCL_ERROR;
	687	}
	688	}
685	689	if (internalPtr != NULL) {
686	690	((int ) oldInternalPtr) = ((int ) internalPtr);
687	691	((int ) internalPtr) = newValue;

1160	1164
1161	1165	static void
1162	1166	FreeOptionInternalRep(
1163		register Tcl_Obj objPtr) / Object whose internal rep to free. */
	1167	Tcl_Obj objPtr) / Object whose internal rep to free. */
1164	1168	{
1165		register Tk_OptionTable tablePtr = (Tk_OptionTable) objPtr->internalRep.twoPtrValue.ptr1;
	1169	Tk_OptionTable tablePtr = (Tk_OptionTable) objPtr->internalRep.twoPtrValue.ptr1;
1166	1170
1167	1171	Tk_DeleteOptionTable(tablePtr);
1168	1172	objPtr->typePtr = NULL;

1186	1190	Tcl_Obj srcObjPtr, / The object we are copying from. */
1187	1191	Tcl_Obj dupObjPtr) / The object we are copying to. */
1188	1192	{
1189		register OptionTable tablePtr = (OptionTable ) srcObjPtr->internalRep.twoPtrValue.ptr1;
	1193	OptionTable tablePtr = (OptionTable ) srcObjPtr->internalRep.twoPtrValue.ptr1;
1190	1194	tablePtr->refCount++;
1191	1195	dupObjPtr->typePtr = srcObjPtr->typePtr;
1192	1196	dupObjPtr->internalRep = srcObjPtr->internalRep;

1283	1287	* more space.
1284	1288	*/
1285	1289
1286		newSavePtr = ckalloc(sizeof(Tk_SavedOptions));
	1290	newSavePtr = (Tk_SavedOptions *)ckalloc(sizeof(Tk_SavedOptions));
1287	1291	newSavePtr->recordPtr = recordPtr;
1288	1292	newSavePtr->tkwin = tkwin;
1289	1293	newSavePtr->numItems = 0;

1494	1498	Tk_FreeSavedOptions(savePtr->nextPtr);
1495	1499	ckfree(savePtr->nextPtr);
1496	1500	}
1497		for (count = savePtr->numItems,
1498		savedOptionPtr = &savePtr->items[savePtr->numItems-1];
1499		count > 0; count--, savedOptionPtr--) {
	1501	for (count = savePtr->numItems; count > 0; count--) {
	1502	savedOptionPtr = &savePtr->items[count-1];
1500	1503	if (savedOptionPtr->optionPtr->flags & OPTION_NEEDS_FREEING) {
1501	1504	FreeResources(savedOptionPtr->optionPtr, savedOptionPtr->valuePtr,
1502	1505	(char *) &savedOptionPtr->internalForm, savePtr->tkwin);

1524	1527	*----------------------------------------------------------------------
1525	1528	*/
1526	1529
1527		/* ARGSUSED */
1528	1530	void
1529	1531	Tk_FreeConfigOptions(
1530	1532	char recordPtr, / Record whose fields contain current values

1876	1878	objPtr = NULL;
1877	1879	switch (optionPtr->specPtr->type) {
1878	1880	case TK_OPTION_BOOLEAN:
1879		objPtr = Tcl_NewIntObj(((int ) internalPtr));
	1881	objPtr = Tcl_NewIntObj(((int )internalPtr));
1880	1882	break;
1881	1883	case TK_OPTION_INT:
1882		objPtr = Tcl_NewIntObj(((int ) internalPtr));
	1884	objPtr = Tcl_NewIntObj(((int )internalPtr));
1883	1885	break;
1884	1886	case TK_OPTION_DOUBLE:
1885		objPtr = Tcl_NewDoubleObj(((double ) internalPtr));
	1887	objPtr = Tcl_NewDoubleObj(((double )internalPtr));
1886	1888	break;
1887	1889	case TK_OPTION_STRING:
1888		objPtr = Tcl_NewStringObj(((char *) internalPtr), -1);
	1890	objPtr = Tcl_NewStringObj(((char *)internalPtr), -1);
1889	1891	break;
1890	1892	case TK_OPTION_STRING_TABLE:
1891	1893	objPtr = Tcl_NewStringObj(((char **) optionPtr->specPtr->clientData)[
1892	1894	((int ) internalPtr)], -1);
1893	1895	break;
1894	1896	case TK_OPTION_COLOR: {
1895		XColor colorPtr = ((XColor **) internalPtr);
	1897	XColor colorPtr = ((XColor **)internalPtr);
1896	1898
1897	1899	if (colorPtr != NULL) {
1898	1900	objPtr = Tcl_NewStringObj(Tk_NameOfColor(colorPtr), -1);

1900	1902	break;
1901	1903	}
1902	1904	case TK_OPTION_FONT: {
1903		Tk_Font tkfont = ((Tk_Font ) internalPtr);
	1905	Tk_Font tkfont = ((Tk_Font )internalPtr);
1904	1906
1905	1907	if (tkfont != NULL) {
1906	1908	objPtr = Tcl_NewStringObj(Tk_NameOfFont(tkfont), -1);

1908	1910	break;
1909	1911	}
1910	1912	case TK_OPTION_STYLE: {
1911		Tk_Style style = ((Tk_Style ) internalPtr);
	1913	Tk_Style style = ((Tk_Style )internalPtr);
1912	1914
1913	1915	if (style != NULL) {
1914	1916	objPtr = Tcl_NewStringObj(Tk_NameOfStyle(style), -1);

1916	1918	break;
1917	1919	}
1918	1920	case TK_OPTION_BITMAP: {
1919		Pixmap pixmap = ((Pixmap ) internalPtr);
	1921	Pixmap pixmap = ((Pixmap )internalPtr);
1920	1922
1921	1923	if (pixmap != None) {
1922	1924	objPtr = Tcl_NewStringObj(

1925	1927	break;
1926	1928	}
1927	1929	case TK_OPTION_BORDER: {
1928		Tk_3DBorder border = ((Tk_3DBorder ) internalPtr);
	1930	Tk_3DBorder border = ((Tk_3DBorder )internalPtr);
1929	1931
1930	1932	if (border != NULL) {
1931	1933	objPtr = Tcl_NewStringObj(Tk_NameOf3DBorder(border), -1);

1933	1935	break;
1934	1936	}
1935	1937	case TK_OPTION_RELIEF:
1936		objPtr = Tcl_NewStringObj(Tk_NameOfRelief(((int ) internalPtr)), -1);
	1938	objPtr = Tcl_NewStringObj(Tk_NameOfRelief(((int )internalPtr)), -1);
1937	1939	break;
1938	1940	case TK_OPTION_CURSOR: {
1939		Tk_Cursor cursor = ((Tk_Cursor ) internalPtr);
	1941	Tk_Cursor cursor = ((Tk_Cursor )internalPtr);
1940	1942
1941	1943	if (cursor != NULL) {
1942	1944	objPtr = Tcl_NewStringObj(

1946	1948	}
1947	1949	case TK_OPTION_JUSTIFY:
1948	1950	objPtr = Tcl_NewStringObj(Tk_NameOfJustify(
1949		((Tk_Justify ) internalPtr)), -1);
	1951	((Tk_Justify )internalPtr)), -1);
1950	1952	break;
1951	1953	case TK_OPTION_ANCHOR:
1952	1954	objPtr = Tcl_NewStringObj(Tk_NameOfAnchor(
1953	1955	((Tk_Anchor ) internalPtr)), -1);
1954	1956	break;
1955	1957	case TK_OPTION_PIXELS:
1956		objPtr = Tcl_NewIntObj(((int ) internalPtr));
	1958	objPtr = Tcl_NewIntObj(((int )internalPtr));
1957	1959	break;
1958	1960	case TK_OPTION_WINDOW: {
1959		Tk_Window tkwin = ((Tk_Window ) internalPtr);
	1961	tkwin = ((Tk_Window )internalPtr);
1960	1962
1961	1963	if (tkwin != NULL) {
1962	1964	objPtr = Tcl_NewStringObj(Tk_PathName(tkwin), -1);

2063	2065
2064	2066	Tcl_Obj *
2065	2067	TkDebugConfig(
2066		Tcl_Interp interp, / Interpreter in which the table is
	2068	TCL_UNUSED(Tcl_Interp ), / Interpreter in which the table is
2067	2069	* defined. */
2068	2070	Tk_OptionTable table) /* Table about which information is to be
2069	2071	* returned. May not necessarily exist in the

2073	2075	Tcl_HashEntry *hashEntryPtr;
2074	2076	Tcl_HashSearch search;
2075	2077	Tcl_Obj *objPtr;
2076		ThreadSpecificData *tsdPtr =
	2078	ThreadSpecificData tsdPtr = (ThreadSpecificData )
2077	2079	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
2078	2080
2079	2081	objPtr = Tcl_NewObj();

+50

-41

generic/tkConsole.c less more

43	43	*/
44	44
45	45	static int ConsoleClose(ClientData instanceData, Tcl_Interp *interp);
	46	static int Console2Close(ClientData instanceData, Tcl_Interp *interp, int flags);
46	47	static void ConsoleDeleteProc(ClientData clientData);
47	48	static void ConsoleEventProc(ClientData clientData, XEvent *eventPtr);
48	49	static int ConsoleHandle(ClientData instanceData, int direction,

65	66
66	67	static const Tcl_ChannelType consoleChannelType = {
67	68	"console", /* Type name. */
68		TCL_CHANNEL_VERSION_4, /* v4 channel */
	69	TCL_CHANNEL_VERSION_5, /* v5 channel */
69	70	ConsoleClose, /* Close proc. */
70	71	ConsoleInput, /* Input proc. */
71	72	ConsoleOutput, /* Output proc. */

74	75	NULL, /* Get option proc. */
75	76	ConsoleWatch, /* Watch for events on console. */
76	77	ConsoleHandle, /* Get a handle from the device. */
77		NULL, /* close2proc. */
	78	Console2Close, /* close2proc. */
78	79	NULL, /* Always non-blocking.*/
79	80	NULL, /* flush proc. */
80	81	NULL, /* handler proc. */

226	227	return;
227	228	}
228	229
229		consoleInitPtr = Tcl_GetThreadData(&consoleInitKey, (int) sizeof(int));
	230	consoleInitPtr = (int *)Tcl_GetThreadData(&consoleInitKey, (int) sizeof(int));
230	231	if (*consoleInitPtr) {
231	232	/*
232	233	* We've already initialized console channels in this thread.

254	255	* interp for it to live in.
255	256	*/
256	257
257		info = ckalloc(sizeof(ConsoleInfo));
	258	info = (ConsoleInfo *) ckalloc(sizeof(ConsoleInfo));
258	259	info->consoleInterp = NULL;
259	260	info->interp = NULL;
260	261	info->refCount = 0;
261	262
262	263	if (doIn) {
263		ChannelData *data = ckalloc(sizeof(ChannelData));
	264	ChannelData data = (ChannelData )ckalloc(sizeof(ChannelData));
264	265
265	266	data->info = info;
266	267	data->info->refCount++;

277	278	}
278	279
279	280	if (doOut) {
280		ChannelData *data = ckalloc(sizeof(ChannelData));
	281	ChannelData data = (ChannelData )ckalloc(sizeof(ChannelData));
281	282
282	283	data->info = info;
283	284	data->info->refCount++;

294	295	}
295	296
296	297	if (doErr) {
297		ChannelData *data = ckalloc(sizeof(ChannelData));
	298	ChannelData data = (ChannelData )ckalloc(sizeof(ChannelData));
298	299
299	300	data->info = info;
300	301	data->info->refCount++;

376	377	* New ConsoleInfo for a new console window.
377	378	*/
378	379
379		info = ckalloc(sizeof(ConsoleInfo));
	380	info = (ConsoleInfo *)ckalloc(sizeof(ConsoleInfo));
380	381	info->refCount = 0;
381	382
382	383	/*

406	407	}
407	408	}
408	409	} else {
409		info = ckalloc(sizeof(ConsoleInfo));
	410	info = (ConsoleInfo *)ckalloc(sizeof(ConsoleInfo));
410	411	info->refCount = 0;
411	412	}
412	413

455	456	if (mainWindow) {
456	457	Tk_DeleteEventHandler(mainWindow, StructureNotifyMask,
457	458	ConsoleEventProc, info);
458		if (--info->refCount <= 0) {
	459	if (info->refCount-- <= 1) {
459	460	ckfree(info);
460	461	}
461	462	}

496	497	int toWrite, /* How many bytes to write? */
497	498	int errorCode) / Where to store error code. */
498	499	{
499		ChannelData *data = instanceData;
	500	ChannelData data = (ChannelData )instanceData;
500	501	ConsoleInfo *info = data->info;
501	502
502	503	*errorCode = 0;

557	558	*----------------------------------------------------------------------
558	559	*/
559	560
560		/* ARGSUSED */
561	561	static int
562	562	ConsoleInput(
563		ClientData instanceData, /* Unused. */
564		char buf, / Where to store data read. */
565		int bufSize, /* How much space is available in the
	563	TCL_UNUSED(void *),
	564	TCL_UNUSED(char ), / Where to store data read. */
	565	TCL_UNUSED(int), /* How much space is available in the
566	566	* buffer? */
567		int errorCode) / Where to store error code. */
	567	TCL_UNUSED(int )) / Where to store error code. */
568	568	{
569	569	return 0; /* Always return EOF. */
570	570	}

572	572	/*
573	573	*----------------------------------------------------------------------
574	574	*
575		* ConsoleClose --
	575	* ConsoleClose/Console2Close --
576	576	*
577	577	* Closes the IO channel.
578	578	*

585	585	*----------------------------------------------------------------------
586	586	*/
587	587
588		/* ARGSUSED */
589	588	static int
590	589	ConsoleClose(
591		ClientData instanceData, /* Unused. */
592		Tcl_Interp interp) / Unused. */
593		{
594		ChannelData *data = instanceData;
	590	ClientData instanceData,
	591	TCL_UNUSED(Tcl_Interp *))
	592	{
	593	ChannelData data = (ChannelData )instanceData;
595	594	ConsoleInfo *info = data->info;
596	595
597	596	if (info) {
598		if (--info->refCount <= 0) {
	597	if (info->refCount-- <= 1) {
599	598	/*
600	599	* Assuming the Tcl_Interp * fields must already be NULL.
601	600	*/

606	605	ckfree(data);
607	606	return 0;
608	607	}
	608
	609	static int
	610	Console2Close(
	611	ClientData instanceData, /* Unused. */
	612	Tcl_Interp interp, / Unused. */
	613	int flags)
	614	{
	615	if ((flags&(TCL_CLOSE_READ\|TCL_CLOSE_WRITE))==0) {
	616	return ConsoleClose(instanceData, interp);
	617	}
	618	return EINVAL;
	619	}
609	620
610	621	/*
611	622	*----------------------------------------------------------------------

625	636	*----------------------------------------------------------------------
626	637	*/
627	638
628		/* ARGSUSED */
629	639	static void
630	640	ConsoleWatch(
631		ClientData instanceData, /* Device ID for the channel. */
632		int mask) /* OR-ed combination of TCL_READABLE,
	641	TCL_UNUSED(void ), / Device ID for the channel. */
	642	TCL_UNUSED(int)) /* OR-ed combination of TCL_READABLE,
633	643	* TCL_WRITABLE and TCL_EXCEPTION, for the
634	644	* events we are interested in. */
635	645	{

652	662	*----------------------------------------------------------------------
653	663	*/
654	664
655		/* ARGSUSED */
656	665	static int
657	666	ConsoleHandle(
658		ClientData instanceData, /* Device ID for the channel. */
659		int direction, /* TCL_READABLE or TCL_WRITABLE to indicate
	667	TCL_UNUSED(void ), / Device ID for the channel. */
	668	TCL_UNUSED(int), /* TCL_READABLE or TCL_WRITABLE to indicate
660	669	* which direction of the channel is being
661	670	* requested. */
662		ClientData handlePtr) / Where to store handle */
	671	TCL_UNUSED(void *)) / Where to store handle */
663	672	{
664	673	return TCL_ERROR;
665	674	}

693	702	"eval", "hide", "show", "title", NULL};
694	703	enum option {CON_EVAL, CON_HIDE, CON_SHOW, CON_TITLE};
695	704	Tcl_Obj *cmd = NULL;
696		ConsoleInfo *info = clientData;
	705	ConsoleInfo info = (ConsoleInfo )clientData;
697	706	Tcl_Interp *consoleInterp = info->consoleInterp;
698	707
699	708	if (objc < 2) {

783	792	int index, result = TCL_OK;
784	793	static const char *const options[] = {"eval", "record", NULL};
785	794	enum option {OTHER_EVAL, OTHER_RECORD};
786		ConsoleInfo *info = clientData;
	795	ConsoleInfo info = (ConsoleInfo )clientData;
787	796	Tcl_Interp *otherInterp = info->interp;
788	797
789	798	if (objc < 2) {

802	811
803	812	if ((otherInterp == NULL) \|\| Tcl_InterpDeleted(otherInterp)) {
804	813	Tcl_SetObjResult(interp, Tcl_NewStringObj(
805		"no active master interp", -1));
	814	"no active parent interp", -1));
806	815	Tcl_SetErrorCode(interp, "TK", "CONSOLE", "NO_INTERP", NULL);
807	816	return TCL_ERROR;
808	817	}

851	860	DeleteConsoleInterp(
852	861	ClientData clientData)
853	862	{
854		Tcl_Interp *interp = clientData;
	863	Tcl_Interp interp = (Tcl_Interp )clientData;
855	864
856	865	Tcl_DeleteInterp(interp);
857	866	}

878	887	ClientData clientData,
879	888	Tcl_Interp *interp)
880	889	{
881		ConsoleInfo *info = clientData;
	890	ConsoleInfo info = (ConsoleInfo )clientData;
882	891
883	892	if (info->consoleInterp == interp) {
884	893	Tcl_DeleteThreadExitHandler(DeleteConsoleInterp, info->consoleInterp);
885	894	info->consoleInterp = NULL;
886	895	}
887		if (--info->refCount <= 0) {
	896	if (info->refCount-- <= 1) {
888	897	ckfree(info);
889	898	}
890	899	}

910	919	ConsoleDeleteProc(
911	920	ClientData clientData)
912	921	{
913		ConsoleInfo *info = clientData;
	922	ConsoleInfo info = (ConsoleInfo )clientData;
914	923
915	924	if (info->consoleInterp) {
916	925	Tcl_DeleteInterp(info->consoleInterp);
917	926	}
918		if (--info->refCount <= 0) {
	927	if (info->refCount-- <= 1) {
919	928	ckfree(info);
920	929	}
921	930	}

925	934	*
926	935	* ConsoleEventProc --
927	936	*
928		* This event function is registered on the main window of the slave
	937	* This event function is registered on the main window of the child
929	938	* interpreter. If the user or a running script causes the main window to
930	939	* be destroyed, then we need to inform the console interpreter by
931	940	* invoking "::tk::ConsoleExit".

945	954	XEvent *eventPtr)
946	955	{
947	956	if (eventPtr->type == DestroyNotify) {
948		ConsoleInfo *info = clientData;
	957	ConsoleInfo info = (ConsoleInfo )clientData;
949	958	Tcl_Interp *consoleInterp = info->consoleInterp;
950	959
951	960	if (consoleInterp && !Tcl_InterpDeleted(consoleInterp)) {
952	961	Tcl_EvalEx(consoleInterp, "tk::ConsoleExit", -1, TCL_EVAL_GLOBAL);
953	962	}
954	963
955		if (--info->refCount <= 0) {
	964	if (info->refCount-- <= 1) {
956	965	ckfree(info);
957	966	}
958	967	}

+36

-10

generic/tkDecls.h less more

401	401	/* 116 */
402	402	EXTERN Tk_Window Tk_IdToWindow(Display *display, Window window);
403	403	/* 117 */
404		EXTERN void Tk_ImageChanged(Tk_ImageMaster master, int x, int y,
	404	EXTERN void Tk_ImageChanged(Tk_ImageMaster model, int x, int y,
405	405	int width, int height, int imageWidth,
406	406	int imageHeight);
407	407	/* 118 */

412	412	EXTERN int Tk_IntersectTextLayout(Tk_TextLayout layout, int x,
413	413	int y, int width, int height);
414	414	/* 121 */
415		EXTERN void Tk_MaintainGeometry(Tk_Window slave,
416		Tk_Window master, int x, int y, int width,
	415	EXTERN void Tk_MaintainGeometry(Tk_Window window,
	416	Tk_Window container, int x, int y, int width,
417	417	int height);
418	418	/* 122 */
419	419	EXTERN Tk_Window Tk_MainWindow(Tcl_Interp *interp);

452	452	/* 136 */
453	453	EXTERN CONST84_RETURN char * Tk_NameOfFont(Tk_Font font);
454	454	/* 137 */
455		EXTERN CONST84_RETURN char * Tk_NameOfImage(Tk_ImageMaster imageMaster);
	455	EXTERN CONST84_RETURN char * Tk_NameOfImage(Tk_ImageMaster model);
456	456	/* 138 */
457	457	EXTERN CONST84_RETURN char * Tk_NameOfJoinStyle(int join);
458	458	/* 139 */

581	581	/* 180 */
582	582	EXTERN void Tk_Ungrab(Tk_Window tkwin);
583	583	/* 181 */
584		EXTERN void Tk_UnmaintainGeometry(Tk_Window slave,
585		Tk_Window master);
	584	EXTERN void Tk_UnmaintainGeometry(Tk_Window window,
	585	Tk_Window container);
586	586	/* 182 */
587	587	EXTERN void Tk_UnmapWindow(Tk_Window tkwin);
588	588	/* 183 */

863	863	/* 273 */
864	864	EXTERN void Tk_CreateOldPhotoImageFormat(
865	865	const Tk_PhotoImageFormat *formatPtr);
	866	/* Slot 274 is reserved */
	867	/* Slot 275 is reserved */
	868	/* Slot 276 is reserved */
	869	/* Slot 277 is reserved */
	870	/* Slot 278 is reserved */
	871	/* Slot 279 is reserved */
	872	/* 280 */
	873	EXTERN void TkUnusedStubEntry(void);
866	874
867	875	typedef struct {
868	876	const struct TkPlatStubs *tkPlatStubs;

992	1000	int (tk_Grab) (Tcl_Interp interp, Tk_Window tkwin, int grabGlobal); /* 114 */
993	1001	void (tk_HandleEvent) (XEvent eventPtr); /* 115 */
994	1002	Tk_Window (tk_IdToWindow) (Display display, Window window); /* 116 */
995		void (tk_ImageChanged) (Tk_ImageMaster master, int x, int y, int width, int height, int imageWidth, int imageHeight); / 117 */
	1003	void (tk_ImageChanged) (Tk_ImageMaster model, int x, int y, int width, int height, int imageWidth, int imageHeight); / 117 */
996	1004	int (tk_Init) (Tcl_Interp interp); /* 118 */
997	1005	Atom (tk_InternAtom) (Tk_Window tkwin, const char name); /* 119 */
998	1006	int (tk_IntersectTextLayout) (Tk_TextLayout layout, int x, int y, int width, int height); / 120 */
999		void (tk_MaintainGeometry) (Tk_Window slave, Tk_Window master, int x, int y, int width, int height); / 121 */
	1007	void (tk_MaintainGeometry) (Tk_Window window, Tk_Window container, int x, int y, int width, int height); / 121 */
1000	1008	Tk_Window (tk_MainWindow) (Tcl_Interp interp); /* 122 */
1001	1009	void (tk_MakeWindowExist) (Tk_Window tkwin); / 123 */
1002	1010	void (tk_ManageGeometry) (Tk_Window tkwin, const Tk_GeomMgr mgrPtr, ClientData clientData); /* 124 */

1012	1020	CONST84_RETURN char * (tk_NameOfColor) (XColor colorPtr); /* 134 */
1013	1021	CONST84_RETURN char * (tk_NameOfCursor) (Display display, Tk_Cursor cursor); /* 135 */
1014	1022	CONST84_RETURN char * (tk_NameOfFont) (Tk_Font font); / 136 */
1015		CONST84_RETURN char * (tk_NameOfImage) (Tk_ImageMaster imageMaster); / 137 */
	1023	CONST84_RETURN char * (tk_NameOfImage) (Tk_ImageMaster model); / 137 */
1016	1024	CONST84_RETURN char * (tk_NameOfJoinStyle) (int join); / 138 */
1017	1025	CONST84_RETURN char * (tk_NameOfJustify) (Tk_Justify justify); / 139 */
1018	1026	CONST84_RETURN char * (tk_NameOfRelief) (int relief); / 140 */

1056	1064	void (tk_UnderlineChars) (Display display, Drawable drawable, GC gc, Tk_Font tkfont, const char source, int x, int y, int firstByte, int lastByte); / 178 */
1057	1065	void (tk_UnderlineTextLayout) (Display display, Drawable drawable, GC gc, Tk_TextLayout layout, int x, int y, int underline); /* 179 */
1058	1066	void (tk_Ungrab) (Tk_Window tkwin); / 180 */
1059		void (tk_UnmaintainGeometry) (Tk_Window slave, Tk_Window master); / 181 */
	1067	void (tk_UnmaintainGeometry) (Tk_Window window, Tk_Window container); / 181 */
1060	1068	void (tk_UnmapWindow) (Tk_Window tkwin); / 182 */
1061	1069	void (tk_UnsetGrid) (Tk_Window tkwin); / 183 */
1062	1070	void (tk_UpdatePointer) (Tk_Window tkwin, int x, int y, int state); / 184 */

1149	1157	Tcl_Interp * (tk_Interp) (Tk_Window tkwin); / 271 */
1150	1158	void (tk_CreateOldImageType) (const Tk_ImageType typePtr); /* 272 */
1151	1159	void (tk_CreateOldPhotoImageFormat) (const Tk_PhotoImageFormat formatPtr); /* 273 */
	1160	void (*reserved274)(void);
	1161	void (*reserved275)(void);
	1162	void (*reserved276)(void);
	1163	void (*reserved277)(void);
	1164	void (*reserved278)(void);
	1165	void (*reserved279)(void);
	1166	void (tkUnusedStubEntry) (void); / 280 */
1152	1167	} TkStubs;
1153	1168
1154	1169	extern const TkStubs *tkStubsPtr;

1709	1724	(tkStubsPtr->tk_CreateOldImageType) /* 272 */
1710	1725	#define Tk_CreateOldPhotoImageFormat \
1711	1726	(tkStubsPtr->tk_CreateOldPhotoImageFormat) /* 273 */
	1727	/* Slot 274 is reserved */
	1728	/* Slot 275 is reserved */
	1729	/* Slot 276 is reserved */
	1730	/* Slot 277 is reserved */
	1731	/* Slot 278 is reserved */
	1732	/* Slot 279 is reserved */
	1733	#define TkUnusedStubEntry \
	1734	(tkStubsPtr->tkUnusedStubEntry) /* 280 */
1712	1735
1713	1736	#endif /* defined(USE_TK_STUBS) */
1714	1737

1719	1742	#undef Tk_Init
1720	1743	#undef Tk_SafeInit
1721	1744	#undef Tk_CreateConsoleWindow
	1745	#define Tk_GetImageModelData Tk_GetImageMasterData
1722	1746
1723	1747	#if defined(_WIN32) && defined(UNICODE)
1724	1748	# define Tk_MainEx Tk_MainExW

1729	1753	#undef TCL_STORAGE_CLASS
1730	1754	#define TCL_STORAGE_CLASS DLLIMPORT
1731	1755
	1756	#undef TkUnusedStubEntry
	1757
1732	1758	#endif /* _TKDECLS */

+77

-57

generic/tkEntry.c less more

190	190	NULL, 0, -1, 0, "-background", 0},
191	191	{TK_OPTION_PIXELS, "-borderwidth", "borderWidth", "BorderWidth",
192	192	DEF_ENTRY_BORDER_WIDTH, -1, Tk_Offset(Entry, borderWidth), 0, 0, 0},
193		{TK_OPTION_BORDER, "-buttonbackground", "Button.background", "Background",
	193	{TK_OPTION_BORDER, "-buttonbackground", "buttonBackground", "Background",
194	194	DEF_BUTTON_BG_COLOR, -1, Tk_Offset(Spinbox, buttonBorder),
195	195	0, DEF_BUTTON_BG_MONO, 0},
196		{TK_OPTION_CURSOR, "-buttoncursor", "Button.cursor", "Cursor",
	196	{TK_OPTION_CURSOR, "-buttoncursor", "buttonCursor", "Cursor",
197	197	DEF_BUTTON_CURSOR, -1, Tk_Offset(Spinbox, bCursor),
198	198	TK_OPTION_NULL_OK, 0, 0},
199		{TK_OPTION_RELIEF, "-buttondownrelief", "Button.relief", "Relief",
	199	{TK_OPTION_RELIEF, "-buttondownrelief", "buttonDownRelief", "Relief",
200	200	DEF_BUTTON_RELIEF, -1, Tk_Offset(Spinbox, bdRelief), 0, 0, 0},
201		{TK_OPTION_RELIEF, "-buttonuprelief", "Button.relief", "Relief",
	201	{TK_OPTION_RELIEF, "-buttonuprelief", "buttonUpRelief", "Relief",
202	202	DEF_BUTTON_RELIEF, -1, Tk_Offset(Spinbox, buRelief), 0, 0, 0},
203	203	{TK_OPTION_STRING, "-command", "command", "Command",
204	204	DEF_SPINBOX_CMD, -1, Tk_Offset(Spinbox, command),

425	425	Tcl_Obj *const objv[]);
426	426	static void EntryWorldChanged(ClientData instanceData);
427	427	static int GetEntryIndex(Tcl_Interp interp, Entry entryPtr,
428		const char string, int indexPtr);
	428	Tcl_Obj indexObj, int indexPtr);
429	429	static int InsertChars(Entry entryPtr, int index, const char string);
430	430
431	431	/*

617	617	Tcl_WrongNumArgs(interp, 2, objv, "index");
618	618	goto error;
619	619	}
620		if (GetEntryIndex(interp, entryPtr, Tcl_GetString(objv[2]),
	620	if (GetEntryIndex(interp, entryPtr, objv[2],
621	621	&index) != TCL_OK) {
622	622	goto error;
623	623	}

669	669	Tcl_WrongNumArgs(interp, 2, objv, "firstIndex ?lastIndex?");
670	670	goto error;
671	671	}
672		if (GetEntryIndex(interp, entryPtr, Tcl_GetString(objv[2]),
	672	if (GetEntryIndex(interp, entryPtr, objv[2],
673	673	&first) != TCL_OK) {
674	674	goto error;
675	675	}
676	676	if (objc == 3) {
677	677	last = first + 1;
678		} else if (GetEntryIndex(interp, entryPtr, Tcl_GetString(objv[3]),
	678	} else if (GetEntryIndex(interp, entryPtr, objv[3],
679	679	&last) != TCL_OK) {
680	680	goto error;
681	681	}

701	701	Tcl_WrongNumArgs(interp, 2, objv, "pos");
702	702	goto error;
703	703	}
704		if (GetEntryIndex(interp, entryPtr, Tcl_GetString(objv[2]),
	704	if (GetEntryIndex(interp, entryPtr, objv[2],
705	705	&entryPtr->insertPos) != TCL_OK) {
706	706	goto error;
707	707	}

715	715	Tcl_WrongNumArgs(interp, 2, objv, "string");
716	716	goto error;
717	717	}
718		if (GetEntryIndex(interp, entryPtr, Tcl_GetString(objv[2]),
	718	if (GetEntryIndex(interp, entryPtr, objv[2],
719	719	&index) != TCL_OK) {
720	720	goto error;
721	721	}

730	730	Tcl_WrongNumArgs(interp, 2, objv, "index text");
731	731	goto error;
732	732	}
733		if (GetEntryIndex(interp, entryPtr, Tcl_GetString(objv[2]),
	733	if (GetEntryIndex(interp, entryPtr, objv[2],
734	734	&index) != TCL_OK) {
735	735	goto error;
736	736	}

810	810	goto error;
811	811	}
812	812	if (GetEntryIndex(interp, entryPtr,
813		Tcl_GetString(objv[3]), &index) != TCL_OK) {
	813	objv[3], &index) != TCL_OK) {
814	814	goto error;
815	815	}
816	816	if (entryPtr->selectFirst >= 0) {

850	850	goto error;
851	851	}
852	852	if (GetEntryIndex(interp, entryPtr,
853		Tcl_GetString(objv[3]), &index) != TCL_OK) {
	853	objv[3], &index) != TCL_OK) {
854	854	goto error;
855	855	}
856	856	entryPtr->selectAnchor = index;

870	870	Tcl_WrongNumArgs(interp, 3, objv, "start end");
871	871	goto error;
872	872	}
873		if (GetEntryIndex(interp, entryPtr, Tcl_GetString(objv[3]),
	873	if (GetEntryIndex(interp, entryPtr, objv[3],
874	874	&index) != TCL_OK) {
875	875	goto error;
876	876	}
877		if (GetEntryIndex(interp, entryPtr, Tcl_GetString(objv[4]),
	877	if (GetEntryIndex(interp, entryPtr, objv[4],
878	878	&index2) != TCL_OK) {
879	879	goto error;
880	880	}

901	901	goto error;
902	902	}
903	903	if (GetEntryIndex(interp, entryPtr,
904		Tcl_GetString(objv[3]), &index) != TCL_OK) {
	904	objv[3], &index) != TCL_OK) {
905	905	goto error;
906	906	}
907	907	EntrySelectTo(entryPtr, index);

941	941	Tcl_SetObjResult(interp, Tcl_NewListObj(2, span));
942	942	goto done;
943	943	} else if (objc == 3) {
944		if (GetEntryIndex(interp, entryPtr, Tcl_GetString(objv[2]),
	944	if (GetEntryIndex(interp, entryPtr, objv[2],
945	945	&index) != TCL_OK) {
946	946	goto error;
947	947	}

1726	1726	}
1727	1727	}
1728	1728
1729		/*
1730		* Draw the text in two pieces: first the unselected portion, then the
1731		* selected portion on top of it.
1732		*/
1733
1734		Tk_DrawTextLayout(entryPtr->display, pixmap, entryPtr->textGC,
1735		entryPtr->textLayout, entryPtr->layoutX, entryPtr->layoutY,
1736		entryPtr->leftIndex, entryPtr->numChars);
1737
1738	1729	if (showSelection && (entryPtr->state != STATE_DISABLED)
1739	1730	&& (entryPtr->selTextGC != entryPtr->textGC)
1740	1731	&& (entryPtr->selectFirst < entryPtr->selectLast)) {
	1732
	1733	/*
	1734	* Draw the selected and unselected portions separately.
	1735	*/
	1736
1741	1737	int selFirst;
1742	1738
1743	1739	if (entryPtr->selectFirst < entryPtr->leftIndex) {

1745	1741	} else {
1746	1742	selFirst = entryPtr->selectFirst;
1747	1743	}
	1744	if (entryPtr->leftIndex < selFirst) {
	1745	Tk_DrawTextLayout(entryPtr->display, pixmap, entryPtr->textGC,
	1746	entryPtr->textLayout, entryPtr->layoutX, entryPtr->layoutY,
	1747	entryPtr->leftIndex, selFirst);
	1748	}
1748	1749	Tk_DrawTextLayout(entryPtr->display, pixmap, entryPtr->selTextGC,
1749	1750	entryPtr->textLayout, entryPtr->layoutX, entryPtr->layoutY,
1750	1751	selFirst, entryPtr->selectLast);
	1752	if (entryPtr->selectLast < entryPtr->numChars) {
	1753	Tk_DrawTextLayout(entryPtr->display, pixmap, entryPtr->textGC,
	1754	entryPtr->textLayout, entryPtr->layoutX, entryPtr->layoutY,
	1755	entryPtr->selectLast, entryPtr->numChars);
	1756	}
	1757	} else {
	1758
	1759	/*
	1760	* Draw the entire visible text
	1761	*/
	1762
	1763	Tk_DrawTextLayout(entryPtr->display, pixmap, entryPtr->textGC,
	1764	entryPtr->textLayout, entryPtr->layoutX, entryPtr->layoutY,
	1765	entryPtr->leftIndex, entryPtr->numChars);
1751	1766	}
1752	1767
1753	1768	if (entryPtr->type == TK_SPINBOX) {

2048	2063	char *newStr;
2049	2064
2050	2065	string = entryPtr->string;
2051		byteIndex = Tcl_UtfAtIndex(string, index) - string;
	2066	byteIndex = TkUtfAtIndex(string, index) - string;
2052	2067	byteCount = strlen(value);
2053	2068	if (byteCount == 0) {
2054	2069	return TCL_OK;

2072	2087	entryPtr->string = newStr;
2073	2088
2074	2089	/*
	2090	* ??? Is this construction still needed with Tcl_NumUtfChars ???
	2091	*
2075	2092	* The following construction is used because inserting improperly formed
2076	2093	* UTF-8 sequences between other improperly formed UTF-8 sequences could
2077	2094	* result in actually forming valid UTF-8 sequences; the number of

2152	2169	}
2153	2170
2154	2171	string = entryPtr->string;
2155		byteIndex = Tcl_UtfAtIndex(string, index) - string;
2156		byteCount = Tcl_UtfAtIndex(string + byteIndex, count) - (string+byteIndex);
	2172	byteIndex = TkUtfAtIndex(string, index) - string;
	2173	byteCount = TkUtfAtIndex(string + byteIndex, count) - (string+byteIndex);
2157	2174
2158	2175	newByteCount = entryPtr->numBytes + 1 - byteCount;
2159	2176	newStr = ckalloc(newByteCount);

2555	2572	Tcl_Interp interp, / For error messages. */
2556	2573	Entry entryPtr, / Entry for which the index is being
2557	2574	* specified. */
2558		const char string, / Specifies character in entryPtr. */
	2575	Tcl_Obj indexObj, / Specifies character in entryPtr. */
2559	2576	int indexPtr) / Where to store converted character index */
2560	2577	{
2561		size_t length;
2562
2563		length = strlen(string);
	2578	const char *string = Tcl_GetString(indexObj);
	2579	size_t length = indexObj->length;
2564	2580
2565	2581	switch (string[0]) {
2566	2582	case 'a':

2635	2651	break;
2636	2652	}
2637	2653	default:
2638		if (Tcl_GetInt(NULL, string, indexPtr) != TCL_OK) {
	2654	if (Tcl_GetIntFromObj(NULL, indexObj, indexPtr) != TCL_OK) {
2639	2655	goto badIndex;
2640	2656	}
2641	2657	if (*indexPtr < 0){

2815	2831	return -1;
2816	2832	}
2817	2833	string = entryPtr->displayString;
2818		selStart = Tcl_UtfAtIndex(string, entryPtr->selectFirst);
2819		selEnd = Tcl_UtfAtIndex(selStart,
	2834	selStart = TkUtfAtIndex(string, entryPtr->selectFirst);
	2835	selEnd = TkUtfAtIndex(selStart,
2820	2836	entryPtr->selectLast - entryPtr->selectFirst);
2821	2837	byteCount = selEnd - selStart - offset;
2822	2838	if (byteCount > maxBytes) {

3005	3021	Tcl_DStringAppend(&buf, firstStr, -1);
3006	3022	Tcl_DStringAppend(&buf, " ", -1);
3007	3023	Tcl_DStringAppend(&buf, lastStr, -1);
3008		code = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), -1, 0);
	3024	code = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), -1, TCL_EVAL_GLOBAL);
3009	3025	Tcl_DStringFree(&buf);
3010	3026	if (code != TCL_OK) {
3011	3027	Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf(

3222	3238	* string). */
3223	3239	{
3224	3240	register Tcl_Interp *interp = entryPtr->interp;
3225		int code, bool;
	3241	int code, isOK;
3226	3242
3227	3243	code = Tcl_EvalEx(interp, cmd, -1, TCL_EVAL_GLOBAL \| TCL_EVAL_DIRECT);
3228	3244

3244	3260	*/
3245	3261
3246	3262	if (Tcl_GetBooleanFromObj(interp, Tcl_GetObjResult(interp),
3247		&bool) != TCL_OK) {
	3263	&isOK) != TCL_OK) {
3248	3264	Tcl_AddErrorInfo(interp,
3249	3265	"\n (invalid boolean result from validation command)");
3250	3266	Tcl_BackgroundException(interp, TCL_ERROR);

3253	3269	}
3254	3270
3255	3271	Tcl_ResetResult(interp);
3256		return (bool ? TCL_OK : TCL_BREAK);
	3272	return (isOK ? TCL_OK : TCL_BREAK);
3257	3273	}
3258	3274
3259	3275	/*

3266	3282	*
3267	3283	* Results:
3268	3284	* TCL_OK if the validatecommand accepts the new string, TCL_ERROR if any
3269		* problems occured with validatecommand.
	3285	* problems occurred with validatecommand.
3270	3286	*
3271	3287	* Side effects:
3272	3288	* The insertion/deletion may be aborted, and the validatecommand might

3291	3307
3292	3308	if (entryPtr->validateCmd == NULL \|\|
3293	3309	entryPtr->validate == VALIDATE_NONE) {
	3310	if (entryPtr->flags & VALIDATING) {
	3311	entryPtr->flags \|= VALIDATE_ABORT;
	3312	}
3294	3313	return (varValidate ? TCL_ERROR : TCL_OK);
3295	3314	}
3296	3315
3297	3316	/*
3298		* If we're already validating, then we're hitting a loop condition Return
3299		* and set validate to 0 to disallow further validations and prevent
3300		* current validation from finishing
	3317	* If we're already validating, then we're hitting a loop condition. Set
	3318	* validate to none to disallow further validations, arrange for flags
	3319	* to prevent current validation from finishing, and return.
3301	3320	*/
3302	3321
3303	3322	if (entryPtr->flags & VALIDATING) {
3304	3323	entryPtr->validate = VALIDATE_NONE;
	3324	entryPtr->flags \|= VALIDATE_ABORT;
3305	3325	return (varValidate ? TCL_ERROR : TCL_OK);
3306	3326	}
3307	3327

3323	3343	/*
3324	3344	* If e->validate has become VALIDATE_NONE during the validation, or we
3325	3345	* now have VALIDATE_VAR set (from EntrySetValue) and didn't before, it
3326		* means that a loop condition almost occured. Do not allow this
	3346	* means that a loop condition almost occurred. Do not allow this
3327	3347	* validation result to finish.
3328	3348	*/
3329	3349

3748	3768	Tcl_WrongNumArgs(interp, 2, objv, "index");
3749	3769	goto error;
3750	3770	}
3751		if (GetEntryIndex(interp, entryPtr, Tcl_GetString(objv[2]),
	3771	if (GetEntryIndex(interp, entryPtr, objv[2],
3752	3772	&index) != TCL_OK) {
3753	3773	goto error;
3754	3774	}

3799	3819	Tcl_WrongNumArgs(interp, 2, objv, "firstIndex ?lastIndex?");
3800	3820	goto error;
3801	3821	}
3802		if (GetEntryIndex(interp, entryPtr, Tcl_GetString(objv[2]),
	3822	if (GetEntryIndex(interp, entryPtr, objv[2],
3803	3823	&first) != TCL_OK) {
3804	3824	goto error;
3805	3825	}
3806	3826	if (objc == 3) {
3807	3827	last = first + 1;
3808	3828	} else {
3809		if (GetEntryIndex(interp, entryPtr, Tcl_GetString(objv[3]),
	3829	if (GetEntryIndex(interp, entryPtr, objv[3],
3810	3830	&last) != TCL_OK) {
3811	3831	goto error;
3812	3832	}

3833	3853	Tcl_WrongNumArgs(interp, 2, objv, "pos");
3834	3854	goto error;
3835	3855	}
3836		if (GetEntryIndex(interp, entryPtr, Tcl_GetString(objv[2]),
	3856	if (GetEntryIndex(interp, entryPtr, objv[2],
3837	3857	&entryPtr->insertPos) != TCL_OK) {
3838	3858	goto error;
3839	3859	}

3866	3886	Tcl_WrongNumArgs(interp, 2, objv, "string");
3867	3887	goto error;
3868	3888	}
3869		if (GetEntryIndex(interp, entryPtr, Tcl_GetString(objv[2]),
	3889	if (GetEntryIndex(interp, entryPtr, objv[2],
3870	3890	&index) != TCL_OK) {
3871	3891	goto error;
3872	3892	}

3881	3901	Tcl_WrongNumArgs(interp, 2, objv, "index text");
3882	3902	goto error;
3883	3903	}
3884		if (GetEntryIndex(interp, entryPtr, Tcl_GetString(objv[2]),
	3904	if (GetEntryIndex(interp, entryPtr, objv[2],
3885	3905	&index) != TCL_OK) {
3886	3906	goto error;
3887	3907	}

3978	3998	goto error;
3979	3999	}
3980	4000	if (GetEntryIndex(interp, entryPtr,
3981		Tcl_GetString(objv[3]), &index) != TCL_OK) {
	4001	objv[3], &index) != TCL_OK) {
3982	4002	goto error;
3983	4003	}
3984	4004	if (entryPtr->selectFirst >= 0) {

4018	4038	goto error;
4019	4039	}
4020	4040	if (GetEntryIndex(interp, entryPtr,
4021		Tcl_GetString(objv[3]), &index) != TCL_OK) {
	4041	objv[3], &index) != TCL_OK) {
4022	4042	goto error;
4023	4043	}
4024	4044	entryPtr->selectAnchor = index;

4039	4059	goto error;
4040	4060	}
4041	4061	if (GetEntryIndex(interp, entryPtr,
4042		Tcl_GetString(objv[3]), &index) != TCL_OK) {
	4062	objv[3], &index) != TCL_OK) {
4043	4063	goto error;
4044	4064	}
4045	4065	if (GetEntryIndex(interp, entryPtr,
4046		Tcl_GetString(objv[4]),& index2) != TCL_OK) {
	4066	objv[4],& index2) != TCL_OK) {
4047	4067	goto error;
4048	4068	}
4049	4069	if (index >= index2) {

4069	4089	goto error;
4070	4090	}
4071	4091	if (GetEntryIndex(interp, entryPtr,
4072		Tcl_GetString(objv[3]), &index) != TCL_OK) {
	4092	objv[3], &index) != TCL_OK) {
4073	4093	goto error;
4074	4094	}
4075	4095	EntrySelectTo(entryPtr, index);

4149	4169	Tcl_SetObjResult(interp, Tcl_NewListObj(2, span));
4150	4170	goto done;
4151	4171	} else if (objc == 3) {
4152		if (GetEntryIndex(interp, entryPtr, Tcl_GetString(objv[2]),
	4172	if (GetEntryIndex(interp, entryPtr, objv[2],
4153	4173	&index) != TCL_OK) {
4154	4174	goto error;
4155	4175	}

+88

-58

generic/tkEvent.c less more

72	72	* Array of event masks corresponding to each X event:
73	73	*/
74	74
75		static const unsigned long realEventMasks[MappingNotify+1] = {
	75	static const unsigned long eventMasks[TK_LASTEVENT] = {
76	76	0,
77	77	0,
78	78	KeyPressMask, /* KeyPress */

110	110	0, /* SelectionNotify */
111	111	ColormapChangeMask, /* ColormapNotify */
112	112	0, /* ClientMessage */
113		0 /* Mapping Notify */
114		};
115
116		static const unsigned long virtualEventMasks[TK_LASTEVENT-VirtualEvent] = {
	113	0, /* Mapping Notify */
117	114	VirtualEventMask, /* VirtualEvents */
118	115	ActivateMask, /* ActivateNotify */
119	116	ActivateMask, /* DeactivateNotify */

451	448	{
452	449	unsigned long mask;
453	450
454		/*
455		* Get the event mask from the correct table. Note that there are two
456		* tables here because that means we no longer need this code to rely on
457		* the exact value of VirtualEvent, which has caused us problems in the
458		* past when X11 changed the value of LASTEvent. [Bug ???]
459		*/
460
461		if (eventPtr->xany.type <= MappingNotify) {
462		mask = realEventMasks[eventPtr->xany.type];
463		} else if (eventPtr->xany.type >= VirtualEvent
464		&& eventPtr->xany.type<TK_LASTEVENT) {
465		mask = virtualEventMasks[eventPtr->xany.type - VirtualEvent];
	451	if (eventPtr->xany.type <TK_LASTEVENT) {
	452	mask = eventMasks[eventPtr->xany.type];
466	453	} else {
467	454	mask = 0;
468	455	}

534	521	*----------------------------------------------------------------------
535	522	*/
536	523
537		static const unsigned long buttonMasks[] = {
	524	static const unsigned buttonMasks[] = {
538	525	0, Button1Mask, Button2Mask, Button3Mask, Button4Mask, Button5Mask
539	526	};
540	527
541		unsigned long
	528	unsigned
542	529	TkGetButtonMask(
543		unsigned int button)
	530	unsigned button)
544	531	{
545	532	return (button > Button5) ? 0 : buttonMasks[button];
546	533	}

697	684	Tk_EventProc proc, / Function to call for each selected event */
698	685	ClientData clientData) /* Arbitrary data to pass to proc. */
699	686	{
700		register TkEventHandler *handlerPtr;
701		register TkWindow winPtr = (TkWindow ) token;
	687	TkEventHandler *handlerPtr;
	688	TkWindow winPtr = (TkWindow )token;
702	689
703	690	/*
704	691	* Skim through the list of existing handlers to (a) compute the overall

713	700	* No event handlers defined at all, so must create.
714	701	*/
715	702
716		handlerPtr = ckalloc(sizeof(TkEventHandler));
	703	handlerPtr = (TkEventHandler *)ckalloc(sizeof(TkEventHandler));
717	704	winPtr->handlerList = handlerPtr;
718	705	} else {
719	706	int found = 0;

744	731	* No event handler matched, so create a new one.
745	732	*/
746	733
747		handlerPtr->nextPtr = ckalloc(sizeof(TkEventHandler));
	734	handlerPtr->nextPtr = (TkEventHandler *)ckalloc(sizeof(TkEventHandler));
748	735	handlerPtr = handlerPtr->nextPtr;
749	736	}
750	737

787	774	Tk_EventProc *proc,
788	775	ClientData clientData)
789	776	{
790		register TkEventHandler *handlerPtr;
791		register InProgress *ipPtr;
	777	TkEventHandler *handlerPtr;
	778	InProgress *ipPtr;
792	779	TkEventHandler *prevPtr;
793		register TkWindow winPtr = (TkWindow ) token;
794		ThreadSpecificData *tsdPtr =
	780	TkWindow winPtr = (TkWindow ) token;
	781	ThreadSpecificData tsdPtr = (ThreadSpecificData )
795	782	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
796	783
797	784	/*

863	850	ClientData clientData) /* One-word value to pass to proc. */
864	851	{
865	852	GenericHandler *handlerPtr;
866		ThreadSpecificData *tsdPtr =
	853	ThreadSpecificData tsdPtr = (ThreadSpecificData )
867	854	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
868	855
869		handlerPtr = ckalloc(sizeof(GenericHandler));
	856	handlerPtr = (GenericHandler *)ckalloc(sizeof(GenericHandler));
870	857
871	858	handlerPtr->proc = proc;
872	859	handlerPtr->clientData = clientData;

904	891	ClientData clientData)
905	892	{
906	893	GenericHandler * handler;
907		ThreadSpecificData *tsdPtr =
	894	ThreadSpecificData tsdPtr = (ThreadSpecificData )
908	895	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
909	896
910	897	for (handler=tsdPtr->genericList ; handler ; handler=handler->nextPtr) {

937	924	Tk_ClientMessageProc proc) / Function to call on event. */
938	925	{
939	926	GenericHandler *handlerPtr;
940		ThreadSpecificData *tsdPtr =
	927	ThreadSpecificData tsdPtr = (ThreadSpecificData )
941	928	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
942	929
943	930	/*

945	932	* with an extra clientData field we'll never use.
946	933	*/
947	934
948		handlerPtr = ckalloc(sizeof(GenericHandler));
	935	handlerPtr = (GenericHandler *)ckalloc(sizeof(GenericHandler));
949	936
950	937	handlerPtr->proc = (Tk_GenericProc *) proc;
951	938	handlerPtr->clientData = NULL; /* never used */

983	970	Tk_ClientMessageProc *proc)
984	971	{
985	972	GenericHandler * handler;
986		ThreadSpecificData *tsdPtr =
	973	ThreadSpecificData tsdPtr = (ThreadSpecificData )
987	974	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
988	975
989	976	for (handler=tsdPtr->cmList ; handler!=NULL ; handler=handler->nextPtr) {

1014	1001	void
1015	1002	TkEventInit(void)
1016	1003	{
1017		ThreadSpecificData *tsdPtr =
	1004	ThreadSpecificData tsdPtr = (ThreadSpecificData )
1018	1005	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
1019	1006
1020	1007	tsdPtr->handlersActive = 0;

1047	1034	static int
1048	1035	TkXErrorHandler(
1049	1036	ClientData clientData, /* Pointer to flag we set. */
1050		XErrorEvent errEventPtr) / X error info. */
1051		{
1052		int *error = clientData;
	1037	TCL_UNUSED(XErrorEvent )) / X error info. */
	1038	{
	1039	int error = (int )clientData;
1053	1040
1054	1041	*error = 1;
1055	1042	return 0;

1136	1123	Tk_HandleEvent(
1137	1124	XEvent eventPtr) / Event to dispatch. */
1138	1125	{
1139		register TkEventHandler *handlerPtr;
	1126	TkEventHandler *handlerPtr;
1140	1127	TkWindow *winPtr;
1141	1128	unsigned long mask;
1142	1129	InProgress ip;
1143	1130	Tcl_Interp *interp = NULL;
1144		ThreadSpecificData *tsdPtr =
	1131	ThreadSpecificData tsdPtr = (ThreadSpecificData )
1145	1132	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
1146	1133
1147	1134	#if !defined(MAC_OSX_TK) && !defined(_WIN32)

1349	1336	TkWindow winPtr) / Information about the window that is being
1350	1337	* deleted. */
1351	1338	{
1352		register TkEventHandler *handlerPtr;
1353		register InProgress *ipPtr;
1354		ThreadSpecificData *tsdPtr =
	1339	TkEventHandler *handlerPtr;
	1340	InProgress *ipPtr;
	1341	ThreadSpecificData tsdPtr = (ThreadSpecificData )
1355	1342	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
1356	1343
1357	1344	/*

1399	1386	TkCurrentTime(
1400	1387	TkDisplay dispPtr) / Display for which the time is desired. */
1401	1388	{
1402		register XEvent *eventPtr;
1403		ThreadSpecificData *tsdPtr =
	1389	XEvent *eventPtr;
	1390	ThreadSpecificData tsdPtr = (ThreadSpecificData )
1404	1391	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
1405	1392
1406	1393	if (tsdPtr->pendingPtr == NULL) {

1454	1441	* argument. */
1455	1442	{
1456	1443	Tk_RestrictProc *prev;
1457		ThreadSpecificData *tsdPtr =
	1444	ThreadSpecificData tsdPtr = (ThreadSpecificData )
1458	1445	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
1459	1446
1460	1447	prev = tsdPtr->restrictProc;

1547	1534	*/
1548	1535
1549	1536	if (!(dispPtr->flags & TK_DISPLAY_COLLAPSE_MOTION_EVENTS)) {
1550		wevPtr = ckalloc(sizeof(TkWindowEvent));
	1537	wevPtr = (TkWindowEvent *)ckalloc(sizeof(TkWindowEvent));
1551	1538	wevPtr->header.proc = WindowEventProc;
1552	1539	wevPtr->event = *eventPtr;
1553	1540	Tcl_QueueEvent(&wevPtr->header, position);

1579	1566	}
1580	1567	}
1581	1568
1582		wevPtr = ckalloc(sizeof(TkWindowEvent));
	1569	wevPtr = (TkWindowEvent *)ckalloc(sizeof(TkWindowEvent));
1583	1570	wevPtr->header.proc = WindowEventProc;
1584	1571	wevPtr->event = *eventPtr;
1585	1572	if ((eventPtr->type == MotionNotify) && (position == TCL_QUEUE_TAIL)) {

1642	1629	/*
1643	1630	*----------------------------------------------------------------------
1644	1631	*
	1632	* TkGenerateActivateEvents --
	1633	*
	1634	* This function is called by the Mac and Windows window manager routines
	1635	* when a toplevel window is activated or deactivated.
	1636	* Activate/Deactivate events will be sent to every subwindow of the
	1637	* toplevel followed by a FocusIn/FocusOut message.
	1638	*
	1639	* Results:
	1640	* None.
	1641	*
	1642	* Side effects:
	1643	* Generates X events.
	1644	*
	1645	*----------------------------------------------------------------------
	1646	*/
	1647
	1648	void
	1649	TkGenerateActivateEvents(
	1650	TkWindow winPtr, / Toplevel to activate. */
	1651	int active) /* Non-zero if the window is being activated,
	1652	* else 0.*/
	1653	{
	1654	XEvent event;
	1655
	1656	/*
	1657	* Generate Activate and Deactivate events. This event is sent to every
	1658	* subwindow in a toplevel window.
	1659	*/
	1660
	1661	event.xany.serial = NextRequest(winPtr->display);
	1662	event.xany.send_event = False;
	1663	event.xany.display = winPtr->display;
	1664	event.xany.window = winPtr->window;
	1665
	1666	event.xany.type = active ? ActivateNotify : DeactivateNotify;
	1667	TkQueueEventForAllChildren(winPtr, &event);
	1668	}
	1669
	1670	/*
	1671	*----------------------------------------------------------------------
	1672	*
1645	1673	* WindowEventProc --
1646	1674	*
1647	1675	* This function is called by Tcl_DoOneEvent when a window event reaches

1669	1697	{
1670	1698	TkWindowEvent wevPtr = (TkWindowEvent ) evPtr;
1671	1699	Tk_RestrictAction result;
1672		ThreadSpecificData *tsdPtr =
	1700	ThreadSpecificData tsdPtr = (ThreadSpecificData )
1673	1701	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
1674	1702
1675	1703	if (!(flags & TCL_WINDOW_EVENTS)) {

1722	1750	switch (eventPtr->type) {
1723	1751	case KeyPress:
1724	1752	case KeyRelease: {
	1753
	1754	#if !defined(_WIN32) && !defined(MAC_OSX_TK)
1725	1755	TkKeyEvent kePtr = (TkKeyEvent ) eventPtr;
1726
1727	1756	if (kePtr->charValuePtr != NULL) {
1728	1757	ckfree(kePtr->charValuePtr);
1729	1758	kePtr->charValuePtr = NULL;
1730	1759	kePtr->charValueLen = 0;
1731	1760	}
	1761	#endif
1732	1762	break;
1733	1763	}
1734	1764

1768	1798	ClientData clientData) /* Pointer to display containing a delayed
1769	1799	* motion event to be serviced. */
1770	1800	{
1771		TkDisplay *dispPtr = clientData;
	1801	TkDisplay dispPtr = (TkDisplay )clientData;
1772	1802
1773	1803	if (dispPtr->delayedMotionPtr == NULL) {
1774	1804	Tcl_Panic("DelayedMotionProc found no delayed mouse motion event");

1800	1830	{
1801	1831	ExitHandler *exitPtr;
1802	1832
1803		exitPtr = ckalloc(sizeof(ExitHandler));
	1833	exitPtr = (ExitHandler *)ckalloc(sizeof(ExitHandler));
1804	1834	exitPtr->proc = proc;
1805	1835	exitPtr->clientData = clientData;
1806	1836	Tcl_MutexLock(&exitMutex);

1896	1926	ClientData clientData) /* Arbitrary value to pass to proc. */
1897	1927	{
1898	1928	ExitHandler *exitPtr;
1899		ThreadSpecificData *tsdPtr =
	1929	ThreadSpecificData tsdPtr = (ThreadSpecificData )
1900	1930	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
1901	1931
1902		exitPtr = ckalloc(sizeof(ExitHandler));
	1932	exitPtr = (ExitHandler *)ckalloc(sizeof(ExitHandler));
1903	1933	exitPtr->proc = proc;
1904	1934	exitPtr->clientData = clientData;
1905	1935

1937	1967	ClientData clientData) /* Arbitrary value to pass to proc. */
1938	1968	{
1939	1969	ExitHandler exitPtr, prevPtr;
1940		ThreadSpecificData *tsdPtr =
	1970	ThreadSpecificData tsdPtr = (ThreadSpecificData )
1941	1971	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
1942	1972
1943	1973	for (prevPtr = NULL, exitPtr = tsdPtr->firstExitPtr; exitPtr != NULL;

1976	2006
1977	2007	void
1978	2008	TkFinalize(
1979		ClientData clientData) /* Arbitrary value to pass to proc. */
	2009	TCL_UNUSED(void )) / Arbitrary value to pass to proc. */
1980	2010	{
1981	2011	ExitHandler *exitPtr;
1982	2012

2028	2058
2029	2059	void
2030	2060	TkFinalizeThread(
2031		ClientData clientData) /* Arbitrary value to pass to proc. */
	2061	TCL_UNUSED(void )) / Arbitrary value to pass to proc. */
2032	2062	{
2033	2063	ExitHandler *exitPtr;
2034		ThreadSpecificData *tsdPtr =
	2064	ThreadSpecificData tsdPtr = (ThreadSpecificData )
2035	2065	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
2036	2066
2037	2067	Tcl_DeleteThreadExitHandler(TkFinalizeThread, NULL);

+1

-1

generic/tkFocus.c less more

602	602
603	603	if (displayFocusPtr->focusOnMapPtr != NULL) {
604	604	Tk_DeleteEventHandler((Tk_Window) displayFocusPtr->focusOnMapPtr,
605		StructureNotifyMask, FocusMapProc,
	605	VisibilityChangeMask, FocusMapProc,
606	606	displayFocusPtr->focusOnMapPtr);
607	607	displayFocusPtr->focusOnMapPtr = NULL;
608	608	}

+82

-54

generic/tkFont.c less more

13	13	#include "tkInt.h"
14	14	#include "tkFont.h"
15	15	#if defined(MAC_OSX_TK)
16		#include "tkMacOSXInt.h"
	16	#include "tkMacOSXInt.h" /* Defines TK_DRAW_IN_CONTEXT */
17	17	#endif
	18
18	19	/*
19	20	* The following structure is used to keep track of all the fonts that exist
20	21	* in the current application. It must be stored in the TkMainInfo for the

94	95	* layout. */
95	96	int numChunks; /* Number of chunks actually used in following
96	97	* array. */
97		LayoutChunk chunks[1]; /* Array of chunks. The actual size will be
	98	LayoutChunk chunks[TKFLEXARRAY];/* Array of chunks. The actual size will be
98	99	* maxChunks. THIS FIELD MUST BE THE LAST IN
99	100	* THE STRUCTURE. */
100	101	} TextLayout;

378	379	TkFontPkgInit(
379	380	TkMainInfo mainPtr) / The application being created. */
380	381	{
381		TkFontInfo *fiPtr = ckalloc(sizeof(TkFontInfo));
	382	TkFontInfo fiPtr = (TkFontInfo )ckalloc(sizeof(TkFontInfo));
382	383
383	384	Tcl_InitHashTable(&fiPtr->fontCache, TCL_STRING_KEYS);
384	385	Tcl_InitHashTable(&fiPtr->namedTable, TCL_STRING_KEYS);

471	472	Tcl_Obj const objv[]) / Argument objects. */
472	473	{
473	474	int index;
474		Tk_Window tkwin = clientData;
	475	Tk_Window tkwin = (Tk_Window)clientData;
475	476	TkFontInfo fiPtr = ((TkWindow ) tkwin)->mainPtr->fontInfoPtr;
476	477	static const char *const optionStrings[] = {
477	478	"actual", "configure", "create", "delete",

615	616	}
616	617	string = Tcl_GetString(objv[2]);
617	618	namedHashPtr = Tcl_FindHashEntry(&fiPtr->namedTable, string);
618		nfPtr = NULL; /* lint. */
	619	nfPtr = NULL;
619	620	if (namedHashPtr != NULL) {
620		nfPtr = Tcl_GetHashValue(namedHashPtr);
	621	nfPtr = (NamedFont *)Tcl_GetHashValue(namedHashPtr);
621	622	}
622	623	if ((namedHashPtr == NULL) \|\| nfPtr->deletePending) {
623	624	Tcl_SetObjResult(interp, Tcl_ObjPrintf(

738	739	}
739	740	case FONT_METRICS: {
740	741	Tk_Font tkfont;
741		int skip, index, i;
	742	int skip, i;
742	743	const TkFontMetrics *fmPtr;
743	744	static const char *const switches[] = {
744	745	"-ascent", "-descent", "-linespace", "-fixed", NULL

795	796	resultPtr = Tcl_NewObj();
796	797	namedHashPtr = Tcl_FirstHashEntry(&fiPtr->namedTable, &search);
797	798	while (namedHashPtr != NULL) {
798		NamedFont *nfPtr = Tcl_GetHashValue(namedHashPtr);
	799	NamedFont nfPtr = (NamedFont )Tcl_GetHashValue(namedHashPtr);
799	800
800	801	if (!nfPtr->deletePending) {
801		char *string = Tcl_GetHashKey(&fiPtr->namedTable,
	802	char string = (char )Tcl_GetHashKey(&fiPtr->namedTable,
802	803	namedHashPtr);
803	804
804	805	Tcl_ListObjAppendElement(NULL, resultPtr,

841	842	Tcl_HashEntry *cacheHashPtr;
842	843	Tcl_HashSearch search;
843	844	TkFont *fontPtr;
844		NamedFont *nfPtr = Tcl_GetHashValue(namedHashPtr);
	845	NamedFont nfPtr = (NamedFont )Tcl_GetHashValue(namedHashPtr);
845	846
846	847	if (nfPtr->refCount == 0) {
847	848	/*

854	855
855	856	cacheHashPtr = Tcl_FirstHashEntry(&fiPtr->fontCache, &search);
856	857	while (cacheHashPtr != NULL) {
857		for (fontPtr = Tcl_GetHashValue(cacheHashPtr);
	858	for (fontPtr = (TkFont *)Tcl_GetHashValue(cacheHashPtr);
858	859	fontPtr != NULL; fontPtr = fontPtr->nextPtr) {
859	860	if (fontPtr->namedHashPtr == namedHashPtr) {
860	861	TkpGetFontFromAttributes(fontPtr, tkwin, &nfPtr->fa);

872	873	TheWorldHasChanged(
873	874	ClientData clientData) /* Info about application's fonts. */
874	875	{
875		TkFontInfo *fiPtr = clientData;
876		#if defined(MAC_OSX_TK)
	876	TkFontInfo fiPtr = (TkFontInfo )clientData;
877	877
878	878	/*
879	879	* On macOS it is catastrophic to recompute all widgets while the
880	880	* [NSView drawRect] method is drawing. The best that we can do in
881	881	* that situation is to abort the recomputation and hope for the best.
	882	* This is ignored on other platforms.
882	883	*/
883
884		if (TkpAppIsDrawing()) {
	884
	885	if (TkpWillDrawWidget(NULL)) {
885	886	return;
886	887	}
887		#endif
	888
888	889	fiPtr->updatePending = 0;
889	890	RecomputeWidgets(fiPtr->mainPtr->winPtr);
890	891	}

962	963
963	964	namedHashPtr = Tcl_CreateHashEntry(&fiPtr->namedTable, name, &isNew);
964	965	if (!isNew) {
965		nfPtr = Tcl_GetHashValue(namedHashPtr);
	966	nfPtr = (NamedFont *)Tcl_GetHashValue(namedHashPtr);
966	967	if (!nfPtr->deletePending) {
967	968	if (interp) {
968	969	Tcl_SetObjResult(interp, Tcl_ObjPrintf(

984	985	return TCL_OK;
985	986	}
986	987
987		nfPtr = ckalloc(sizeof(NamedFont));
	988	nfPtr = (NamedFont *)ckalloc(sizeof(NamedFont));
988	989	nfPtr->deletePending = 0;
989	990	Tcl_SetHashValue(namedHashPtr, nfPtr);
990	991	nfPtr->fa = *faPtr;

1023	1024	}
1024	1025	return TCL_ERROR;
1025	1026	}
1026		nfPtr = Tcl_GetHashValue(namedHashPtr);
	1027	nfPtr = (NamedFont *)Tcl_GetHashValue(namedHashPtr);
1027	1028	if (nfPtr->refCount != 0) {
1028	1029	nfPtr->deletePending = 1;
1029	1030	} else {

1112	1113	SetFontFromAny(interp, objPtr);
1113	1114	}
1114	1115
1115		oldFontPtr = objPtr->internalRep.twoPtrValue.ptr1;
	1116	oldFontPtr = (TkFont *)objPtr->internalRep.twoPtrValue.ptr1;
1116	1117	if (oldFontPtr != NULL) {
1117	1118	if (oldFontPtr->resourceRefCount == 0) {
1118	1119	/*

1141	1142	cacheHashPtr = Tcl_CreateHashEntry(&fiPtr->fontCache,
1142	1143	Tcl_GetString(objPtr), &isNew);
1143	1144	}
1144		firstFontPtr = Tcl_GetHashValue(cacheHashPtr);
	1145	firstFontPtr = (TkFont *)Tcl_GetHashValue(cacheHashPtr);
1145	1146	for (fontPtr = firstFontPtr; (fontPtr != NULL);
1146	1147	fontPtr = fontPtr->nextPtr) {
1147	1148	if (Tk_Screen(tkwin) == fontPtr->screen) {

1164	1165	* Construct a font based on a named font.
1165	1166	*/
1166	1167
1167		nfPtr = Tcl_GetHashValue(namedHashPtr);
	1168	nfPtr = (NamedFont *)Tcl_GetHashValue(namedHashPtr);
1168	1169	nfPtr->refCount++;
1169	1170
1170	1171	fontPtr = TkpGetFontFromAttributes(NULL, tkwin, &nfPtr->fa);

1297	1298	SetFontFromAny(NULL, objPtr);
1298	1299	}
1299	1300
1300		fontPtr = objPtr->internalRep.twoPtrValue.ptr1;
	1301	fontPtr = (TkFont *)objPtr->internalRep.twoPtrValue.ptr1;
1301	1302	if (fontPtr != NULL) {
1302	1303	if (fontPtr->resourceRefCount == 0) {
1303	1304	/*

1324	1325	hashPtr = Tcl_FindHashEntry(&fiPtr->fontCache, Tcl_GetString(objPtr));
1325	1326	}
1326	1327	if (hashPtr != NULL) {
1327		for (fontPtr = Tcl_GetHashValue(hashPtr); fontPtr != NULL;
	1328	for (fontPtr = (TkFont *)Tcl_GetHashValue(hashPtr); fontPtr != NULL;
1328	1329	fontPtr = fontPtr->nextPtr) {
1329	1330	if (Tk_Screen(tkwin) == fontPtr->screen) {
1330	1331	fontPtr->objRefCount++;

1359	1360
1360	1361	static int
1361	1362	SetFontFromAny(
1362		Tcl_Interp interp, / Used for error reporting if not NULL. */
	1363	TCL_UNUSED(Tcl_Interp ), / Used for error reporting if not NULL. */
1363	1364	Tcl_Obj objPtr) / The object to convert. */
1364	1365	{
1365	1366	const Tcl_ObjType *typePtr;

1435	1436	if (fontPtr == NULL) {
1436	1437	return;
1437	1438	}
1438		fontPtr->resourceRefCount--;
1439		if (fontPtr->resourceRefCount > 0) {
	1439	if (fontPtr->resourceRefCount-- > 1) {
1440	1440	return;
1441	1441	}
1442	1442	if (fontPtr->namedHashPtr != NULL) {

1445	1445	* the named font and free it if no-one else is using it.
1446	1446	*/
1447	1447
1448		nfPtr = Tcl_GetHashValue(fontPtr->namedHashPtr);
	1448	nfPtr = (NamedFont *)Tcl_GetHashValue(fontPtr->namedHashPtr);
1449	1449	nfPtr->refCount--;
1450	1450	if ((nfPtr->refCount == 0) && nfPtr->deletePending) {
1451	1451	Tcl_DeleteHashEntry(fontPtr->namedHashPtr);

1453	1453	}
1454	1454	}
1455	1455
1456		prevPtr = Tcl_GetHashValue(fontPtr->cacheHashPtr);
	1456	prevPtr = (TkFont *)Tcl_GetHashValue(fontPtr->cacheHashPtr);
1457	1457	if (prevPtr == fontPtr) {
1458	1458	if (fontPtr->nextPtr == NULL) {
1459	1459	Tcl_DeleteHashEntry(fontPtr->cacheHashPtr);

1531	1531	FreeFontObj(
1532	1532	Tcl_Obj objPtr) / The object we are releasing. */
1533	1533	{
1534		TkFont *fontPtr = objPtr->internalRep.twoPtrValue.ptr1;
	1534	TkFont fontPtr = (TkFont )objPtr->internalRep.twoPtrValue.ptr1;
1535	1535
1536	1536	if (fontPtr != NULL) {
1537	1537	fontPtr->objRefCount--;

1566	1566	Tcl_Obj srcObjPtr, / The object we are copying from. */
1567	1567	Tcl_Obj dupObjPtr) / The object we are copying to. */
1568	1568	{
1569		TkFont *fontPtr = srcObjPtr->internalRep.twoPtrValue.ptr1;
	1569	TkFont fontPtr = (TkFont )srcObjPtr->internalRep.twoPtrValue.ptr1;
1570	1570
1571	1571	dupObjPtr->typePtr = srcObjPtr->typePtr;
1572	1572	dupObjPtr->internalRep.twoPtrValue.ptr1 = fontPtr;

1972	1972	int heightPtr) / Filled with height of string. */
1973	1973	{
1974	1974	TkFont fontPtr = (TkFont ) tkfont;
1975		const char start, end, *special;
	1975	const char start, endp, *special;
1976	1976	int n, y, bytesThisChunk, maxChunks, curLine, layoutHeight;
1977	1977	int baseline, height, curX, newX, maxWidth, *lineLengths;
1978	1978	TextLayout *layoutPtr;

2005	2005
2006	2006	maxChunks = 1;
2007	2007
2008		layoutPtr = ckalloc(sizeof(TextLayout)
2009		+ (maxChunks-1) * sizeof(LayoutChunk));
	2008	layoutPtr = (TextLayout *)ckalloc(Tk_Offset(TextLayout, chunks)
	2009	+ maxChunks * sizeof(LayoutChunk));
2010	2010	layoutPtr->tkfont = tkfont;
2011	2011	layoutPtr->string = string;
2012	2012	layoutPtr->numChunks = 0;

2020	2020
2021	2021	curX = 0;
2022	2022
2023		end = Tcl_UtfAtIndex(string, numChars);
	2023	endp = TkUtfAtIndex(string, numChars);
2024	2024	special = string;
2025	2025
2026	2026	flags &= TK_IGNORE_TABS \| TK_IGNORE_NEWLINES;
2027	2027	flags \|= TK_WHOLE_WORDS \| TK_AT_LEAST_ONE;
2028		for (start = string; start < end; ) {
	2028	for (start = string; start < endp; ) {
2029	2029	if (start >= special) {
2030	2030	/*
2031	2031	* Find the next special character in the string.

2036	2036	* whitespace set.
2037	2037	*/
2038	2038
2039		for (special = start; special < end; special++) {
	2039	for (special = start; special < endp; special++) {
2040	2040	if (!(flags & TK_IGNORE_NEWLINES)) {
2041	2041	if ((special == '\n') \|\| (special == '\r')) {
2042	2042	break;

2070	2070	}
2071	2071	}
2072	2072
2073		if ((start == special) && (special < end)) {
	2073	if ((start == special) && (special < endp)) {
2074	2074	/*
2075	2075	* Handle the special character.
2076	2076	*

2087	2087	start++;
2088	2088	curX = newX;
2089	2089	flags &= ~TK_AT_LEAST_ONE;
2090		if ((start < end) &&
	2090	if ((start < endp) &&
2091	2091	((wrapLength <= 0) \|\| (newX <= wrapLength))) {
2092	2092	/*
2093	2093	* More chars can still fit on this line.

2109	2109	* Consume all extra spaces at end of line.
2110	2110	*/
2111	2111
2112		while ((start < end) && isspace(UCHAR(start))) { / INTL: ISO space */
	2112	while ((start < endp) && isspace(UCHAR(start))) { / INTL: ISO space */
2113	2113	if (!(flags & TK_IGNORE_NEWLINES)) {
2114	2114	if ((start == '\n') \|\| (start == '\r')) {
2115	2115	break;

2297	2297	int x, int y, /* Upper-left hand corner of rectangle in
2298	2298	* which to draw (pixels). */
2299	2299	int firstChar, /* The index of the first character to draw
2300		* from the given text item. 0 specfies the
	2300	* from the given text item. 0 specifies the
2301	2301	* beginning. */
2302	2302	int lastChar) /* The index just after the last character to
2303	2303	* draw from the given text item. A number < 0
2304	2304	* means to draw all characters. */
2305	2305	{
	2306	#if 0
	2307	/* Use TkDrawAngledTextLayout() implementation - testing purposes at this point */
	2308	TkDrawAngledTextLayout(display, drawable, gc, layout, x, y, 0.0, firstChar, lastChar);
	2309	#else
2306	2310	TextLayout layoutPtr = (TextLayout ) layout;
2307	2311	int i, numDisplayChars, drawX;
2308	2312	const char firstByte, lastByte;

2324	2328	firstChar = 0;
2325	2329	firstByte = chunkPtr->start;
2326	2330	} else {
2327		firstByte = Tcl_UtfAtIndex(chunkPtr->start, firstChar);
	2331	firstByte = TkUtfAtIndex(chunkPtr->start, firstChar);
2328	2332	Tk_MeasureChars(layoutPtr->tkfont, chunkPtr->start,
2329	2333	firstByte - chunkPtr->start, -1, 0, &drawX);
2330	2334	}
2331	2335	if (lastChar < numDisplayChars) {
2332	2336	numDisplayChars = lastChar;
2333	2337	}
2334		lastByte = Tcl_UtfAtIndex(chunkPtr->start, numDisplayChars);
	2338	lastByte = TkUtfAtIndex(chunkPtr->start, numDisplayChars);
	2339	#if TK_DRAW_IN_CONTEXT
	2340	TkpDrawCharsInContext(display, drawable, gc, layoutPtr->tkfont,
	2341	chunkPtr->start, chunkPtr->numBytes,
	2342	firstByte - chunkPtr->start, lastByte - firstByte,
	2343	x+chunkPtr->x, y+chunkPtr->y);
	2344	#else /* !TK_DRAW_IN_CONTEXT */
2335	2345	Tk_DrawChars(display, drawable, gc, layoutPtr->tkfont, firstByte,
2336	2346	lastByte - firstByte, x+chunkPtr->x+drawX, y+chunkPtr->y);
	2347	#endif /* TK_DRAW_IN_CONTEXT */
2337	2348	}
2338	2349	firstChar -= chunkPtr->numChars;
2339	2350	lastChar -= chunkPtr->numChars;

2342	2353	}
2343	2354	chunkPtr++;
2344	2355	}
	2356	#endif /* Use TkDrawAngledTextLayout() implementation */
2345	2357	}
2346	2358
2347	2359	void

2356	2368	* which to draw (pixels). */
2357	2369	double angle,
2358	2370	int firstChar, /* The index of the first character to draw
2359		* from the given text item. 0 specfies the
	2371	* from the given text item. 0 specifies the
2360	2372	* beginning. */
2361	2373	int lastChar) /* The index just after the last character to
2362	2374	* draw from the given text item. A number < 0

2386	2398	firstChar = 0;
2387	2399	firstByte = chunkPtr->start;
2388	2400	} else {
2389		firstByte = Tcl_UtfAtIndex(chunkPtr->start, firstChar);
	2401	firstByte = TkUtfAtIndex(chunkPtr->start, firstChar);
2390	2402	Tk_MeasureChars(layoutPtr->tkfont, chunkPtr->start,
2391	2403	firstByte - chunkPtr->start, -1, 0, &drawX);
2392	2404	}
2393	2405	if (lastChar < numDisplayChars) {
2394	2406	numDisplayChars = lastChar;
2395	2407	}
2396		lastByte = Tcl_UtfAtIndex(chunkPtr->start, numDisplayChars);
	2408	lastByte = TkUtfAtIndex(chunkPtr->start, numDisplayChars);
	2409	#if TK_DRAW_IN_CONTEXT
	2410	dx = cosA * (chunkPtr->x) + sinA * (chunkPtr->y);
	2411	dy = -sinA * (chunkPtr->x) + cosA * (chunkPtr->y);
	2412	if (angle == 0.0) {
	2413	TkpDrawCharsInContext(display, drawable, gc,
	2414	layoutPtr->tkfont, chunkPtr->start, chunkPtr->numBytes,
	2415	firstByte - chunkPtr->start, lastByte - firstByte,
	2416	(int)(x + dx), (int)(y + dy));
	2417	} else {
	2418	TkpDrawAngledCharsInContext(display, drawable, gc,
	2419	layoutPtr->tkfont, chunkPtr->start, chunkPtr->numBytes,
	2420	firstByte - chunkPtr->start, lastByte - firstByte,
	2421	x+dx, y+dy, angle);
	2422	}
	2423	#else /* !TK_DRAW_IN_CONTEXT */
2397	2424	dx = cosA * (chunkPtr->x + drawX) + sinA * (chunkPtr->y);
2398	2425	dy = -sinA * (chunkPtr->x + drawX) + cosA * (chunkPtr->y);
2399	2426	if (angle == 0.0) {

2404	2431	TkDrawAngledChars(display, drawable, gc, layoutPtr->tkfont,
2405	2432	firstByte, lastByte - firstByte, x+dx, y+dy, angle);
2406	2433	}
	2434	#endif /* TK_DRAW_IN_CONTEXT */
2407	2435	}
2408	2436	firstChar -= chunkPtr->numChars;
2409	2437	lastChar -= chunkPtr->numChars;

2735	2763	goto check;
2736	2764	}
2737	2765	} else if (index < chunkPtr->numChars) {
2738		end = Tcl_UtfAtIndex(chunkPtr->start, index);
	2766	end = TkUtfAtIndex(chunkPtr->start, index);
2739	2767	if (xPtr != NULL) {
2740	2768	Tk_MeasureChars(tkfont, chunkPtr->start,
2741	2769	end - chunkPtr->start, -1, 0, &x);
2742	2770	x += chunkPtr->x;
2743	2771	}
2744	2772	if (widthPtr != NULL) {
2745		Tk_MeasureChars(tkfont, end, Tcl_UtfNext(end) - end,
2746		-1, 0, &w);
	2773	int ch;
	2774	Tk_MeasureChars(tkfont, end, TkUtfToUniChar(end, &ch), -1, 0, &w);
2747	2775	}
2748	2776	goto check;
2749	2777	}

3375	3403	static int
3376	3404	ConfigAttributesObj(
3377	3405	Tcl_Interp interp, / Interp for error return. */
3378		Tk_Window tkwin, /* For display on which font will be used. */
	3406	TCL_UNUSED(Tk_Window), /* For display on which font will be used. */
3379	3407	int objc, /* Number of elements in argv. */
3380	3408	Tcl_Obj const objv[], / Command line options. */
3381	3409	TkFontAttributes faPtr) / Font attributes structure whose fields are

3582	3610	* specified in font name are filled with
3583	3611	* default values. */
3584	3612	{
3585		char *dash;
	3613	const char *dash;
3586	3614	int objc, result, i, n;
3587	3615	Tcl_Obj **objv;
3588	3616	const char *string;

3750	3778	maxChunks = *maxPtr;
3751	3779	if (layoutPtr->numChunks == maxChunks) {
3752	3780	maxChunks *= 2;
3753		s = sizeof(TextLayout) + ((maxChunks - 1) * sizeof(LayoutChunk));
	3781	s = Tk_Offset(TextLayout, chunks) + (maxChunks * sizeof(LayoutChunk));
3754	3782	layoutPtr = ckrealloc(layoutPtr, s);
3755	3783
3756	3784	*layoutPtrPtr = layoutPtr;

4214	4242	hashPtr = Tcl_FindHashEntry(
4215	4243	&((TkWindow *) tkwin)->mainPtr->fontInfoPtr->fontCache, name);
4216	4244	if (hashPtr != NULL) {
4217		fontPtr = Tcl_GetHashValue(hashPtr);
	4245	fontPtr = (TkFont *)Tcl_GetHashValue(hashPtr);
4218	4246	if (fontPtr == NULL) {
4219	4247	Tcl_Panic("TkDebugFont found empty hash table entry");
4220	4248	}

4267	4295	}
4268	4296	chunkPtr = layoutPtr->chunks;
4269	4297	numBytesInChunk = chunkPtr->numBytes;
4270		strncpy(dst, chunkPtr->start, (size_t) numBytesInChunk);
	4298	strncpy(dst, chunkPtr->start, numBytesInChunk);
4271	4299	*font = layoutPtr->tkfont;
4272	4300	return numBytesInChunk;
4273	4301	}

+9

-9

generic/tkFrame.c less more

313	313	static void FrameCmdDeletedProc(ClientData clientData);
314	314	static void FrameEventProc(ClientData clientData,
315	315	XEvent *eventPtr);
316		static void FrameLostSlaveProc(ClientData clientData,
	316	static void FrameLostContentProc(ClientData clientData,
317	317	Tk_Window tkwin);
318	318	static void FrameRequestProc(ClientData clientData,
319	319	Tk_Window tkwin);

345	345	static const Tk_GeomMgr frameGeomType = {
346	346	"labelframe", /* name */
347	347	FrameRequestProc, /* requestProc */
348		FrameLostSlaveProc /* lostSlaveProc */
	348	FrameLostContentProc /* lostSlaveProc */
349	349	};
350	350
351	351	/*

805	805	\|\| ((c == 'v')
806	806	&& (strncmp(arg, "-visual", (unsigned)length) == 0))) {
807	807
808		#ifdef SUPPORT_CONFIG_EMBEDDED
	808	#ifdef _WIN32
809	809	if (c == 'u') {
810	810	const char *string = Tcl_GetString(objv[i+1]);
811	811

1913	1913	/*
1914	1914	*--------------------------------------------------------------
1915	1915	*
1916		* FrameLostSlaveProc --
	1916	* FrameLostContentProc --
1917	1917	*
1918	1918	* This function is invoked by Tk whenever some other geometry claims
1919		* control over a slave that used to be managed by us.
	1919	* control over a content window that used to be managed by us.
1920	1920	*
1921	1921	* Results:
1922	1922	* None.
1923	1923	*
1924	1924	* Side effects:
1925		* Forgets all frame-related information about the slave.
	1925	* Forgets all frame-related information about the content window.
1926	1926	*
1927	1927	*--------------------------------------------------------------
1928	1928	*/
1929	1929
1930	1930	static void
1931		FrameLostSlaveProc(
1932		ClientData clientData, /* Frame structure for slave window that was
	1931	FrameLostContentProc(
	1932	ClientData clientData, /* Frame structure for content window that was
1933	1933	* stolen away. */
1934		Tk_Window tkwin) /* Tk's handle for the slave window. */
	1934	Tk_Window tkwin) /* Tk's handle for the content window. */
1935	1935	{
1936	1936	Frame *framePtr = clientData;
1937	1937	Labelframe *labelframePtr = clientData;

+223

-225

generic/tkGeometry.c less more

14	14
15	15	/*
16	16	* Data structures of the following type are used by Tk_MaintainGeometry. For
17		* each slave managed by Tk_MaintainGeometry, there is one of these structures
18		* associated with its master.
19		*/
20
21		typedef struct MaintainSlave {
22		Tk_Window slave; /* The slave window being positioned. */
23		Tk_Window master; /* The master that determines slave's
	17	* each content managed by Tk_MaintainGeometry, there is one of these structures
	18	* associated with its container.
	19	*/
	20
	21	typedef struct MaintainContent {
	22	Tk_Window content; /* The content window being positioned. */
	23	Tk_Window container; /* The container that determines content's
24	24	* position; it must be a descendant of
25		* slave's parent. */
26		int x, y; /* Desired position of slave relative to
27		* master. */
28		int width, height; /* Desired dimensions of slave. */
29		struct MaintainSlave *nextPtr;
	25	* content's parent. */
	26	int x, y; /* Desired position of content relative to
	27	* container. */
	28	int width, height; /* Desired dimensions of content. */
	29	struct MaintainContent *nextPtr;
30	30	/* Next in list of Maintains associated with
31		* master. */
32		} MaintainSlave;
33
34		/*
35		* For each window that has been specified as a master to Tk_MaintainGeometry,
	31	* container. */
	32	} MaintainContent;
	33
	34	/*
	35	* For each window that has been specified as a content to Tk_MaintainGeometry,
36	36	* there is a structure of the following type:
37	37	*/
38	38
39		typedef struct MaintainMaster {
	39	typedef struct MaintainContainer {
40	40	Tk_Window ancestor; /* The lowest ancestor of this window for
41	41	* which we have not created a
42	42	* StructureNotify handler. May be the same as

44	44	int checkScheduled; /* Non-zero means that there is already a call
45	45	* to MaintainCheckProc scheduled as an idle
46	46	* handler. */
47		MaintainSlave slavePtr; / First in list of all slaves associated with
48		* this master. */
49		} MaintainMaster;
	47	MaintainContent contentPtr; / First in list of all content associated with
	48	* this container. */
	49	} MaintainContainer;
50	50
51	51	/*
52	52	* Prototypes for static procedures in this file:
53	53	*/
54	54
55	55	static void MaintainCheckProc(ClientData clientData);
56		static void MaintainMasterProc(ClientData clientData,
	56	static void MaintainContainerProc(ClientData clientData,
57	57	XEvent *eventPtr);
58		static void MaintainSlaveProc(ClientData clientData,
	58	static void MaintainContentProc(ClientData clientData,
59	59	XEvent *eventPtr);
60	60
61	61	/*

64	64	* Tk_ManageGeometry --
65	65	*
66	66	* Arrange for a particular procedure to manage the geometry of a given
67		* slave window.
	67	* content window.
68	68	*
69	69	* Results:
70	70	* None.

89	89	ClientData clientData) /* Arbitrary one-word argument to pass to
90	90	* geometry manager procedures. */
91	91	{
92		register TkWindow winPtr = (TkWindow ) tkwin;
	92	TkWindow winPtr = (TkWindow ) tkwin;
93	93
94	94	if ((winPtr->geomMgrPtr != NULL) && (mgrPtr != NULL)
95	95	&& ((winPtr->geomMgrPtr != mgrPtr)

131	131	int reqWidth, int reqHeight)/* Minimum desired dimensions for window, in
132	132	* pixels. */
133	133	{
134		register TkWindow winPtr = (TkWindow ) tkwin;
	134	TkWindow winPtr = (TkWindow ) tkwin;
135	135
136	136	/*
137	137	* X gets very upset if a window requests a width or height of zero, so

181	181	int left, int right, /* Width of internal border, in pixels. */
182	182	int top, int bottom)
183	183	{
184		register TkWindow winPtr = (TkWindow ) tkwin;
185		register int changed = 0;
	184	TkWindow winPtr = (TkWindow ) tkwin;
	185	int changed = 0;
186	186
187	187	if (left < 0) {
188	188	left = 0;

217	217	}
218	218
219	219	/*
220		* All the slaves for which this is the master window must now be
	220	* All the content for which this is the container window must now be
221	221	* repositioned to take account of the new internal border width. To
222	222	* signal all the geometry managers to do this, trigger a ConfigureNotify
223	223	* event. This will cause geometry managers to recompute everything.

278	278	Tk_Window tkwin, /* Window that will have internal border. */
279	279	int minWidth, int minHeight)/* Minimum requested size, in pixels. */
280	280	{
281		register TkWindow winPtr = (TkWindow ) tkwin;
	281	TkWindow winPtr = (TkWindow ) tkwin;
282	282
283	283	if ((winPtr->minReqWidth == minWidth) &&
284	284	(winPtr->minReqHeight == minHeight)) {

302	302	/*
303	303	*----------------------------------------------------------------------
304	304	*
305		* TkSetGeometryMaster --
306		*
307		* Set a geometry master for this window. Only one master may own
	305	* TkSetGeometryContainer --
	306	*
	307	* Set a geometry container for this window. Only one container may own
308	308	* a window at any time.
309	309	*
310	310	* Results:
311	311	* A standard Tcl result.
312	312	*
313	313	* Side effects:
314		* The geometry master is recorded for the window.
	314	* The geometry container is recorded for the window.
315	315	*
316	316	*----------------------------------------------------------------------
317	317	*/
318	318
319	319	int
320		TkSetGeometryMaster(
	320	TkSetGeometryContainer(
321	321	Tcl_Interp interp, / Current interpreter, for error. */
322		Tk_Window tkwin, /* Window that will have geometry master
	322	Tk_Window tkwin, /* Window that will have geometry container
323	323	* set. */
324		const char master) / The master identity. */
325		{
326		register TkWindow winPtr = (TkWindow ) tkwin;
	324	const char name) / The name of the geometry manager. */
	325	{
	326	TkWindow winPtr = (TkWindow ) tkwin;
327	327
328	328	if (winPtr->geomMgrName != NULL &&
329		strcmp(winPtr->geomMgrName, master) == 0) {
	329	strcmp(winPtr->geomMgrName, name) == 0) {
330	330	return TCL_OK;
331	331	}
332	332	if (winPtr->geomMgrName != NULL) {

334	334	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
335	335	"cannot use geometry manager %s inside %s which already"
336	336	" has slaves managed by %s",
337		master, Tk_PathName(tkwin), winPtr->geomMgrName));
	337	name, Tk_PathName(tkwin), winPtr->geomMgrName));
338	338	Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "FIGHT", NULL);
339	339	}
340	340	return TCL_ERROR;
341	341	}
342	342
343		winPtr->geomMgrName = ckalloc(strlen(master) + 1);
344		strcpy(winPtr->geomMgrName, master);
	343	winPtr->geomMgrName = (char *)ckalloc(strlen(name) + 1);
	344	strcpy(winPtr->geomMgrName, name);
345	345	return TCL_OK;
346	346	}
347	347
348	348	/*
349	349	*----------------------------------------------------------------------
350	350	*
351		* TkFreeGeometryMaster --
352		*
353		* Remove a geometry master for this window. Only one master may own
	351	* TkFreeGeometryContainer --
	352	*
	353	* Remove a geometry container for this window. Only one container may own
354	354	* a window at any time.
355	355	*
356	356	* Results:
357	357	* None.
358	358	*
359	359	* Side effects:
360		* The geometry master is cleared for the window.
	360	* The geometry container is cleared for the window.
361	361	*
362	362	*----------------------------------------------------------------------
363	363	*/
364	364
365	365	void
366		TkFreeGeometryMaster(
367		Tk_Window tkwin, /* Window that will have geometry master
	366	TkFreeGeometryContainer(
	367	Tk_Window tkwin, /* Window that will have geometry container
368	368	* cleared. */
369		const char master) / The master identity. */
370		{
371		register TkWindow winPtr = (TkWindow ) tkwin;
	369	const char name) / The name of the geometry manager. */
	370	{
	371	TkWindow winPtr = (TkWindow ) tkwin;
372	372
373	373	if (winPtr->geomMgrName != NULL &&
374		strcmp(winPtr->geomMgrName, master) != 0) {
	374	strcmp(winPtr->geomMgrName, name) != 0) {
375	375	Tcl_Panic("Trying to free %s from geometry manager %s",
376		winPtr->geomMgrName, master);
	376	winPtr->geomMgrName, name);
377	377	}
378	378	if (winPtr->geomMgrName != NULL) {
379	379	ckfree(winPtr->geomMgrName);

386	386	*
387	387	* Tk_MaintainGeometry --
388	388	*
389		* This procedure is invoked by geometry managers to handle slaves whose
390		* master's are not their parents. It translates the desired geometry for
391		* the slave into the coordinate system of the parent and respositions
392		* the slave if it isn't already at the right place. Furthermore, it sets
393		* up event handlers so that if the master (or any of its ancestors up to
394		* the slave's parent) is mapped, unmapped, or moved, then the slave will
	389	* This procedure is invoked by geometry managers to handle content whose
	390	* container's are not their parents. It translates the desired geometry for
	391	* the content into the coordinate system of the parent and respositions
	392	* the content if it isn't already at the right place. Furthermore, it sets
	393	* up event handlers so that if the container (or any of its ancestors up to
	394	* the content's parent) is mapped, unmapped, or moved, then the content will
395	395	* be adjusted to match.
396	396	*
397	397	* Results:

399	399	*
400	400	* Side effects:
401	401	* Event handlers are created and state is allocated to keep track of
402		* slave. Note: if slave was already managed for master by
	402	* content. Note: if content was already managed for container by
403	403	* Tk_MaintainGeometry, then the previous information is replaced with
404	404	* the new information. The caller must eventually call
405	405	* Tk_UnmaintainGeometry to eliminate the correspondence (or, the state

410	410
411	411	void
412	412	Tk_MaintainGeometry(
413		Tk_Window slave, /* Slave for geometry management. */
414		Tk_Window master, /* Master for slave; must be a descendant of
415		* slave's parent. */
416		int x, int y, /* Desired position of slave within master. */
417		int width, int height) /* Desired dimensions for slave. */
	413	Tk_Window window, /* Window for geometry management. */
	414	Tk_Window container, /* Container for window; must be a descendant of
	415	* window's parent. */
	416	int x, int y, /* Desired position of window within container. */
	417	int width, int height) /* Desired dimensions for window. */
418	418	{
419	419	Tcl_HashEntry *hPtr;
420		MaintainMaster *masterPtr;
421		register MaintainSlave *slavePtr;
	420	MaintainContainer *containerPtr;
	421	MaintainContent *contentPtr;
422	422	int isNew, map;
423	423	Tk_Window ancestor, parent;
424		TkDisplay dispPtr = ((TkWindow ) master)->dispPtr;
425
426		((TkWindow )slave)->maintainerPtr = (TkWindow )master;
427
428		((TkWindow )slave)->maintainerPtr = (TkWindow )master;
429		if (master == Tk_Parent(slave)) {
	424	TkDisplay dispPtr = ((TkWindow ) container)->dispPtr;
	425
	426	((TkWindow )window)->maintainerPtr = (TkWindow )container;
	427
	428	if (container == Tk_Parent(window)) {
430	429	/*
431		* If the slave is a direct descendant of the master, don't bother
	430	* If the window is a direct descendant of the container, don't bother
432	431	* setting up the extra infrastructure for management, just make a
433	432	* call to Tk_MoveResizeWindow; the parent/child relationship will
434	433	* take care of the rest.
435	434	*/
436	435
437		Tk_MoveResizeWindow(slave, x, y, width, height);
	436	Tk_MoveResizeWindow(window, x, y, width, height);
438	437
439	438	/*
440		* Map the slave if the master is already mapped; otherwise, wait
441		* until the master is mapped later (in which case mapping the slave
	439	* Map the window if the container is already mapped; otherwise, wait
	440	* until the container is mapped later (in which case mapping the window
442	441	* is taken care of elsewhere).
443	442	*/
444	443
445		if (Tk_IsMapped(master)) {
446		Tk_MapWindow(slave);
	444	if (Tk_IsMapped(container)) {
	445	Tk_MapWindow(window);
447	446	}
448	447	return;
449	448	}

454	453	}
455	454
456	455	/*
457		* See if there is already a MaintainMaster structure for the master; if
	456	* See if there is already a MaintainContainer structure for the container; if
458	457	* not, then create one.
459	458	*/
460	459
461		parent = Tk_Parent(slave);
	460	parent = Tk_Parent(window);
462	461	hPtr = Tcl_CreateHashEntry(&dispPtr->maintainHashTable,
463		(char *) master, &isNew);
	462	(char *) container, &isNew);
464	463	if (!isNew) {
465		masterPtr = Tcl_GetHashValue(hPtr);
	464	containerPtr = (MaintainContainer *)Tcl_GetHashValue(hPtr);
466	465	} else {
467		masterPtr = ckalloc(sizeof(MaintainMaster));
468		masterPtr->ancestor = master;
469		masterPtr->checkScheduled = 0;
470		masterPtr->slavePtr = NULL;
471		Tcl_SetHashValue(hPtr, masterPtr);
	466	containerPtr = (MaintainContainer *)ckalloc(sizeof(MaintainContainer));
	467	containerPtr->ancestor = container;
	468	containerPtr->checkScheduled = 0;
	469	containerPtr->contentPtr = NULL;
	470	Tcl_SetHashValue(hPtr, containerPtr);
472	471	}
473	472
474	473	/*
475		* Create a MaintainSlave structure for the slave if there isn't already
	474	* Create a MaintainContent structure for the window if there isn't already
476	475	* one.
477	476	*/
478	477
479		for (slavePtr = masterPtr->slavePtr; slavePtr != NULL;
480		slavePtr = slavePtr->nextPtr) {
481		if (slavePtr->slave == slave) {
482		goto gotSlave;
483		}
484		}
485		slavePtr = ckalloc(sizeof(MaintainSlave));
486		slavePtr->slave = slave;
487		slavePtr->master = master;
488		slavePtr->nextPtr = masterPtr->slavePtr;
489		masterPtr->slavePtr = slavePtr;
490		Tk_CreateEventHandler(slave, StructureNotifyMask, MaintainSlaveProc,
491		slavePtr);
	478	for (contentPtr = containerPtr->contentPtr; contentPtr != NULL;
	479	contentPtr = contentPtr->nextPtr) {
	480	if (contentPtr->content == window) {
	481	goto gotContent;
	482	}
	483	}
	484	contentPtr = (MaintainContent *)ckalloc(sizeof(MaintainContent));
	485	contentPtr->content = window;
	486	contentPtr->container = container;
	487	contentPtr->nextPtr = containerPtr->contentPtr;
	488	containerPtr->contentPtr = contentPtr;
	489	Tk_CreateEventHandler(window, StructureNotifyMask, MaintainContentProc,
	490	contentPtr);
492	491
493	492	/*
494	493	* Make sure that there are event handlers registered for all the windows
495		* between master and slave's parent (including master but not slave's
496		* parent). There may already be handlers for master and some of its
497		* ancestors (masterPtr->ancestor tells how many).
	494	* between container and windows's parent (including container but not window's
	495	* parent). There may already be handlers for container and some of its
	496	* ancestors (containerPtr->ancestor tells how many).
498	497	*/
499	498
500		for (ancestor = master; ancestor != parent;
	499	for (ancestor = container; ancestor != parent;
501	500	ancestor = Tk_Parent(ancestor)) {
502		if (ancestor == masterPtr->ancestor) {
	501	if (ancestor == containerPtr->ancestor) {
503	502	Tk_CreateEventHandler(ancestor, StructureNotifyMask,
504		MaintainMasterProc, masterPtr);
505		masterPtr->ancestor = Tk_Parent(ancestor);
	503	MaintainContainerProc, containerPtr);
	504	containerPtr->ancestor = Tk_Parent(ancestor);
506	505	}
507	506	}
508	507

511	510	* if it's not currently in the right place or state.
512	511	*/
513	512
514		gotSlave:
515		slavePtr->x = x;
516		slavePtr->y = y;
517		slavePtr->width = width;
518		slavePtr->height = height;
	513	gotContent:
	514	contentPtr->x = x;
	515	contentPtr->y = y;
	516	contentPtr->width = width;
	517	contentPtr->height = height;
519	518	map = 1;
520		for (ancestor = slavePtr->master; ; ancestor = Tk_Parent(ancestor)) {
	519	for (ancestor = contentPtr->container; ; ancestor = Tk_Parent(ancestor)) {
521	520	if (!Tk_IsMapped(ancestor) && (ancestor != parent)) {
522	521	map = 0;
523	522	}
524	523	if (ancestor == parent) {
525		if ((x != Tk_X(slavePtr->slave))
526		\|\| (y != Tk_Y(slavePtr->slave))
527		\|\| (width != Tk_Width(slavePtr->slave))
528		\|\| (height != Tk_Height(slavePtr->slave))) {
529		Tk_MoveResizeWindow(slavePtr->slave, x, y, width, height);
	524	if ((x != Tk_X(contentPtr->content))
	525	\|\| (y != Tk_Y(contentPtr->content))
	526	\|\| (width != Tk_Width(contentPtr->content))
	527	\|\| (height != Tk_Height(contentPtr->content))) {
	528	Tk_MoveResizeWindow(contentPtr->content, x, y, width, height);
530	529	}
531	530	if (map) {
532		Tk_MapWindow(slavePtr->slave);
	531	Tk_MapWindow(contentPtr->content);
533	532	} else {
534		Tk_UnmapWindow(slavePtr->slave);
	533	Tk_UnmapWindow(contentPtr->content);
535	534	}
536	535	break;
537	536	}

546	545	* Tk_UnmaintainGeometry --
547	546	*
548	547	* This procedure cancels a previous Tk_MaintainGeometry call, so that
549		* the relationship between slave and master is no longer maintained.
550		*
551		* Results:
552		* None.
553		*
554		* Side effects:
555		* The slave is unmapped and state is released, so that slave won't track
556		* master any more. If we weren't previously managing slave relative to
557		* master, then this procedure has no effect.
	548	* the relationship between window and container is no longer maintained.
	549	*
	550	* Results:
	551	* None.
	552	*
	553	* Side effects:
	554	* The window is unmapped and state is released, so that window won't track
	555	* container any more. If we weren't previously managing window relative to
	556	* container, then this procedure has no effect.
558	557	*
559	558	*----------------------------------------------------------------------
560	559	*/
561	560
562	561	void
563	562	Tk_UnmaintainGeometry(
564		Tk_Window slave, /* Slave for geometry management. */
565		Tk_Window master) /* Master for slave; must be a descendant of
566		* slave's parent. */
	563	Tk_Window window, /* WIndow for geometry management. */
	564	Tk_Window container) /* Container for window; must be a descendant of
	565	* window's parent. */
567	566	{
568	567	Tcl_HashEntry *hPtr;
569		MaintainMaster *masterPtr;
570		register MaintainSlave slavePtr, prevPtr;
	568	MaintainContainer *containerPtr;
	569	MaintainContent contentPtr, prevPtr;
571	570	Tk_Window ancestor;
572		TkDisplay dispPtr = ((TkWindow ) slave)->dispPtr;
573
574		((TkWindow *)slave)->maintainerPtr = NULL;
575
576		((TkWindow *)slave)->maintainerPtr = NULL;
577		if (master == Tk_Parent(slave)) {
	571	TkDisplay dispPtr = ((TkWindow ) window)->dispPtr;
	572
	573	((TkWindow *)window)->maintainerPtr = NULL;
	574
	575	if (container == Tk_Parent(window)) {
578	576	/*
579		* If the slave is a direct descendant of the master,
	577	* If the window is a direct descendant of the container,
580	578	* Tk_MaintainGeometry will not have set up any of the extra
581	579	* infrastructure. Don't even bother to look for it, just return.
582	580	*/

588	586	Tcl_InitHashTable(&dispPtr->maintainHashTable, TCL_ONE_WORD_KEYS);
589	587	}
590	588
591		if (!(((TkWindow *) slave)->flags & TK_ALREADY_DEAD)) {
592		Tk_UnmapWindow(slave);
593		}
594		hPtr = Tcl_FindHashEntry(&dispPtr->maintainHashTable, (char *) master);
	589	if (!(((TkWindow *) window)->flags & TK_ALREADY_DEAD)) {
	590	Tk_UnmapWindow(window);
	591	}
	592	hPtr = Tcl_FindHashEntry(&dispPtr->maintainHashTable, container);
595	593	if (hPtr == NULL) {
596	594	return;
597	595	}
598		masterPtr = Tcl_GetHashValue(hPtr);
599		slavePtr = masterPtr->slavePtr;
600		if (slavePtr->slave == slave) {
601		masterPtr->slavePtr = slavePtr->nextPtr;
	596	containerPtr = (MaintainContainer *)Tcl_GetHashValue(hPtr);
	597	contentPtr = containerPtr->contentPtr;
	598	if (contentPtr->content == window) {
	599	containerPtr->contentPtr = contentPtr->nextPtr;
602	600	} else {
603		for (prevPtr = slavePtr, slavePtr = slavePtr->nextPtr; ;
604		prevPtr = slavePtr, slavePtr = slavePtr->nextPtr) {
605		if (slavePtr == NULL) {
	601	for (prevPtr = contentPtr, contentPtr = contentPtr->nextPtr; ;
	602	prevPtr = contentPtr, contentPtr = contentPtr->nextPtr) {
	603	if (contentPtr == NULL) {
606	604	return;
607	605	}
608		if (slavePtr->slave == slave) {
609		prevPtr->nextPtr = slavePtr->nextPtr;
	606	if (contentPtr->content == window) {
	607	prevPtr->nextPtr = contentPtr->nextPtr;
610	608	break;
611	609	}
612	610	}
613	611	}
614		Tk_DeleteEventHandler(slavePtr->slave, StructureNotifyMask,
615		MaintainSlaveProc, slavePtr);
616		ckfree(slavePtr);
617		if (masterPtr->slavePtr == NULL) {
618		if (masterPtr->ancestor != NULL) {
619		for (ancestor = master; ; ancestor = Tk_Parent(ancestor)) {
	612	Tk_DeleteEventHandler(contentPtr->content, StructureNotifyMask,
	613	MaintainContentProc, contentPtr);
	614	ckfree(contentPtr);
	615	if (containerPtr->contentPtr == NULL) {
	616	if (containerPtr->ancestor != NULL) {
	617	for (ancestor = container; ; ancestor = Tk_Parent(ancestor)) {
620	618	Tk_DeleteEventHandler(ancestor, StructureNotifyMask,
621		MaintainMasterProc, masterPtr);
622		if (ancestor == masterPtr->ancestor) {
	619	MaintainContainerProc, containerPtr);
	620	if (ancestor == containerPtr->ancestor) {
623	621	break;
624	622	}
625	623	}
626	624	}
627		if (masterPtr->checkScheduled) {
628		Tcl_CancelIdleCall(MaintainCheckProc, masterPtr);
	625	if (containerPtr->checkScheduled) {
	626	Tcl_CancelIdleCall(MaintainCheckProc, containerPtr);
629	627	}
630	628	Tcl_DeleteHashEntry(hPtr);
631		ckfree(masterPtr);
632		}
633		}
634
635		/*
636		*----------------------------------------------------------------------
637		*
638		* MaintainMasterProc --
	629	ckfree(containerPtr);
	630	}
	631	}
	632
	633	/*
	634	*----------------------------------------------------------------------
	635	*
	636	* MaintainContainerProc --
639	637	*
640	638	* This procedure is invoked by the Tk event dispatcher in response to
641		* StructureNotify events on the master or one of its ancestors, on
	639	* StructureNotify events on the container or one of its ancestors, on
642	640	* behalf of Tk_MaintainGeometry.
643	641	*
644	642	* Results:

647	645	* Side effects:
648	646	* It schedules a call to MaintainCheckProc, which will eventually caused
649	647	* the postions and mapped states to be recalculated for all the
650		* maintained slaves of the master. Or, if the master window is being
	648	* maintained windows of the container. Or, if the container window is being
651	649	* deleted then state is cleaned up.
652	650	*
653	651	*----------------------------------------------------------------------
654	652	*/
655	653
656	654	static void
657		MaintainMasterProc(
658		ClientData clientData, /* Pointer to MaintainMaster structure for the
659		* master window. */
	655	MaintainContainerProc(
	656	ClientData clientData, /* Pointer to MaintainContainer structure for the
	657	* container window. */
660	658	XEvent eventPtr) / Describes what just happened. */
661	659	{
662		MaintainMaster *masterPtr = clientData;
663		MaintainSlave *slavePtr;
	660	MaintainContainer containerPtr = (MaintainContainer )clientData;
	661	MaintainContent *contentPtr;
664	662	int done;
665	663
666	664	if ((eventPtr->type == ConfigureNotify)
667	665	\|\| (eventPtr->type == MapNotify)
668	666	\|\| (eventPtr->type == UnmapNotify)) {
669		if (!masterPtr->checkScheduled) {
670		masterPtr->checkScheduled = 1;
671		Tcl_DoWhenIdle(MaintainCheckProc, masterPtr);
	667	if (!containerPtr->checkScheduled) {
	668	containerPtr->checkScheduled = 1;
	669	Tcl_DoWhenIdle(MaintainCheckProc, containerPtr);
672	670	}
673	671	} else if (eventPtr->type == DestroyNotify) {
674	672	/*
675		* Delete all of the state associated with this master, but be careful
676		* not to use masterPtr after the last slave is deleted, since its
	673	* Delete all of the state associated with this container, but be careful
	674	* not to use containerPtr after the last window is deleted, since its
677	675	* memory will have been freed.
678	676	*/
679	677
680	678	done = 0;
681	679	do {
682		slavePtr = masterPtr->slavePtr;
683		if (slavePtr->nextPtr == NULL) {
	680	contentPtr = containerPtr->contentPtr;
	681	if (contentPtr->nextPtr == NULL) {
684	682	done = 1;
685	683	}
686		Tk_UnmaintainGeometry(slavePtr->slave, slavePtr->master);
	684	Tk_UnmaintainGeometry(contentPtr->content, contentPtr->container);
687	685	} while (!done);
688	686	}
689	687	}

691	689	/*
692	690	*----------------------------------------------------------------------
693	691	*
694		* MaintainSlaveProc --
	692	* MaintainContentProc --
695	693	*
696	694	* This procedure is invoked by the Tk event dispatcher in response to
697		* StructureNotify events on a slave being managed by
	695	* StructureNotify events on a window being managed by
698	696	* Tk_MaintainGeometry.
699	697	*
700	698	* Results:

702	700	*
703	701	* Side effects:
704	702	* If the event is a DestroyNotify event then the Maintain state and
705		* event handlers for this slave are deleted.
	703	* event handlers for this window are deleted.
706	704	*
707	705	*----------------------------------------------------------------------
708	706	*/
709	707
710	708	static void
711		MaintainSlaveProc(
712		ClientData clientData, /* Pointer to MaintainSlave structure for
713		* master-slave pair. */
	709	MaintainContentProc(
	710	ClientData clientData, /* Pointer to MaintainContent structure for
	711	* container-window pair. */
714	712	XEvent eventPtr) / Describes what just happened. */
715	713	{
716		MaintainSlave *slavePtr = clientData;
	714	MaintainContent contentPtr = (MaintainContent )clientData;
717	715
718	716	if (eventPtr->type == DestroyNotify) {
719		Tk_UnmaintainGeometry(slavePtr->slave, slavePtr->master);
	717	Tk_UnmaintainGeometry(contentPtr->content, contentPtr->container);
720	718	}
721	719	}
722	720

726	724	* MaintainCheckProc --
727	725	*
728	726	* This procedure is invoked by the Tk event dispatcher as an idle
729		* handler, when a master or one of its ancestors has been reconfigured,
730		* mapped, or unmapped. Its job is to scan all of the slaves for the
731		* master and reposition them, map them, or unmap them as needed to
732		* maintain their geometry relative to the master.
733		*
734		* Results:
735		* None.
736		*
737		* Side effects:
738		* Slaves can get repositioned, mapped, or unmapped.
	727	* handler, when a container or one of its ancestors has been reconfigured,
	728	* mapped, or unmapped. Its job is to scan all of the windows for the
	729	* container and reposition them, map them, or unmap them as needed to
	730	* maintain their geometry relative to the container.
	731	*
	732	* Results:
	733	* None.
	734	*
	735	* Side effects:
	736	* Windows can get repositioned, mapped, or unmapped.
739	737	*
740	738	*----------------------------------------------------------------------
741	739	*/
742	740
743	741	static void
744	742	MaintainCheckProc(
745		ClientData clientData) /* Pointer to MaintainMaster structure for the
746		* master window. */
747		{
748		MaintainMaster *masterPtr = clientData;
749		MaintainSlave *slavePtr;
	743	ClientData clientData) /* Pointer to MaintainContainer structure for the
	744	* container window. */
	745	{
	746	MaintainContainer containerPtr = (MaintainContainer )clientData;
	747	MaintainContent *contentPtr;
750	748	Tk_Window ancestor, parent;
751	749	int x, y, map;
752	750
753		masterPtr->checkScheduled = 0;
754		for (slavePtr = masterPtr->slavePtr; slavePtr != NULL;
755		slavePtr = slavePtr->nextPtr) {
756		parent = Tk_Parent(slavePtr->slave);
757		x = slavePtr->x;
758		y = slavePtr->y;
	751	containerPtr->checkScheduled = 0;
	752	for (contentPtr = containerPtr->contentPtr; contentPtr != NULL;
	753	contentPtr = contentPtr->nextPtr) {
	754	parent = Tk_Parent(contentPtr->content);
	755	x = contentPtr->x;
	756	y = contentPtr->y;
759	757	map = 1;
760		for (ancestor = slavePtr->master; ; ancestor = Tk_Parent(ancestor)) {
	758	for (ancestor = contentPtr->container; ; ancestor = Tk_Parent(ancestor)) {
761	759	if (!Tk_IsMapped(ancestor) && (ancestor != parent)) {
762	760	map = 0;
763	761	}
764	762	if (ancestor == parent) {
765		if ((x != Tk_X(slavePtr->slave))
766		\|\| (y != Tk_Y(slavePtr->slave))) {
767		Tk_MoveWindow(slavePtr->slave, x, y);
	763	if ((x != Tk_X(contentPtr->content))
	764	\|\| (y != Tk_Y(contentPtr->content))) {
	765	Tk_MoveWindow(contentPtr->content, x, y);
768	766	}
769	767	if (map) {
770		Tk_MapWindow(slavePtr->slave);
	768	Tk_MapWindow(contentPtr->content);
771	769	} else {
772		Tk_UnmapWindow(slavePtr->slave);
	770	Tk_UnmapWindow(contentPtr->content);
773	771	}
774	772	break;
775	773	}

+10

-5

generic/tkGet.c less more

492	492
493	493	static void
494	494	FreeUidThreadExitProc(
495		ClientData clientData) /* Not used. */
496		{
497		ThreadSpecificData *tsdPtr =
498		Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
	495	TCL_UNUSED(void *))
	496	{
	497	ThreadSpecificData tsdPtr = (ThreadSpecificData )
	498	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
499	499
500	500	Tcl_DeleteHashTable(&tsdPtr->uidTable);
501	501	tsdPtr->initialized = 0;

528	528	const char string) / String to convert. */
529	529	{
530	530	int dummy;
531		ThreadSpecificData *tsdPtr =
	531	ThreadSpecificData tsdPtr = (ThreadSpecificData )
532	532	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
533	533	Tcl_HashTable *tablePtr = &tsdPtr->uidTable;
534	534

693	693	char *end;
694	694	double d;
695	695
	696	if (!tkwin) {
	697	Tcl_SetObjResult(interp, Tcl_ObjPrintf("bad screen"));
	698	Tcl_SetErrorCode(interp, "TK", "VALUE", "FRACTIONAL_PIXELS", NULL);
	699	return TCL_ERROR;
	700	}
696	701	d = strtod((char *) string, &end);
697	702	if (end == string) {
698	703	goto error;

+19

-20

generic/tkGrab.c less more

165	165	*----------------------------------------------------------------------
166	166	*/
167	167
168		/* ARGSUSED */
169	168	int
170	169	Tk_GrabObjCmd(
171	170	ClientData clientData, /* Main window associated with interpreter. */

222	221	Tcl_WrongNumArgs(interp, 1, objv, "?-global? window");
223	222	return TCL_ERROR;
224	223	}
225		tkwin = Tk_NameToWindow(interp, arg, clientData);
	224	tkwin = Tk_NameToWindow(interp, arg, (Tk_Window)clientData);
226	225	if (tkwin == NULL) {
227	226	return TCL_ERROR;
228	227	}

238	237	Tcl_WrongNumArgs(interp, 1, objv, "?-global? window");
239	238	return TCL_ERROR;
240	239	}
241		tkwin = Tk_NameToWindow(interp, Tcl_GetString(objv[2]), clientData);
	240	tkwin = Tk_NameToWindow(interp, Tcl_GetString(objv[2]), (Tk_Window)clientData);
242	241	if (tkwin == NULL) {
243	242	return TCL_ERROR;
244	243	}

264	263	}
265	264	if (objc == 3) {
266	265	tkwin = Tk_NameToWindow(interp, Tcl_GetString(objv[2]),
267		clientData);
	266	(Tk_Window)clientData);
268	267	if (tkwin == NULL) {
269	268	return TCL_ERROR;
270	269	}

293	292	Tcl_WrongNumArgs(interp, 1, objv, "release window");
294	293	return TCL_ERROR;
295	294	}
296		tkwin = Tk_NameToWindow(interp, Tcl_GetString(objv[2]), clientData);
	295	tkwin = Tk_NameToWindow(interp, Tcl_GetString(objv[2]), (Tk_Window)clientData);
297	296	if (tkwin == NULL) {
298	297	Tcl_ResetResult(interp);
299	298	} else {

310	309	if (objc == 3) {
311	310	globalGrab = 0;
312	311	tkwin = Tk_NameToWindow(interp, Tcl_GetString(objv[2]),
313		clientData);
	312	(Tk_Window)clientData);
314	313	} else {
315	314	globalGrab = 1;
316	315

326	325	return TCL_ERROR;
327	326	}
328	327	tkwin = Tk_NameToWindow(interp, Tcl_GetString(objv[3]),
329		clientData);
	328	(Tk_Window)clientData);
330	329	}
331	330	if (tkwin == NULL) {
332	331	return TCL_ERROR;

343	342	return TCL_ERROR;
344	343	}
345	344	winPtr = (TkWindow *) Tk_NameToWindow(interp, Tcl_GetString(objv[2]),
346		clientData);
	345	(Tk_Window)clientData);
347	346	if (winPtr == NULL) {
348	347	return TCL_ERROR;
349	348	}

637	636
638	637	static void
639	638	ReleaseButtonGrab(
640		register TkDisplay dispPtr)/ Display whose button grab is to be
	639	TkDisplay dispPtr)/ Display whose button grab is to be
641	640	* released. */
642	641	{
643	642	unsigned int serial;

683	682
684	683	int
685	684	TkPointerEvent(
686		register XEvent eventPtr, / Pointer to the event. */
	685	XEvent eventPtr, / Pointer to the event. */
687	686	TkWindow winPtr) / Tk's information for window where event was
688	687	* reported. */
689	688	{
690		register TkWindow *winPtr2;
	689	TkWindow *winPtr2;
691	690	TkDisplay *dispPtr = winPtr->dispPtr;
692	691	unsigned int serial;
693	692	int outsideGrabTree = 0;

871	870	} else {
872	871	if (eventPtr->xbutton.button != AnyButton &&
873	872	((eventPtr->xbutton.state & ALL_BUTTONS)
874		== (unsigned int)TkGetButtonMask(eventPtr->xbutton.button))) {
	873	== TkGetButtonMask(eventPtr->xbutton.button))) {
875	874	ReleaseButtonGrab(dispPtr); /* Note 4. */
876	875	}
877	876	}

906	905
907	906	void
908	907	TkChangeEventWindow(
909		register XEvent eventPtr, / Event to retarget. Must have type
	908	XEvent eventPtr, / Event to retarget. Must have type
910	909	* ButtonPress, ButtonRelease, KeyPress,
911	910	* KeyRelease, MotionNotify, EnterNotify, or
912	911	* LeaveNotify. */
913	912	TkWindow winPtr) / New target window for event. */
914	913	{
915	914	int x, y, sameScreen, bd;
916		register TkWindow *childPtr;
	915	TkWindow *childPtr;
917	916
918	917	eventPtr->xmotion.window = Tk_WindowId(winPtr);
919	918	if (eventPtr->xmotion.root ==

994	993	Tcl_QueuePosition position) /* Position at which events are added to the
995	994	* system event queue. */
996	995	{
997		register TkWindow *winPtr;
	996	TkWindow *winPtr;
998	997	int upLevels, downLevels, i, j, focus;
999	998
1000	999	/*

1187	1186
1188	1187	void
1189	1188	TkGrabDeadWindow(
1190		register TkWindow winPtr) / Window that is in the process of being
	1189	TkWindow winPtr) / Window that is in the process of being
1191	1190	* deleted. */
1192	1191	{
1193	1192	TkDisplay *dispPtr = winPtr->dispPtr;

1277	1276	ClientData arg,
1278	1277	XEvent *eventPtr)
1279	1278	{
1280		GrabInfo *info = arg;
	1279	GrabInfo info = (GrabInfo )arg;
1281	1280	int mode, diff;
1282	1281
1283	1282	/*

1335	1334	{
1336	1335	NewGrabWinEvent *grabEvPtr;
1337	1336
1338		grabEvPtr = ckalloc(sizeof(NewGrabWinEvent));
	1337	grabEvPtr = (NewGrabWinEvent *)ckalloc(sizeof(NewGrabWinEvent));
1339	1338	grabEvPtr->header.proc = GrabWinEventProc;
1340	1339	grabEvPtr->dispPtr = dispPtr;
1341	1340	if (grabWinPtr == NULL) {

1370	1369	static int
1371	1370	GrabWinEventProc(
1372	1371	Tcl_Event evPtr, / Event of type NewGrabWinEvent. */
1373		int flags) /* Flags argument to Tcl_DoOneEvent: indicates
	1372	TCL_UNUSED(int)) /* Flags argument to Tcl_DoOneEvent: indicates
1374	1373	* what kinds of events are being processed
1375	1374	* right now. */
1376	1375	{

1415	1414	int countPtr2) / Store nesting level of winPtr2 within
1416	1415	* common ancestor here. */
1417	1416	{
1418		register TkWindow *winPtr;
	1417	TkWindow *winPtr;
1419	1418	TkWindow *ancestorPtr;
1420	1419	int count1, count2, i;
1421	1420

+684

-684

generic/tkGrid.c less more

65	65	#define GRID_DEFAULT_ANCHOR TK_ANCHOR_NW
66	66
67	67	/*
68		* Structure to hold information for grid masters. A slot is either a row or
	68	* Structure to hold information for grid containers. A slot is either a row or
69	69	* column.
70	70	*/
71	71

79	79	* inproportion to their weights. */
80	80	int pad; /* Extra padding, in pixels, required for this
81	81	* slot. This amount is "added" to the largest
82		* slave in the slot. */
	82	* content in the slot. */
83	83	Tk_Uid uniform; /* Value of -uniform option. It is used to
84	84	* group slots that should have the same
85	85	* size. */

98	98	*/
99	99
100	100	typedef struct GridLayout {
101		struct Gridder binNextPtr; / The next slave window in this bin. Each bin
102		* contains a list of all slaves whose spans
	101	struct Gridder binNextPtr; / The next content window in this bin. Each bin
	102	* contains a list of all content whose spans
103	103	* are >1 and whose right edges fall in this
104	104	* slot. */
105	105	int minSize; /* Minimum size needed for this slot, in
106	106	* pixels. This is the space required to hold
107		* any slaves contained entirely in this slot,
	107	* any content contained entirely in this slot,
108	108	* adjusted for any slot constrants, such as
109	109	* size or padding. */
110	110	int pad; /* Padding needed for this slot */

123	123	} GridLayout;
124	124
125	125	/*
126		* Keep one of these for each geometry master.
	126	* Keep one of these for each geometry container.
127	127	*/
128	128
129	129	typedef struct {
130	130	SlotInfo columnPtr; / Pointer to array of column constraints. */
131	131	SlotInfo rowPtr; / Pointer to array of row constraints. */
132		int columnEnd; /* The last column occupied by any slave. */
	132	int columnEnd; /* The last column occupied by any content. */
133	133	int columnMax; /* The number of columns with constraints. */
134	134	int columnSpace; /* The number of slots currently allocated for
135	135	* column constraints. */
136		int rowEnd; /* The last row occupied by any slave. */
	136	int rowEnd; /* The last row occupied by any content. */
137	137	int rowMax; /* The number of rows with constraints. */
138	138	int rowSpace; /* The number of slots currently allocated for
139	139	* row constraints. */
140	140	int startX; /* Pixel offset of this layout within its
141		* master. */
	141	* container. */
142	142	int startY; /* Pixel offset of this layout within its
143		* master. */
	143	* container. */
144	144	Tk_Anchor anchor; /* Value of anchor option: specifies where a
145	145	* grid without weight should be placed. */
146		} GridMaster;
	146	} GridContainer;
147	147
148	148	/*
149	149	* For each window that the grid cares about (either because the window is
150		* managed by the grid or because the window has slaves that are managed by
	150	* managed by the grid or because the window has content that are managed by
151	151	* the grid), there is a structure of the following type:
152	152	*/
153	153

156	156	* window has been deleted, but the gridder
157	157	* hasn't had a chance to clean up yet because
158	158	* the structure is still in use. */
159		struct Gridder masterPtr; / Master window within which this window is
	159	struct Gridder containerPtr; / Container window within which this window is
160	160	* managed (NULL means this window isn't
161	161	* managed by the gridder). */
162		struct Gridder nextPtr; / Next window managed within same master.
	162	struct Gridder nextPtr; / Next window managed within same container.
163	163	* List order doesn't matter. */
164		struct Gridder slavePtr; / First in list of slaves managed inside this
165		* window (NULL means no grid slaves). */
166		GridMaster masterDataPtr; / Additional data for geometry master. */
167		Tcl_Obj in; / Store master name when removed. */
	164	struct Gridder contentPtr; / First in list of content managed inside this
	165	* window (NULL means no grid content). */
	166	GridContainer containerDataPtr; / Additional data for geometry container. */
	167	Tcl_Obj in; / Store container name when removed. */
168	168	int column, row; /* Location in the grid (starting from
169	169	* zero). */
170		int numCols, numRows; /* Number of columns or rows this slave spans.
	170	int numCols, numRows; /* Number of columns or rows this content spans.
171	171	* Should be at least 1. */
172	172	int padX, padY; /* Total additional pixels to leave around the
173	173	* window. Some is of this space is on each

184	184	* sticks to. See below for definitions */
185	185	int doubleBw; /* Twice the window's last known border width.
186	186	* If this changes, the window must be
187		* re-arranged within its master. */
	187	* re-arranged within its container. */
188	188	int abortPtr; / If non-NULL, it means that there is a
189	189	* nested call to ArrangeGrid already working
190	190	* on this window. *abortPtr may be set to 1
191	191	* to abort that nested call. This happens,
192		* for example, if tkwin or any of its slaves
	192	* for example, if tkwin or any of its content
193	193	* is deleted. */
194	194	int flags; /* Miscellaneous flags; see below for
195	195	* definitions. */

198	198	* These fields are used temporarily for layout calculations only.
199	199	*/
200	200
201		struct Gridder binNextPtr; / Link to next span>1 slave in this bin. */
	201	struct Gridder binNextPtr; / Link to next span>1 content in this bin. */
202	202	int size; /* Nominal size (width or height) in pixels of
203		* the slave. This includes the padding. */
	203	* the content. This includes the padding. */
204	204	} Gridder;
205	205
206	206	/*

234	234	* Flag values for Grid structures:
235	235	*
236	236	* REQUESTED_RELAYOUT 1 means a Tcl_DoWhenIdle request has already
237		* been made to re-arrange all the slaves of this
	237	* been made to re-arrange all the content of this
238	238	* window.
239	239	* DONT_PROPAGATE 1 means don't set this window's requested
240		* size. 0 means if this window is a master then
	240	* size. 0 means if this window is a container then
241	241	* Tk will set its requested size to fit the
242		* needs of its slaves.
243		* ALLOCED_MASTER 1 means that Grid has allocated itself as
244		* geometry master for this window.
	242	* needs of its content.
	243	* ALLOCED_CONTAINER 1 means that Grid has allocated itself as
	244	* geometry container for this window.
245	245	*/
246	246
247	247	#define REQUESTED_RELAYOUT 1
248	248	#define DONT_PROPAGATE 2
249		#define ALLOCED_MASTER 4
	249	#define ALLOCED_CONTAINER 4
250	250
251	251	/*
252	252	* Prototypes for procedures used only in this file:
253	253	*/
254	254
255		static void AdjustForSticky(Gridder slavePtr, int xPtr,
	255	static void AdjustForSticky(Gridder contentPtr, int xPtr,
256	256	int yPtr, int widthPtr, int *heightPtr);
257	257	static int AdjustOffsets(int width, int elements,
258	258	SlotInfo *slotPtr);
259	259	static void ArrangeGrid(ClientData clientData);
260		static int CheckSlotData(Gridder *masterPtr, int slot,
	260	static int CheckSlotData(Gridder *containerPtr, int slot,
261	261	int slotType, int checkOnly);
262		static int ConfigureSlaves(Tcl_Interp *interp, Tk_Window tkwin,
	262	static int ConfigureContent(Tcl_Interp *interp, Tk_Window tkwin,
263	263	int objc, Tcl_Obj *const objv[]);
264	264	static void DestroyGrid(void *memPtr);
265	265	static Gridder * GetGrid(Tk_Window tkwin);

283	283	Tcl_Obj *const objv[]);
284	284	static int GridSizeCommand(Tk_Window tkwin, Tcl_Interp *interp,
285	285	int objc, Tcl_Obj *const objv[]);
286		static int GridSlavesCommand(Tk_Window tkwin, Tcl_Interp *interp,
	286	static int GridContentCommand(Tk_Window tkwin, Tcl_Interp *interp,
287	287	int objc, Tcl_Obj *const objv[]);
288	288	static void GridStructureProc(ClientData clientData,
289	289	XEvent *eventPtr);
290		static void GridLostSlaveProc(ClientData clientData,
	290	static void GridLostContentProc(ClientData clientData,
291	291	Tk_Window tkwin);
292	292	static void GridReqProc(ClientData clientData, Tk_Window tkwin);
293		static void InitMasterData(Gridder *masterPtr);
	293	static void InitContainerData(Gridder *containerPtr);
294	294	static Tcl_Obj * NewPairObj(int, int);
295	295	static Tcl_Obj * NewQuadObj(int, int, int, int);
296	296	static int ResolveConstraints(Gridder *gridPtr, int rowOrColumn,
297	297	int maxOffset);
298	298	static void SetGridSize(Gridder *gridPtr);
299		static int SetSlaveColumn(Tcl_Interp interp, Gridder slavePtr,
	299	static int SetContentColumn(Tcl_Interp interp, Gridder contentPtr,
300	300	int column, int numCols);
301		static int SetSlaveRow(Tcl_Interp interp, Gridder slavePtr,
	301	static int SetContentRow(Tcl_Interp interp, Gridder contentPtr,
302	302	int row, int numRows);
303	303	static Tcl_Obj * StickyToObj(int flags);
304	304	static int StringToSticky(const char *string);

307	307	static const Tk_GeomMgr gridMgrType = {
308	308	"grid", /* name */
309	309	GridReqProc, /* requestProc */
310		GridLostSlaveProc, /* lostSlaveProc */
	310	GridLostContentProc, /* lostSlaveProc */
311	311	};
312	312
313	313	/*

334	334	int objc, /* Number of arguments. */
335	335	Tcl_Obj const objv[]) / Argument objects. */
336	336	{
337		Tk_Window tkwin = clientData;
	337	Tk_Window tkwin = (Tk_Window)clientData;
338	338	static const char *const optionStrings[] = {
339	339	"anchor", "bbox", "columnconfigure", "configure",
340		"forget", "info", "location", "propagate", "remove",
341		"rowconfigure", "size", "slaves", NULL
	340	"content", "forget", "info", "location", "propagate",
	341	"remove", "rowconfigure", "size", "slaves", NULL
342	342	};
343	343	enum options {
344	344	GRID_ANCHOR, GRID_BBOX, GRID_COLUMNCONFIGURE, GRID_CONFIGURE,
345		GRID_FORGET, GRID_INFO, GRID_LOCATION, GRID_PROPAGATE, GRID_REMOVE,
346		GRID_ROWCONFIGURE, GRID_SIZE, GRID_SLAVES
	345	GRID_CONTENT, GRID_FORGET, GRID_INFO, GRID_LOCATION, GRID_PROPAGATE,
	346	GRID_REMOVE, GRID_ROWCONFIGURE, GRID_SIZE, GRID_SLAVES
347	347	};
348	348	int index;
349	349

352	352
353	353	if ((argv1[0] == '.') \|\| (argv1[0] == REL_SKIP) \|\|
354	354	(argv1[0] == REL_VERT)) {
355		return ConfigureSlaves(interp, tkwin, objc-1, objv+1);
	355	return ConfigureContent(interp, tkwin, objc-1, objv+1);
356	356	}
357	357	}
358	358	if (objc < 3) {

371	371	case GRID_BBOX:
372	372	return GridBboxCommand(tkwin, interp, objc, objv);
373	373	case GRID_CONFIGURE:
374		return ConfigureSlaves(interp, tkwin, objc-2, objv+2);
	374	return ConfigureContent(interp, tkwin, objc-2, objv+2);
375	375	case GRID_FORGET:
376	376	case GRID_REMOVE:
377	377	return GridForgetRemoveCommand(tkwin, interp, objc, objv);

384	384	case GRID_SIZE:
385	385	return GridSizeCommand(tkwin, interp, objc, objv);
386	386	case GRID_SLAVES:
387		return GridSlavesCommand(tkwin, interp, objc, objv);
	387	case GRID_CONTENT:
	388	return GridContentCommand(tkwin, interp, objc, objv);
388	389
389	390	/*
390	391	* Sample argument combinations:
391		* grid columnconfigure <master> <index> -option
392		* grid columnconfigure <master> <index> -option value -option value
393		* grid rowconfigure <master> <index>
394		* grid rowconfigure <master> <index> -option
395		* grid rowconfigure <master> <index> -option value -option value.
	392	* grid columnconfigure <container> <index> -option
	393	* grid columnconfigure <container> <index> -option value -option value
	394	* grid rowconfigure <container> <index>
	395	* grid rowconfigure <container> <index> -option
	396	* grid rowconfigure <container> <index> -option value -option value.
396	397	*/
397	398
398	399	case GRID_COLUMNCONFIGURE:

430	431	int objc, /* Number of arguments. */
431	432	Tcl_Obj const objv[]) / Argument objects. */
432	433	{
433		Tk_Window master;
434		Gridder *masterPtr;
435		GridMaster *gridPtr;
	434	Tk_Window container;
	435	Gridder *containerPtr;
	436	GridContainer *gridPtr;
436	437	Tk_Anchor old;
437	438
438	439	if (objc > 4) {

440	441	return TCL_ERROR;
441	442	}
442	443
443		if (TkGetWindowFromObj(interp, tkwin, objv[2], &master) != TCL_OK) {
	444	if (TkGetWindowFromObj(interp, tkwin, objv[2], &container) != TCL_OK) {
444	445	return TCL_ERROR;
445	446	}
446		masterPtr = GetGrid(master);
	447	containerPtr = GetGrid(container);
447	448
448	449	if (objc == 3) {
449		gridPtr = masterPtr->masterDataPtr;
	450	gridPtr = containerPtr->containerDataPtr;
450	451	Tcl_SetObjResult(interp, Tcl_NewStringObj(
451	452	Tk_NameOfAnchor(gridPtr?gridPtr->anchor:GRID_DEFAULT_ANCHOR),
452	453	-1));
453	454	return TCL_OK;
454	455	}
455	456
456		InitMasterData(masterPtr);
457		gridPtr = masterPtr->masterDataPtr;
	457	InitContainerData(containerPtr);
	458	gridPtr = containerPtr->containerDataPtr;
458	459	old = gridPtr->anchor;
459	460	if (Tk_GetAnchorFromObj(interp, objv[3], &gridPtr->anchor) != TCL_OK) {
460	461	return TCL_ERROR;

465	466	*/
466	467
467	468	if (old != gridPtr->anchor) {
468		if (masterPtr->abortPtr != NULL) {
469		*masterPtr->abortPtr = 1;
470		}
471		if (!(masterPtr->flags & REQUESTED_RELAYOUT)) {
472		masterPtr->flags \|= REQUESTED_RELAYOUT;
473		Tcl_DoWhenIdle(ArrangeGrid, masterPtr);
	469	if (containerPtr->abortPtr != NULL) {
	470	*containerPtr->abortPtr = 1;
	471	}
	472	if (!(containerPtr->flags & REQUESTED_RELAYOUT)) {
	473	containerPtr->flags \|= REQUESTED_RELAYOUT;
	474	Tcl_DoWhenIdle(ArrangeGrid, containerPtr);
474	475	}
475	476	}
476	477	return TCL_OK;

499	500	int objc, /* Number of arguments. */
500	501	Tcl_Obj const objv[]) / Argument objects. */
501	502	{
502		Tk_Window master;
503		Gridder masterPtr; / master grid record */
504		GridMaster gridPtr; / pointer to grid data */
	503	Tk_Window container;
	504	Gridder containerPtr; / container grid record */
	505	GridContainer gridPtr; / pointer to grid data */
505	506	int row, column; /* origin for bounding box */
506	507	int row2, column2; /* end of bounding box */
507	508	int endX, endY; /* last column/row in the layout */

513	514	return TCL_ERROR;
514	515	}
515	516
516		if (TkGetWindowFromObj(interp, tkwin, objv[2], &master) != TCL_OK) {
	517	if (TkGetWindowFromObj(interp, tkwin, objv[2], &container) != TCL_OK) {
517	518	return TCL_ERROR;
518	519	}
519		masterPtr = GetGrid(master);
	520	containerPtr = GetGrid(container);
520	521
521	522	if (objc >= 5) {
522	523	if (Tcl_GetIntFromObj(interp, objv[3], &column) != TCL_OK) {

538	539	}
539	540	}
540	541
541		gridPtr = masterPtr->masterDataPtr;
	542	gridPtr = containerPtr->containerDataPtr;
542	543	if (gridPtr == NULL) {
543	544	Tcl_SetObjResult(interp, NewQuadObj(0, 0, 0, 0));
544	545	return TCL_OK;
545	546	}
546	547
547		SetGridSize(masterPtr);
	548	SetGridSize(containerPtr);
548	549	endX = MAX(gridPtr->columnEnd, gridPtr->columnMax);
549	550	endY = MAX(gridPtr->rowEnd, gridPtr->rowMax);
550	551

629	630	int objc, /* Number of arguments. */
630	631	Tcl_Obj const objv[]) / Argument objects. */
631	632	{
632		Tk_Window slave;
633		Gridder *slavePtr;
	633	Tk_Window content;
	634	Gridder *contentPtr;
634	635	int i;
635	636	const char *string = Tcl_GetString(objv[1]);
636	637	char c = string[0];
637	638
638	639	for (i = 2; i < objc; i++) {
639		if (TkGetWindowFromObj(interp, tkwin, objv[i], &slave) != TCL_OK) {
	640	if (TkGetWindowFromObj(interp, tkwin, objv[i], &content) != TCL_OK) {
640	641	return TCL_ERROR;
641	642	}
642	643
643		slavePtr = GetGrid(slave);
644		if (slavePtr->masterPtr != NULL) {
	644	contentPtr = GetGrid(content);
	645	if (contentPtr->containerPtr != NULL) {
645	646	/*
646	647	* For "forget", reset all the settings to their defaults
647	648	*/
648	649
649	650	if (c == 'f') {
650		slavePtr->column = -1;
651		slavePtr->row = -1;
652		slavePtr->numCols = 1;
653		slavePtr->numRows = 1;
654		slavePtr->padX = 0;
655		slavePtr->padY = 0;
656		slavePtr->padLeft = 0;
657		slavePtr->padTop = 0;
658		slavePtr->iPadX = 0;
659		slavePtr->iPadY = 0;
660		if (slavePtr->in != NULL) {
661		Tcl_DecrRefCount(slavePtr->in);
662		slavePtr->in = NULL;
	651	contentPtr->column = -1;
	652	contentPtr->row = -1;
	653	contentPtr->numCols = 1;
	654	contentPtr->numRows = 1;
	655	contentPtr->padX = 0;
	656	contentPtr->padY = 0;
	657	contentPtr->padLeft = 0;
	658	contentPtr->padTop = 0;
	659	contentPtr->iPadX = 0;
	660	contentPtr->iPadY = 0;
	661	if (contentPtr->in != NULL) {
	662	Tcl_DecrRefCount(contentPtr->in);
	663	contentPtr->in = NULL;
663	664	}
664		slavePtr->doubleBw = 2*Tk_Changes(tkwin)->border_width;
665		if (slavePtr->flags & REQUESTED_RELAYOUT) {
666		Tcl_CancelIdleCall(ArrangeGrid, slavePtr);
	665	contentPtr->doubleBw = 2*Tk_Changes(tkwin)->border_width;
	666	if (contentPtr->flags & REQUESTED_RELAYOUT) {
	667	Tcl_CancelIdleCall(ArrangeGrid, contentPtr);
667	668	}
668		slavePtr->flags = 0;
669		slavePtr->sticky = 0;
	669	contentPtr->flags = 0;
	670	contentPtr->sticky = 0;
670	671	} else {
671	672	/*
672		* When removing, store name of master to be able to
673		* restore it later, even if the master is recreated.
	673	* When removing, store name of container to be able to
	674	* restore it later, even if the container is recreated.
674	675	*/
675	676
676		if (slavePtr->in != NULL) {
677		Tcl_DecrRefCount(slavePtr->in);
678		slavePtr->in = NULL;
	677	if (contentPtr->in != NULL) {
	678	Tcl_DecrRefCount(contentPtr->in);
	679	contentPtr->in = NULL;
679	680	}
680		if (slavePtr->masterPtr != NULL) {
681		slavePtr->in = Tcl_NewStringObj(
682		Tk_PathName(slavePtr->masterPtr->tkwin), -1);
683		Tcl_IncrRefCount(slavePtr->in);
	681	if (contentPtr->containerPtr != NULL) {
	682	contentPtr->in = Tcl_NewStringObj(
	683	Tk_PathName(contentPtr->containerPtr->tkwin), -1);
	684	Tcl_IncrRefCount(contentPtr->in);
684	685	}
685	686	}
686		Tk_ManageGeometry(slave, NULL, NULL);
687		if (slavePtr->masterPtr->tkwin != Tk_Parent(slavePtr->tkwin)) {
688		Tk_UnmaintainGeometry(slavePtr->tkwin,
689		slavePtr->masterPtr->tkwin);
690		}
691		Unlink(slavePtr);
692		Tk_UnmapWindow(slavePtr->tkwin);
	687	Tk_ManageGeometry(content, NULL, NULL);
	688	if (contentPtr->containerPtr->tkwin != Tk_Parent(contentPtr->tkwin)) {
	689	Tk_UnmaintainGeometry(contentPtr->tkwin,
	690	contentPtr->containerPtr->tkwin);
	691	}
	692	Unlink(contentPtr);
	693	Tk_UnmapWindow(contentPtr->tkwin);
693	694	}
694	695	}
695	696	return TCL_OK;

719	720	int objc, /* Number of arguments. */
720	721	Tcl_Obj const objv[]) / Argument objects. */
721	722	{
722		register Gridder *slavePtr;
723		Tk_Window slave;
	723	Gridder *contentPtr;
	724	Tk_Window content;
724	725	Tcl_Obj *infoObj;
725	726
726	727	if (objc != 3) {
727	728	Tcl_WrongNumArgs(interp, 2, objv, "window");
728	729	return TCL_ERROR;
729	730	}
730		if (TkGetWindowFromObj(interp, tkwin, objv[2], &slave) != TCL_OK) {
	731	if (TkGetWindowFromObj(interp, tkwin, objv[2], &content) != TCL_OK) {
731	732	return TCL_ERROR;
732	733	}
733		slavePtr = GetGrid(slave);
734		if (slavePtr->masterPtr == NULL) {
	734	contentPtr = GetGrid(content);
	735	if (contentPtr->containerPtr == NULL) {
735	736	Tcl_ResetResult(interp);
736	737	return TCL_OK;
737	738	}
738	739
739	740	infoObj = Tcl_NewObj();
740	741	Tcl_DictObjPut(NULL, infoObj, Tcl_NewStringObj("-in", -1),
741		TkNewWindowObj(slavePtr->masterPtr->tkwin));
	742	TkNewWindowObj(contentPtr->containerPtr->tkwin));
742	743	Tcl_DictObjPut(NULL, infoObj, Tcl_NewStringObj("-column", -1),
743		Tcl_NewIntObj(slavePtr->column));
	744	Tcl_NewIntObj(contentPtr->column));
744	745	Tcl_DictObjPut(NULL, infoObj, Tcl_NewStringObj("-row", -1),
745		Tcl_NewIntObj(slavePtr->row));
	746	Tcl_NewIntObj(contentPtr->row));
746	747	Tcl_DictObjPut(NULL, infoObj, Tcl_NewStringObj("-columnspan", -1),
747		Tcl_NewIntObj(slavePtr->numCols));
	748	Tcl_NewIntObj(contentPtr->numCols));
748	749	Tcl_DictObjPut(NULL, infoObj, Tcl_NewStringObj("-rowspan", -1),
749		Tcl_NewIntObj(slavePtr->numRows));
750		TkAppendPadAmount(infoObj, "-ipadx", slavePtr->iPadX/2, slavePtr->iPadX);
751		TkAppendPadAmount(infoObj, "-ipady", slavePtr->iPadY/2, slavePtr->iPadY);
752		TkAppendPadAmount(infoObj, "-padx", slavePtr->padLeft, slavePtr->padX);
753		TkAppendPadAmount(infoObj, "-pady", slavePtr->padTop, slavePtr->padY);
	750	Tcl_NewIntObj(contentPtr->numRows));
	751	TkAppendPadAmount(infoObj, "-ipadx", contentPtr->iPadX/2, contentPtr->iPadX);
	752	TkAppendPadAmount(infoObj, "-ipady", contentPtr->iPadY/2, contentPtr->iPadY);
	753	TkAppendPadAmount(infoObj, "-padx", contentPtr->padLeft, contentPtr->padX);
	754	TkAppendPadAmount(infoObj, "-pady", contentPtr->padTop, contentPtr->padY);
754	755	Tcl_DictObjPut(NULL, infoObj, Tcl_NewStringObj("-sticky", -1),
755		StickyToObj(slavePtr->sticky));
	756	StickyToObj(contentPtr->sticky));
756	757	Tcl_SetObjResult(interp, infoObj);
757	758	return TCL_OK;
758	759	}

781	782	int objc, /* Number of arguments. */
782	783	Tcl_Obj const objv[]) / Argument objects. */
783	784	{
784		Tk_Window master;
785		Gridder masterPtr; / Master grid record. */
786		GridMaster gridPtr; / Pointer to grid data. */
787		register SlotInfo *slotPtr;
788		int x, y; /* Offset in pixels, from edge of master. */
	785	Tk_Window container;
	786	Gridder containerPtr; / Container grid record. */
	787	GridContainer gridPtr; / Pointer to grid data. */
	788	SlotInfo *slotPtr;
	789	int x, y; /* Offset in pixels, from edge of container. */
789	790	int i, j; /* Corresponding column and row indeces. */
790	791	int endX, endY; /* End of grid. */
791	792

794	795	return TCL_ERROR;
795	796	}
796	797
797		if (TkGetWindowFromObj(interp, tkwin, objv[2], &master) != TCL_OK) {
	798	if (TkGetWindowFromObj(interp, tkwin, objv[2], &container) != TCL_OK) {
798	799	return TCL_ERROR;
799	800	}
800	801
801		if (Tk_GetPixelsFromObj(interp, master, objv[3], &x) != TCL_OK) {
	802	if (Tk_GetPixelsFromObj(interp, container, objv[3], &x) != TCL_OK) {
802	803	return TCL_ERROR;
803	804	}
804		if (Tk_GetPixelsFromObj(interp, master, objv[4], &y) != TCL_OK) {
	805	if (Tk_GetPixelsFromObj(interp, container, objv[4], &y) != TCL_OK) {
805	806	return TCL_ERROR;
806	807	}
807	808
808		masterPtr = GetGrid(master);
809		if (masterPtr->masterDataPtr == NULL) {
	809	containerPtr = GetGrid(container);
	810	if (containerPtr->containerDataPtr == NULL) {
810	811	Tcl_SetObjResult(interp, NewPairObj(-1, -1));
811	812	return TCL_OK;
812	813	}
813		gridPtr = masterPtr->masterDataPtr;
	814	gridPtr = containerPtr->containerDataPtr;
814	815
815	816	/*
816	817	* Update any pending requests. This is not always the steady state value,

818	819	* its easy to get.
819	820	*/
820	821
821		while (masterPtr->flags & REQUESTED_RELAYOUT) {
822		Tcl_CancelIdleCall(ArrangeGrid, masterPtr);
823		ArrangeGrid(masterPtr);
824		}
825		SetGridSize(masterPtr);
	822	while (containerPtr->flags & REQUESTED_RELAYOUT) {
	823	Tcl_CancelIdleCall(ArrangeGrid, containerPtr);
	824	ArrangeGrid(containerPtr);
	825	}
	826	SetGridSize(containerPtr);
826	827	endX = MAX(gridPtr->columnEnd, gridPtr->columnMax);
827	828	endY = MAX(gridPtr->rowEnd, gridPtr->rowMax);
828	829
829		slotPtr = masterPtr->masterDataPtr->columnPtr;
830		if (x < masterPtr->masterDataPtr->startX) {
	830	slotPtr = containerPtr->containerDataPtr->columnPtr;
	831	if (x < containerPtr->containerDataPtr->startX) {
831	832	i = -1;
832	833	} else {
833		x -= masterPtr->masterDataPtr->startX;
	834	x -= containerPtr->containerDataPtr->startX;
834	835	for (i = 0; slotPtr[i].offset < x && i < endX; i++) {
835	836	/* null body */
836	837	}
837	838	}
838	839
839		slotPtr = masterPtr->masterDataPtr->rowPtr;
840		if (y < masterPtr->masterDataPtr->startY) {
	840	slotPtr = containerPtr->containerDataPtr->rowPtr;
	841	if (y < containerPtr->containerDataPtr->startY) {
841	842	j = -1;
842	843	} else {
843		y -= masterPtr->masterDataPtr->startY;
	844	y -= containerPtr->containerDataPtr->startY;
844	845	for (j = 0; slotPtr[j].offset < y && j < endY; j++) {
845	846	/* null body */
846	847	}

874	875	int objc, /* Number of arguments. */
875	876	Tcl_Obj const objv[]) / Argument objects. */
876	877	{
877		Tk_Window master;
878		Gridder *masterPtr;
	878	Tk_Window container;
	879	Gridder *containerPtr;
879	880	int propagate, old;
880	881
881	882	if (objc > 4) {

883	884	return TCL_ERROR;
884	885	}
885	886
886		if (TkGetWindowFromObj(interp, tkwin, objv[2], &master) != TCL_OK) {
	887	if (TkGetWindowFromObj(interp, tkwin, objv[2], &container) != TCL_OK) {
887	888	return TCL_ERROR;
888	889	}
889		masterPtr = GetGrid(master);
	890	containerPtr = GetGrid(container);
890	891	if (objc == 3) {
891	892	Tcl_SetObjResult(interp,
892		Tcl_NewBooleanObj(!(masterPtr->flags & DONT_PROPAGATE)));
	893	Tcl_NewBooleanObj(!(containerPtr->flags & DONT_PROPAGATE)));
893	894	return TCL_OK;
894	895	}
895	896	if (Tcl_GetBooleanFromObj(interp, objv[3], &propagate) != TCL_OK) {

900	901	* Only request a relayout if the propagation bit changes.
901	902	*/
902	903
903		old = !(masterPtr->flags & DONT_PROPAGATE);
	904	old = !(containerPtr->flags & DONT_PROPAGATE);
904	905	if (propagate != old) {
905	906	if (propagate) {
906	907	/*
907		* If we have slaves, we need to register as geometry master.
	908	* If we have content, we need to register as geometry container.
908	909	*/
909	910
910		if (masterPtr->slavePtr != NULL) {
911		if (TkSetGeometryMaster(interp, master, "grid") != TCL_OK) {
	911	if (containerPtr->contentPtr != NULL) {
	912	if (TkSetGeometryContainer(interp, container, "grid") != TCL_OK) {
912	913	return TCL_ERROR;
913	914	}
914		masterPtr->flags \|= ALLOCED_MASTER;
915		}
916		masterPtr->flags &= ~DONT_PROPAGATE;
	915	containerPtr->flags \|= ALLOCED_CONTAINER;
	916	}
	917	containerPtr->flags &= ~DONT_PROPAGATE;
917	918	} else {
918		if (masterPtr->flags & ALLOCED_MASTER) {
919		TkFreeGeometryMaster(master, "grid");
920		masterPtr->flags &= ~ALLOCED_MASTER;
921		}
922		masterPtr->flags \|= DONT_PROPAGATE;
	919	if (containerPtr->flags & ALLOCED_CONTAINER) {
	920	TkFreeGeometryContainer(container, "grid");
	921	containerPtr->flags &= ~ALLOCED_CONTAINER;
	922	}
	923	containerPtr->flags \|= DONT_PROPAGATE;
923	924	}
924	925
925	926	/*
926		* Re-arrange the master to allow new geometry information to
927		* propagate upwards to the master's master.
	927	* Re-arrange the container to allow new geometry information to
	928	* propagate upwards to the container's container.
928	929	*/
929	930
930		if (masterPtr->abortPtr != NULL) {
931		*masterPtr->abortPtr = 1;
932		}
933		if (!(masterPtr->flags & REQUESTED_RELAYOUT)) {
934		masterPtr->flags \|= REQUESTED_RELAYOUT;
935		Tcl_DoWhenIdle(ArrangeGrid, masterPtr);
	931	if (containerPtr->abortPtr != NULL) {
	932	*containerPtr->abortPtr = 1;
	933	}
	934	if (!(containerPtr->flags & REQUESTED_RELAYOUT)) {
	935	containerPtr->flags \|= REQUESTED_RELAYOUT;
	936	Tcl_DoWhenIdle(ArrangeGrid, containerPtr);
936	937	}
937	938	}
938	939	return TCL_OK;

962	963	int objc, /* Number of arguments. */
963	964	Tcl_Obj const objv[]) / Argument objects. */
964	965	{
965		Tk_Window master, slave;
966		Gridder masterPtr, slavePtr;
	966	Tk_Window container, content;
	967	Gridder containerPtr, contentPtr;
967	968	SlotInfo *slotPtr = NULL;
968	969	int slot; /* the column or row number */
969	970	int slotType; /* COLUMN or ROW */

987	988	return TCL_ERROR;
988	989	}
989	990
990		if (TkGetWindowFromObj(interp, tkwin, objv[2], &master) != TCL_OK) {
	991	if (TkGetWindowFromObj(interp, tkwin, objv[2], &container) != TCL_OK) {
991	992	return TCL_ERROR;
992	993	}
993	994

1008	1009	return TCL_ERROR;
1009	1010	}
1010	1011
1011		masterPtr = GetGrid(master);
1012		first = 0; /* lint */
1013		last = 0; /* lint */
	1012	containerPtr = GetGrid(container);
	1013	first = 0;
	1014	last = 0;
1014	1015
1015	1016	if ((objc == 4) \|\| (objc == 5)) {
1016	1017	if (lObjc != 1) {

1028	1029	Tcl_DecrRefCount(listCopy);
1029	1030	return TCL_ERROR;
1030	1031	}
1031		ok = CheckSlotData(masterPtr, slot, slotType, /* checkOnly */ 1);
	1032	ok = CheckSlotData(containerPtr, slot, slotType, /* checkOnly */ 1);
1032	1033	if (ok == TCL_OK) {
1033	1034	slotPtr = (slotType == COLUMN) ?
1034		masterPtr->masterDataPtr->columnPtr :
1035		masterPtr->masterDataPtr->rowPtr;
	1035	containerPtr->containerDataPtr->columnPtr :
	1036	containerPtr->containerDataPtr->rowPtr;
1036	1037	}
1037	1038
1038	1039	/*

1100	1101	}
1101	1102
1102	1103	for (j = 0; j < lObjc; j++) {
1103		int allSlaves = 0;
	1104	int allContent = 0;
1104	1105
1105	1106	if (Tcl_GetIntFromObj(NULL, lObjv[j], &slot) == TCL_OK) {
1106	1107	first = slot;
1107	1108	last = slot;
1108		slavePtr = NULL;
	1109	contentPtr = NULL;
1109	1110	} else if (strcmp(Tcl_GetString(lObjv[j]), "all") == 0) {
1110	1111	/*
1111		* Make sure master is initialised.
	1112	* Make sure container is initialised.
1112	1113	*/
1113	1114
1114		InitMasterData(masterPtr);
1115
1116		slavePtr = masterPtr->slavePtr;
1117		if (slavePtr == NULL) {
	1115	InitContainerData(containerPtr);
	1116
	1117	contentPtr = containerPtr->contentPtr;
	1118	if (contentPtr == NULL) {
1118	1119	continue;
1119	1120	}
1120		allSlaves = 1;
1121		} else if (TkGetWindowFromObj(NULL, tkwin, lObjv[j], &slave)
	1121	allContent = 1;
	1122	} else if (TkGetWindowFromObj(NULL, tkwin, lObjv[j], &content)
1122	1123	== TCL_OK) {
1123	1124	/*
1124		* Is it gridded in this master?
	1125	* Is it gridded in this container?
1125	1126	*/
1126	1127
1127		slavePtr = GetGrid(slave);
1128		if (slavePtr->masterPtr != masterPtr) {
	1128	contentPtr = GetGrid(content);
	1129	if (contentPtr->containerPtr != containerPtr) {
1129	1130	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
1130	1131	"the window \"%s\" is not managed by \"%s\"",
1131	1132	Tcl_GetString(lObjv[j]), Tcl_GetString(objv[2])));

1146	1147	*/
1147	1148
1148	1149	do {
1149		if (slavePtr != NULL) {
	1150	if (contentPtr != NULL) {
1150	1151	first = (slotType == COLUMN) ?
1151		slavePtr->column : slavePtr->row;
	1152	contentPtr->column : contentPtr->row;
1152	1153	last = first - 1 + ((slotType == COLUMN) ?
1153		slavePtr->numCols : slavePtr->numRows);
	1154	contentPtr->numCols : contentPtr->numRows);
1154	1155	}
1155	1156
1156	1157	for (slot = first; slot <= last; slot++) {
1157		ok = CheckSlotData(masterPtr, slot, slotType, /checkOnly/ 0);
	1158	ok = CheckSlotData(containerPtr, slot, slotType, /checkOnly/ 0);
1158	1159	if (ok != TCL_OK) {
1159	1160	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
1160	1161	"\"%s\" is out of range",

1165	1166	return TCL_ERROR;
1166	1167	}
1167	1168	slotPtr = (slotType == COLUMN) ?
1168		masterPtr->masterDataPtr->columnPtr :
1169		masterPtr->masterDataPtr->rowPtr;
	1169	containerPtr->containerDataPtr->columnPtr :
	1170	containerPtr->containerDataPtr->rowPtr;
1170	1171
1171	1172	/*
1172	1173	* Loop through each option value pair, setting the values as

1180	1181	return TCL_ERROR;
1181	1182	}
1182	1183	if (index == ROWCOL_MINSIZE) {
1183		if (Tk_GetPixelsFromObj(interp, master, objv[i+1],
	1184	if (Tk_GetPixelsFromObj(interp, container, objv[i+1],
1184	1185	&size) != TCL_OK) {
1185	1186	Tcl_DecrRefCount(listCopy);
1186	1187	return TCL_ERROR;

1207	1208	slotPtr[slot].uniform = NULL;
1208	1209	}
1209	1210	} else if (index == ROWCOL_PAD) {
1210		if (Tk_GetPixelsFromObj(interp, master, objv[i+1],
	1211	if (Tk_GetPixelsFromObj(interp, container, objv[i+1],
1211	1212	&size) != TCL_OK) {
1212	1213	Tcl_DecrRefCount(listCopy);
1213	1214	return TCL_ERROR;

1220	1221	}
1221	1222	}
1222	1223	}
1223		if (slavePtr != NULL) {
1224		slavePtr = slavePtr->nextPtr;
1225		}
1226		} while ((allSlaves == 1) && (slavePtr != NULL));
	1224	if (contentPtr != NULL) {
	1225	contentPtr = contentPtr->nextPtr;
	1226	}
	1227	} while ((allContent == 1) && (contentPtr != NULL));
1227	1228	}
1228	1229	Tcl_DecrRefCount(listCopy);
1229	1230

1234	1235
1235	1236	if (slotPtr != NULL) {
1236	1237	if (slotType == ROW) {
1237		int last = masterPtr->masterDataPtr->rowMax - 1;
	1238	last = containerPtr->containerDataPtr->rowMax - 1;
1238	1239
1239	1240	while ((last >= 0) && (slotPtr[last].weight == 0)
1240	1241	&& (slotPtr[last].pad == 0) && (slotPtr[last].minSize == 0)
1241	1242	&& (slotPtr[last].uniform == NULL)) {
1242	1243	last--;
1243	1244	}
1244		masterPtr->masterDataPtr->rowMax = last+1;
	1245	containerPtr->containerDataPtr->rowMax = last+1;
1245	1246	} else {
1246		int last = masterPtr->masterDataPtr->columnMax - 1;
	1247	last = containerPtr->containerDataPtr->columnMax - 1;
1247	1248
1248	1249	while ((last >= 0) && (slotPtr[last].weight == 0)
1249	1250	&& (slotPtr[last].pad == 0) && (slotPtr[last].minSize == 0)
1250	1251	&& (slotPtr[last].uniform == NULL)) {
1251	1252	last--;
1252	1253	}
1253		masterPtr->masterDataPtr->columnMax = last + 1;
1254		}
1255		}
1256
1257		if (masterPtr->abortPtr != NULL) {
1258		*masterPtr->abortPtr = 1;
1259		}
1260		if (!(masterPtr->flags & REQUESTED_RELAYOUT)) {
1261		masterPtr->flags \|= REQUESTED_RELAYOUT;
1262		Tcl_DoWhenIdle(ArrangeGrid, masterPtr);
	1254	containerPtr->containerDataPtr->columnMax = last + 1;
	1255	}
	1256	}
	1257
	1258	if (containerPtr->abortPtr != NULL) {
	1259	*containerPtr->abortPtr = 1;
	1260	}
	1261	if (!(containerPtr->flags & REQUESTED_RELAYOUT)) {
	1262	containerPtr->flags \|= REQUESTED_RELAYOUT;
	1263	Tcl_DoWhenIdle(ArrangeGrid, containerPtr);
1263	1264	}
1264	1265	return TCL_OK;
1265	1266

1295	1296	int objc, /* Number of arguments. */
1296	1297	Tcl_Obj const objv[]) / Argument objects. */
1297	1298	{
1298		Tk_Window master;
1299		Gridder *masterPtr;
1300		GridMaster gridPtr; / pointer to grid data */
	1299	Tk_Window container;
	1300	Gridder *containerPtr;
	1301	GridContainer gridPtr; / pointer to grid data */
1301	1302
1302	1303	if (objc != 3) {
1303	1304	Tcl_WrongNumArgs(interp, 2, objv, "window");
1304	1305	return TCL_ERROR;
1305	1306	}
1306	1307
1307		if (TkGetWindowFromObj(interp, tkwin, objv[2], &master) != TCL_OK) {
	1308	if (TkGetWindowFromObj(interp, tkwin, objv[2], &container) != TCL_OK) {
1308	1309	return TCL_ERROR;
1309	1310	}
1310		masterPtr = GetGrid(master);
1311
1312		if (masterPtr->masterDataPtr != NULL) {
1313		SetGridSize(masterPtr);
1314		gridPtr = masterPtr->masterDataPtr;
	1311	containerPtr = GetGrid(container);
	1312
	1313	if (containerPtr->containerDataPtr != NULL) {
	1314	SetGridSize(containerPtr);
	1315	gridPtr = containerPtr->containerDataPtr;
1315	1316	Tcl_SetObjResult(interp, NewPairObj(
1316	1317	MAX(gridPtr->columnEnd, gridPtr->columnMax),
1317	1318	MAX(gridPtr->rowEnd, gridPtr->rowMax)));

1324	1325	/*
1325	1326	*----------------------------------------------------------------------
1326	1327	*
1327		* GridSlavesCommand --
1328		*
1329		* Implementation of the [grid slaves] subcommand. See the user
	1328	* GridContentCommand --
	1329	*
	1330	* Implementation of the [grid content] subcommand. See the user
1330	1331	* documentation for details on what it does.
1331	1332	*
1332	1333	* Results:
1333	1334	* Standard Tcl result.
1334	1335	*
1335	1336	* Side effects:
1336		* Places a list of slaves of the specified window in the interpreter's
1337		* result field.
	1337	* Places a list of content windows of the specified window in the
	1338	* interpreter's result field.
1338	1339	*
1339	1340	*----------------------------------------------------------------------
1340	1341	*/
1341	1342
1342	1343	static int
1343		GridSlavesCommand(
	1344	GridContentCommand(
1344	1345	Tk_Window tkwin, /* Main window of the application. */
1345	1346	Tcl_Interp interp, / Current interpreter. */
1346	1347	int objc, /* Number of arguments. */
1347	1348	Tcl_Obj const objv[]) / Argument objects. */
1348	1349	{
1349		Tk_Window master;
1350		Gridder masterPtr; / master grid record */
1351		Gridder *slavePtr;
	1350	Tk_Window container;
	1351	Gridder containerPtr; / container grid record */
	1352	Gridder *contentPtr;
1352	1353	int i, value, index;
1353	1354	int row = -1, column = -1;
1354	1355	static const char *const optionStrings[] = {
1355	1356	"-column", "-row", NULL
1356	1357	};
1357		enum options { SLAVES_COLUMN, SLAVES_ROW };
	1358	enum options { CONTENT_COLUMN, CONTENT_ROW };
1358	1359	Tcl_Obj *res;
1359	1360
1360	1361	if ((objc < 3) \|\| ((objc % 2) == 0)) {

1376	1377	Tcl_SetErrorCode(interp, "TK", "GRID", "NEG_INDEX", NULL);
1377	1378	return TCL_ERROR;
1378	1379	}
1379		if (index == SLAVES_COLUMN) {
	1380	if (index == CONTENT_COLUMN) {
1380	1381	column = value;
1381	1382	} else {
1382	1383	row = value;
1383	1384	}
1384	1385	}
1385	1386
1386		if (TkGetWindowFromObj(interp, tkwin, objv[2], &master) != TCL_OK) {
	1387	if (TkGetWindowFromObj(interp, tkwin, objv[2], &container) != TCL_OK) {
1387	1388	return TCL_ERROR;
1388	1389	}
1389		masterPtr = GetGrid(master);
	1390	containerPtr = GetGrid(container);
1390	1391
1391	1392	res = Tcl_NewListObj(0, NULL);
1392		for (slavePtr = masterPtr->slavePtr; slavePtr != NULL;
1393		slavePtr = slavePtr->nextPtr) {
1394		if ((column >= 0) && (slavePtr->column > column
1395		\|\| slavePtr->column+slavePtr->numCols-1 < column)) {
	1393	for (contentPtr = containerPtr->contentPtr; contentPtr != NULL;
	1394	contentPtr = contentPtr->nextPtr) {
	1395	if ((column >= 0) && (contentPtr->column > column
	1396	\|\| contentPtr->column+contentPtr->numCols-1 < column)) {
1396	1397	continue;
1397	1398	}
1398		if ((row >= 0) && (slavePtr->row > row \|\|
1399		slavePtr->row+slavePtr->numRows-1 < row)) {
	1399	if ((row >= 0) && (contentPtr->row > row \|\|
	1400	contentPtr->row+contentPtr->numRows-1 < row)) {
1400	1401	continue;
1401	1402	}
1402		Tcl_ListObjAppendElement(interp,res, TkNewWindowObj(slavePtr->tkwin));
	1403	Tcl_ListObjAppendElement(interp,res, TkNewWindowObj(contentPtr->tkwin));
1403	1404	}
1404	1405	Tcl_SetObjResult(interp, res);
1405	1406	return TCL_OK;

1427	1428	GridReqProc(
1428	1429	ClientData clientData, /* Grid's information about window that got
1429	1430	* new preferred geometry. */
1430		Tk_Window tkwin) /* Other Tk-related information about the
	1431	TCL_UNUSED(Tk_Window)) /* Other Tk-related information about the
1431	1432	* window. */
1432	1433	{
1433		register Gridder *gridPtr = clientData;
1434
1435		gridPtr = gridPtr->masterPtr;
	1434	Gridder gridPtr = (Gridder )clientData;
	1435
	1436	gridPtr = gridPtr->containerPtr;
1436	1437	if (gridPtr && !(gridPtr->flags & REQUESTED_RELAYOUT)) {
1437	1438	gridPtr->flags \|= REQUESTED_RELAYOUT;
1438	1439	Tcl_DoWhenIdle(ArrangeGrid, gridPtr);

1442	1443	/*
1443	1444	*----------------------------------------------------------------------
1444	1445	*
1445		* GridLostSlaveProc --
	1446	* GridLostContentProc --
1446	1447	*
1447	1448	* This procedure is invoked by Tk whenever some other geometry claims
1448		* control over a slave that used to be managed by us.
	1449	* control over a content that used to be managed by us.
1449	1450	*
1450	1451	* Results:
1451	1452	* None.
1452	1453	*
1453	1454	* Side effects:
1454		* Forgets all grid-related information about the slave.
	1455	* Forgets all grid-related information about the content.
1455	1456	*
1456	1457	*----------------------------------------------------------------------
1457	1458	*/
1458	1459
1459	1460	static void
1460		GridLostSlaveProc(
1461		ClientData clientData, /* Grid structure for slave window that was
	1461	GridLostContentProc(
	1462	ClientData clientData, /* Grid structure for content window that was
1462	1463	* stolen away. */
1463		Tk_Window tkwin) /* Tk's handle for the slave window. */
	1464	TCL_UNUSED(Tk_Window)) /* Tk's handle for the content window. */
1464	1465	{
1465		register Gridder *slavePtr = clientData;
1466
1467		if (slavePtr->masterPtr->tkwin != Tk_Parent(slavePtr->tkwin)) {
1468		Tk_UnmaintainGeometry(slavePtr->tkwin, slavePtr->masterPtr->tkwin);
1469		}
1470		Unlink(slavePtr);
1471		Tk_UnmapWindow(slavePtr->tkwin);
	1466	Gridder contentPtr = (Gridder )clientData;
	1467
	1468	if (contentPtr->containerPtr->tkwin != Tk_Parent(contentPtr->tkwin)) {
	1469	Tk_UnmaintainGeometry(contentPtr->tkwin, contentPtr->containerPtr->tkwin);
	1470	}
	1471	Unlink(contentPtr);
	1472	Tk_UnmapWindow(contentPtr->tkwin);
1472	1473	}
1473	1474
1474	1475	/*

1495	1496	AdjustOffsets(
1496	1497	int size, /* The total layout size (in pixels). */
1497	1498	int slots, /* Number of slots. */
1498		register SlotInfo slotPtr) / Pointer to slot array. */
	1499	SlotInfo slotPtr) / Pointer to slot array. */
1499	1500	{
1500		register int slot; /* Current slot. */
	1501	int slot; /* Current slot. */
1501	1502	int diff; /* Extra pixels needed to add to the layout. */
1502	1503	int totalWeight; /* Sum of the weights for all the slots. */
1503	1504	int weight; /* Sum of the weights so far. */

1642	1643	*
1643	1644	* AdjustForSticky --
1644	1645	*
1645		* This procedure adjusts the size of a slave in its cavity based on its
	1646	* This procedure adjusts the size of a content in its cavity based on its
1646	1647	* "sticky" flags.
1647	1648	*
1648	1649	* Results:
1649	1650	* The input x, y, width, and height are changed to represent the desired
1650		* coordinates of the slave.
	1651	* coordinates of the content.
1651	1652	*
1652	1653	* Side effects:
1653	1654	* None.

1657	1658
1658	1659	static void
1659	1660	AdjustForSticky(
1660		Gridder slavePtr, / Slave window to arrange in its cavity. */
	1661	Gridder contentPtr, / Content window to arrange in its cavity. */
1661	1662	int xPtr, / Pixel location of the left edge of the cavity. */
1662	1663	int yPtr, / Pixel location of the top edge of the cavity. */
1663	1664	int widthPtr, / Width of the cavity (in pixels). */
1664	1665	int heightPtr) / Height of the cavity (in pixels). */
1665	1666	{
1666		int diffx = 0; /* Cavity width - slave width. */
1667		int diffy = 0; /* Cavity hight - slave height. */
1668		int sticky = slavePtr->sticky;
1669
1670		*xPtr += slavePtr->padLeft;
1671		*widthPtr -= slavePtr->padX;
1672		*yPtr += slavePtr->padTop;
1673		*heightPtr -= slavePtr->padY;
1674
1675		if (*widthPtr > (Tk_ReqWidth(slavePtr->tkwin) + slavePtr->iPadX)) {
1676		diffx = *widthPtr - (Tk_ReqWidth(slavePtr->tkwin) + slavePtr->iPadX);
1677		*widthPtr = Tk_ReqWidth(slavePtr->tkwin) + slavePtr->iPadX;
1678		}
1679
1680		if (*heightPtr > (Tk_ReqHeight(slavePtr->tkwin) + slavePtr->iPadY)) {
1681		diffy = *heightPtr - (Tk_ReqHeight(slavePtr->tkwin) + slavePtr->iPadY);
1682		*heightPtr = Tk_ReqHeight(slavePtr->tkwin) + slavePtr->iPadY;
	1667	int diffx = 0; /* Cavity width - content width. */
	1668	int diffy = 0; /* Cavity hight - content height. */
	1669	int sticky = contentPtr->sticky;
	1670
	1671	*xPtr += contentPtr->padLeft;
	1672	*widthPtr -= contentPtr->padX;
	1673	*yPtr += contentPtr->padTop;
	1674	*heightPtr -= contentPtr->padY;
	1675
	1676	if (*widthPtr > (Tk_ReqWidth(contentPtr->tkwin) + contentPtr->iPadX)) {
	1677	diffx = *widthPtr - (Tk_ReqWidth(contentPtr->tkwin) + contentPtr->iPadX);
	1678	*widthPtr = Tk_ReqWidth(contentPtr->tkwin) + contentPtr->iPadX;
	1679	}
	1680
	1681	if (*heightPtr > (Tk_ReqHeight(contentPtr->tkwin) + contentPtr->iPadY)) {
	1682	diffy = *heightPtr - (Tk_ReqHeight(contentPtr->tkwin) + contentPtr->iPadY);
	1683	*heightPtr = Tk_ReqHeight(contentPtr->tkwin) + contentPtr->iPadY;
1683	1684	}
1684	1685
1685	1686	if (sticky&STICK_EAST && sticky&STICK_WEST) {

1710	1711	* None.
1711	1712	*
1712	1713	* Side effects:
1713		* The slaves of masterPtr may get resized or moved.
	1714	* The content of containerPtr may get resized or moved.
1714	1715	*
1715	1716	*----------------------------------------------------------------------
1716	1717	*/
1717	1718
1718	1719	static void
1719	1720	ArrangeGrid(
1720		ClientData clientData) /* Structure describing master whose slaves
	1721	ClientData clientData) /* Structure describing container whose content
1721	1722	* are to be re-layed out. */
1722	1723	{
1723		register Gridder *masterPtr = clientData;
1724		register Gridder *slavePtr;
1725		GridMaster *slotPtr = masterPtr->masterDataPtr;
	1724	Gridder containerPtr = (Gridder )clientData;
	1725	Gridder *contentPtr;
	1726	GridContainer *slotPtr = containerPtr->containerDataPtr;
1726	1727	int abort;
1727	1728	int width, height; /* Requested size of layout, in pixels. */
1728	1729	int realWidth, realHeight; /* Actual size layout should take-up. */
1729	1730	int usedX, usedY;
1730	1731
1731		masterPtr->flags &= ~REQUESTED_RELAYOUT;
1732
1733		/*
1734		* If the master has no slaves anymore, then don't do anything at all:
1735		* just leave the master's size as-is. Otherwise there is no way to
1736		* "relinquish" control over the master so another geometry manager can
1737		* take over.
1738		*/
1739
1740		if (masterPtr->slavePtr == NULL) {
	1732	containerPtr->flags &= ~REQUESTED_RELAYOUT;
	1733
	1734	/*
	1735	* If the container has no content anymore, then don't change the container size.
	1736	* Otherwise there is no way to "relinquish" control over the container
	1737	* so another geometry manager can take over.
	1738	*/
	1739
	1740	if (containerPtr->contentPtr == NULL) {
1741	1741	return;
1742	1742	}
1743	1743
1744		if (masterPtr->masterDataPtr == NULL) {
	1744	if (containerPtr->containerDataPtr == NULL) {
1745	1745	return;
1746	1746	}
1747	1747

1751	1751	* necessary.
1752	1752	*/
1753	1753
1754		if (masterPtr->abortPtr != NULL) {
1755		*masterPtr->abortPtr = 1;
1756		}
1757		masterPtr->abortPtr = &abort;
	1754	if (containerPtr->abortPtr != NULL) {
	1755	*containerPtr->abortPtr = 1;
	1756	}
	1757	containerPtr->abortPtr = &abort;
1758	1758	abort = 0;
1759		Tcl_Preserve(masterPtr);
	1759	Tcl_Preserve(containerPtr);
1760	1760
1761	1761	/*
1762	1762	* Call the constraint engine to fill in the row and column offsets.
1763	1763	*/
1764	1764
1765		SetGridSize(masterPtr);
1766		width = ResolveConstraints(masterPtr, COLUMN, 0);
1767		height = ResolveConstraints(masterPtr, ROW, 0);
1768		width += Tk_InternalBorderLeft(masterPtr->tkwin) +
1769		Tk_InternalBorderRight(masterPtr->tkwin);
1770		height += Tk_InternalBorderTop(masterPtr->tkwin) +
1771		Tk_InternalBorderBottom(masterPtr->tkwin);
1772
1773		if (width < Tk_MinReqWidth(masterPtr->tkwin)) {
1774		width = Tk_MinReqWidth(masterPtr->tkwin);
1775		}
1776		if (height < Tk_MinReqHeight(masterPtr->tkwin)) {
1777		height = Tk_MinReqHeight(masterPtr->tkwin);
1778		}
1779
1780		if (((width != Tk_ReqWidth(masterPtr->tkwin))
1781		\|\| (height != Tk_ReqHeight(masterPtr->tkwin)))
1782		&& !(masterPtr->flags & DONT_PROPAGATE)) {
1783		Tk_GeometryRequest(masterPtr->tkwin, width, height);
	1765	SetGridSize(containerPtr);
	1766	width = ResolveConstraints(containerPtr, COLUMN, 0);
	1767	height = ResolveConstraints(containerPtr, ROW, 0);
	1768	width += Tk_InternalBorderLeft(containerPtr->tkwin) +
	1769	Tk_InternalBorderRight(containerPtr->tkwin);
	1770	height += Tk_InternalBorderTop(containerPtr->tkwin) +
	1771	Tk_InternalBorderBottom(containerPtr->tkwin);
	1772
	1773	if (width < Tk_MinReqWidth(containerPtr->tkwin)) {
	1774	width = Tk_MinReqWidth(containerPtr->tkwin);
	1775	}
	1776	if (height < Tk_MinReqHeight(containerPtr->tkwin)) {
	1777	height = Tk_MinReqHeight(containerPtr->tkwin);
	1778	}
	1779
	1780	if (((width != Tk_ReqWidth(containerPtr->tkwin))
	1781	\|\| (height != Tk_ReqHeight(containerPtr->tkwin)))
	1782	&& !(containerPtr->flags & DONT_PROPAGATE)) {
	1783	Tk_GeometryRequest(containerPtr->tkwin, width, height);
1784	1784	if (width>1 && height>1) {
1785		masterPtr->flags \|= REQUESTED_RELAYOUT;
1786		Tcl_DoWhenIdle(ArrangeGrid, masterPtr);
1787		}
1788		masterPtr->abortPtr = NULL;
1789		Tcl_Release(masterPtr);
	1785	containerPtr->flags \|= REQUESTED_RELAYOUT;
	1786	Tcl_DoWhenIdle(ArrangeGrid, containerPtr);
	1787	}
	1788	containerPtr->abortPtr = NULL;
	1789	Tcl_Release(containerPtr);
1790	1790	return;
1791	1791	}
1792	1792
1793	1793	/*
1794		* If the currently requested layout size doesn't match the master's
	1794	* If the currently requested layout size doesn't match the container's
1795	1795	* window size, then adjust the slot offsets according to the weights. If
1796	1796	* all of the weights are zero, place the layout according to the anchor
1797	1797	* value.
1798	1798	*/
1799	1799
1800		realWidth = Tk_Width(masterPtr->tkwin) -
1801		Tk_InternalBorderLeft(masterPtr->tkwin) -
1802		Tk_InternalBorderRight(masterPtr->tkwin);
1803		realHeight = Tk_Height(masterPtr->tkwin) -
1804		Tk_InternalBorderTop(masterPtr->tkwin) -
1805		Tk_InternalBorderBottom(masterPtr->tkwin);
	1800	realWidth = Tk_Width(containerPtr->tkwin) -
	1801	Tk_InternalBorderLeft(containerPtr->tkwin) -
	1802	Tk_InternalBorderRight(containerPtr->tkwin);
	1803	realHeight = Tk_Height(containerPtr->tkwin) -
	1804	Tk_InternalBorderTop(containerPtr->tkwin) -
	1805	Tk_InternalBorderBottom(containerPtr->tkwin);
1806	1806	usedX = AdjustOffsets(realWidth,
1807	1807	MAX(slotPtr->columnEnd, slotPtr->columnMax), slotPtr->columnPtr);
1808	1808	usedY = AdjustOffsets(realHeight, MAX(slotPtr->rowEnd, slotPtr->rowMax),
1809	1809	slotPtr->rowPtr);
1810		TkComputeAnchor(masterPtr->masterDataPtr->anchor, masterPtr->tkwin,
	1810	TkComputeAnchor(containerPtr->containerDataPtr->anchor, containerPtr->tkwin,
1811	1811	0, 0, usedX, usedY, &slotPtr->startX, &slotPtr->startY);
1812	1812
1813	1813	/*
1814		* Now adjust the actual size of the slave to its cavity by computing the
	1814	* Now adjust the actual size of the content to its cavity by computing the
1815	1815	* cavity size, and adjusting the widget according to its stickyness.
1816	1816	*/
1817	1817
1818		for (slavePtr = masterPtr->slavePtr; slavePtr != NULL && !abort;
1819		slavePtr = slavePtr->nextPtr) {
	1818	for (contentPtr = containerPtr->contentPtr; contentPtr != NULL && !abort;
	1819	contentPtr = contentPtr->nextPtr) {
1820	1820	int x, y; /* Top left coordinate */
1821		int width, height; /* Slot or slave size */
1822		int col = slavePtr->column;
1823		int row = slavePtr->row;
	1821	int col = contentPtr->column;
	1822	int row = contentPtr->row;
1824	1823
1825	1824	x = (col>0) ? slotPtr->columnPtr[col-1].offset : 0;
1826	1825	y = (row>0) ? slotPtr->rowPtr[row-1].offset : 0;
1827	1826
1828		width = slotPtr->columnPtr[slavePtr->numCols+col-1].offset - x;
1829		height = slotPtr->rowPtr[slavePtr->numRows+row-1].offset - y;
	1827	width = slotPtr->columnPtr[contentPtr->numCols+col-1].offset - x;
	1828	height = slotPtr->rowPtr[contentPtr->numRows+row-1].offset - y;
1830	1829
1831	1830	x += slotPtr->startX;
1832	1831	y += slotPtr->startY;
1833	1832
1834		AdjustForSticky(slavePtr, &x, &y, &width, &height);
	1833	AdjustForSticky(contentPtr, &x, &y, &width, &height);
1835	1834
1836	1835	/*
1837	1836	* Now put the window in the proper spot. (This was taken directly
1838		* from tkPack.c.) If the slave is a child of the master, then do this
	1837	* from tkPack.c.) If the content is a child of the container, then do this
1839	1838	* here. Otherwise let Tk_MaintainGeometry do the work.
1840	1839	*/
1841	1840
1842		if (masterPtr->tkwin == Tk_Parent(slavePtr->tkwin)) {
	1841	if (containerPtr->tkwin == Tk_Parent(contentPtr->tkwin)) {
1843	1842	if ((width <= 0) \|\| (height <= 0)) {
1844		Tk_UnmapWindow(slavePtr->tkwin);
	1843	Tk_UnmapWindow(contentPtr->tkwin);
1845	1844	} else {
1846		if ((x != Tk_X(slavePtr->tkwin))
1847		\|\| (y != Tk_Y(slavePtr->tkwin))
1848		\|\| (width != Tk_Width(slavePtr->tkwin))
1849		\|\| (height != Tk_Height(slavePtr->tkwin))) {
1850		Tk_MoveResizeWindow(slavePtr->tkwin, x, y, width, height);
	1845	if ((x != Tk_X(contentPtr->tkwin))
	1846	\|\| (y != Tk_Y(contentPtr->tkwin))
	1847	\|\| (width != Tk_Width(contentPtr->tkwin))
	1848	\|\| (height != Tk_Height(contentPtr->tkwin))) {
	1849	Tk_MoveResizeWindow(contentPtr->tkwin, x, y, width, height);
1851	1850	}
1852	1851	if (abort) {
1853	1852	break;
1854	1853	}
1855	1854
1856	1855	/*
1857		* Don't map the slave if the master isn't mapped: wait until
1858		* the master gets mapped later.
	1856	* Don't map the content if the container isn't mapped: wait until
	1857	* the container gets mapped later.
1859	1858	*/
1860	1859
1861		if (Tk_IsMapped(masterPtr->tkwin)) {
1862		Tk_MapWindow(slavePtr->tkwin);
	1860	if (Tk_IsMapped(containerPtr->tkwin)) {
	1861	Tk_MapWindow(contentPtr->tkwin);
1863	1862	}
1864	1863	}
1865	1864	} else if ((width <= 0) \|\| (height <= 0)) {
1866		Tk_UnmaintainGeometry(slavePtr->tkwin, masterPtr->tkwin);
1867		Tk_UnmapWindow(slavePtr->tkwin);
	1865	Tk_UnmaintainGeometry(contentPtr->tkwin, containerPtr->tkwin);
	1866	Tk_UnmapWindow(contentPtr->tkwin);
1868	1867	} else {
1869		Tk_MaintainGeometry(slavePtr->tkwin, masterPtr->tkwin, x, y,
	1868	Tk_MaintainGeometry(contentPtr->tkwin, containerPtr->tkwin, x, y,
1870	1869	width, height);
1871	1870	}
1872	1871	}
1873	1872
1874		masterPtr->abortPtr = NULL;
1875		Tcl_Release(masterPtr);
	1873	containerPtr->abortPtr = NULL;
	1874	Tcl_Release(containerPtr);
1876	1875	}
1877	1876
1878	1877	/*

1890	1889	*
1891	1890	* Side effects:
1892	1891	* The slot offsets are copied into the SlotInfo structure for the
1893		* geometry master.
	1892	* geometry container.
1894	1893	*
1895	1894	*----------------------------------------------------------------------
1896	1895	*/
1897	1896
1898	1897	static int
1899	1898	ResolveConstraints(
1900		Gridder masterPtr, / The geometry master for this grid. */
	1899	Gridder containerPtr, / The geometry container for this grid. */
1901	1900	int slotType, /* Either ROW or COLUMN. */
1902	1901	int maxOffset) /* The actual maximum size of this layout in
1903	1902	* pixels, or 0 (not currently used). */
1904	1903	{
1905		register SlotInfo slotPtr; / Pointer to row/col constraints. */
1906		register Gridder slavePtr; / List of slave windows in this grid. */
	1904	SlotInfo slotPtr; / Pointer to row/col constraints. */
	1905	Gridder contentPtr; / List of content windows in this grid. */
1907	1906	int constraintCount; /* Count of rows or columns that have
1908	1907	* constraints. */
1909	1908	int slotCount; /* Last occupied row or column. */

1912	1911	GridLayout layoutPtr; / Temporary layout structure. */
1913	1912	int requiredSize; /* The natural size of the grid (pixels).
1914	1913	* This is the minimum size needed to
1915		* accommodate all of the slaves at their
	1914	* accommodate all of the content at their
1916	1915	* requested sizes. */
1917	1916	int offset; /* The pixel offset of the right edge of the
1918	1917	* current slot from the beginning of the

1929	1928	int uniformGroups; /* Number of currently used uniform groups. */
1930	1929	int uniformGroupsAlloced; /* Size of allocated space for uniform
1931	1930	* groups. */
1932		int weight, minSize;
	1931	int minSize;
1933	1932	int prevGrow, accWeight, grow;
1934	1933
1935	1934	/*

1940	1939	GridLayout layoutData[TYPICAL_SIZE + 1];
1941	1940
1942	1941	if (slotType == COLUMN) {
1943		constraintCount = masterPtr->masterDataPtr->columnMax;
1944		slotCount = masterPtr->masterDataPtr->columnEnd;
1945		slotPtr = masterPtr->masterDataPtr->columnPtr;
	1942	constraintCount = containerPtr->containerDataPtr->columnMax;
	1943	slotCount = containerPtr->containerDataPtr->columnEnd;
	1944	slotPtr = containerPtr->containerDataPtr->columnPtr;
1946	1945	} else {
1947		constraintCount = masterPtr->masterDataPtr->rowMax;
1948		slotCount = masterPtr->masterDataPtr->rowEnd;
1949		slotPtr = masterPtr->masterDataPtr->rowPtr;
	1946	constraintCount = containerPtr->containerDataPtr->rowMax;
	1947	slotCount = containerPtr->containerDataPtr->rowEnd;
	1948	slotPtr = containerPtr->containerDataPtr->rowPtr;
1950	1949	}
1951	1950
1952	1951	/*

1955	1954
1956	1955	gridCount = MAX(constraintCount, slotCount);
1957	1956	if (gridCount >= TYPICAL_SIZE) {
1958		layoutPtr = ckalloc(sizeof(GridLayout) * (1+gridCount));
	1957	layoutPtr = (GridLayout )ckalloc(sizeof(GridLayout) (1+gridCount));
1959	1958	} else {
1960	1959	layoutPtr = layoutData;
1961	1960	}

1996	1995
1997	1996	/*
1998	1997	* Step 2.
1999		* Slaves with a span of 1 are used to determine the minimum size of each
2000		* slot. Slaves whose span is two or more slots don't contribute to the
	1998	* Content with a span of 1 are used to determine the minimum size of each
	1999	* slot. Content whose span is two or more slots don't contribute to the
2001	2000	* minimum size of each slot directly, but can cause slots to grow if
2002	2001	* their size exceeds the the sizes of the slots they span.
2003	2002	*
2004		* Bin all slaves whose spans are > 1 by their right edges. This allows
	2003	* Bin all content whose spans are > 1 by their right edges. This allows
2005	2004	* the computation on minimum and maximum possible layout sizes at each
2006		* slot boundary, without the need to re-sort the slaves.
	2005	* slot boundary, without the need to re-sort the content.
2007	2006	*/
2008	2007
2009	2008	switch (slotType) {
2010	2009	case COLUMN:
2011		for (slavePtr = masterPtr->slavePtr; slavePtr != NULL;
2012		slavePtr = slavePtr->nextPtr) {
2013		int rightEdge = slavePtr->column + slavePtr->numCols - 1;
2014
2015		slavePtr->size = Tk_ReqWidth(slavePtr->tkwin) + slavePtr->padX
2016		+ slavePtr->iPadX + slavePtr->doubleBw;
2017		if (slavePtr->numCols > 1) {
2018		slavePtr->binNextPtr = layoutPtr[rightEdge].binNextPtr;
2019		layoutPtr[rightEdge].binNextPtr = slavePtr;
	2010	for (contentPtr = containerPtr->contentPtr; contentPtr != NULL;
	2011	contentPtr = contentPtr->nextPtr) {
	2012	int rightEdge = contentPtr->column + contentPtr->numCols - 1;
	2013
	2014	contentPtr->size = Tk_ReqWidth(contentPtr->tkwin) + contentPtr->padX
	2015	+ contentPtr->iPadX + contentPtr->doubleBw;
	2016	if (contentPtr->numCols > 1) {
	2017	contentPtr->binNextPtr = layoutPtr[rightEdge].binNextPtr;
	2018	layoutPtr[rightEdge].binNextPtr = contentPtr;
2020	2019	} else if (rightEdge >= 0) {
2021		int size = slavePtr->size + layoutPtr[rightEdge].pad;
	2020	int size = contentPtr->size + layoutPtr[rightEdge].pad;
2022	2021
2023	2022	if (size > layoutPtr[rightEdge].minSize) {
2024	2023	layoutPtr[rightEdge].minSize = size;

2027	2026	}
2028	2027	break;
2029	2028	case ROW:
2030		for (slavePtr = masterPtr->slavePtr; slavePtr != NULL;
2031		slavePtr = slavePtr->nextPtr) {
2032		int rightEdge = slavePtr->row + slavePtr->numRows - 1;
2033
2034		slavePtr->size = Tk_ReqHeight(slavePtr->tkwin) + slavePtr->padY
2035		+ slavePtr->iPadY + slavePtr->doubleBw;
2036		if (slavePtr->numRows > 1) {
2037		slavePtr->binNextPtr = layoutPtr[rightEdge].binNextPtr;
2038		layoutPtr[rightEdge].binNextPtr = slavePtr;
	2029	for (contentPtr = containerPtr->contentPtr; contentPtr != NULL;
	2030	contentPtr = contentPtr->nextPtr) {
	2031	int rightEdge = contentPtr->row + contentPtr->numRows - 1;
	2032
	2033	contentPtr->size = Tk_ReqHeight(contentPtr->tkwin) + contentPtr->padY
	2034	+ contentPtr->iPadY + contentPtr->doubleBw;
	2035	if (contentPtr->numRows > 1) {
	2036	contentPtr->binNextPtr = layoutPtr[rightEdge].binNextPtr;
	2037	layoutPtr[rightEdge].binNextPtr = contentPtr;
2039	2038	} else if (rightEdge >= 0) {
2040		int size = slavePtr->size + layoutPtr[rightEdge].pad;
	2039	int size = contentPtr->size + layoutPtr[rightEdge].pad;
2041	2040
2042	2041	if (size > layoutPtr[rightEdge].minSize) {
2043	2042	layoutPtr[rightEdge].minSize = size;

2058	2057
2059	2058	for (slot = 0; slot < gridCount; slot++) {
2060	2059	if (layoutPtr[slot].uniform != NULL) {
	2060	int weight;
2061	2061	for (start = 0; start < uniformGroups; start++) {
2062	2062	if (uniformGroupPtr[start].group == layoutPtr[slot].uniform) {
2063	2063	break;

2077	2077	* sizeof(UniformGroup);
2078	2078	size_t newSize = (uniformGroupsAlloced + UNIFORM_PREALLOC)
2079	2079	* sizeof(UniformGroup);
2080		UniformGroup *newUG = ckalloc(newSize);
	2080	UniformGroup newUG = (UniformGroup )ckalloc(newSize);
2081	2081	UniformGroup *oldUG = uniformGroupPtr;
2082	2082
2083	2083	memcpy(newUG, oldUG, oldSize);

2110	2110	for (start = 0; start < uniformGroups; start++) {
2111	2111	if (uniformGroupPtr[start].group ==
2112	2112	layoutPtr[slot].uniform) {
2113		weight = layoutPtr[slot].weight;
	2113	int weight = layoutPtr[slot].weight;
2114	2114	weight = weight > 0 ? weight : 1;
2115	2115	layoutPtr[slot].minSize =
2116	2116	uniformGroupPtr[start].minSize * weight;

2128	2128	/*
2129	2129	* Step 3.
2130	2130	* Determine the minimum slot offsets going from left to right that would
2131		* fit all of the slaves. This determines the minimum
	2131	* fit all of the content. This determines the minimum
2132	2132	*/
2133	2133
2134	2134	for (offset=0,slot=0; slot < gridCount; slot++) {
2135	2135	layoutPtr[slot].minOffset = layoutPtr[slot].minSize + offset;
2136		for (slavePtr = layoutPtr[slot].binNextPtr; slavePtr != NULL;
2137		slavePtr = slavePtr->binNextPtr) {
	2136	for (contentPtr = layoutPtr[slot].binNextPtr; contentPtr != NULL;
	2137	contentPtr = contentPtr->binNextPtr) {
2138	2138	int span = (slotType == COLUMN) ?
2139		slavePtr->numCols : slavePtr->numRows;
2140		int required = slavePtr->size + layoutPtr[slot - span].minOffset;
	2139	contentPtr->numCols : contentPtr->numRows;
	2140	int required = contentPtr->size + layoutPtr[slot - span].minOffset;
2141	2141
2142	2142	if (required > layoutPtr[slot].minOffset) {
2143	2143	layoutPtr[slot].minOffset = required;

2148	2148
2149	2149	/*
2150	2150	* At this point, we know the minimum required size of the entire layout.
2151		* It might be prudent to stop here if our "master" will resize itself to
	2151	* It might be prudent to stop here if our "container" will resize itself to
2152	2152	* this size.
2153	2153	*/
2154	2154

2169	2169	layoutPtr[slot].maxOffset = offset;
2170	2170	}
2171	2171	for (slot=gridCount-1; slot > 0;) {
2172		for (slavePtr = layoutPtr[slot].binNextPtr; slavePtr != NULL;
2173		slavePtr = slavePtr->binNextPtr) {
	2172	for (contentPtr = layoutPtr[slot].binNextPtr; contentPtr != NULL;
	2173	contentPtr = contentPtr->binNextPtr) {
2174	2174	int span = (slotType == COLUMN) ?
2175		slavePtr->numCols : slavePtr->numRows;
2176		int require = offset - slavePtr->size;
	2175	contentPtr->numCols : contentPtr->numRows;
	2176	int require = offset - contentPtr->size;
2177	2177	int startSlot = slot - span;
2178	2178
2179	2179	if (startSlot >=0 && require < layoutPtr[startSlot].maxOffset) {

2383	2383	/*
2384	2384	* Step 6.
2385	2385	* All of the space has been apportioned; copy the layout information back
2386		* into the master.
	2386	* into the container.
2387	2387	*/
2388	2388
2389	2389	for (slot=0; slot < gridCount; slot++) {

2421	2421	Tk_Window tkwin) /* Token for window for which grid structure
2422	2422	* is desired. */
2423	2423	{
2424		register Gridder *gridPtr;
	2424	Gridder *gridPtr;
2425	2425	Tcl_HashEntry *hPtr;
2426	2426	int isNew;
2427	2427	TkDisplay dispPtr = ((TkWindow ) tkwin)->dispPtr;

2438	2438
2439	2439	hPtr = Tcl_CreateHashEntry(&dispPtr->gridHashTable, (char*) tkwin, &isNew);
2440	2440	if (!isNew) {
2441		return Tcl_GetHashValue(hPtr);
2442		}
2443		gridPtr = ckalloc(sizeof(Gridder));
	2441	return (Gridder *)Tcl_GetHashValue(hPtr);
	2442	}
	2443	gridPtr = (Gridder *)ckalloc(sizeof(Gridder));
2444	2444	gridPtr->tkwin = tkwin;
2445		gridPtr->masterPtr = NULL;
2446		gridPtr->masterDataPtr = NULL;
	2445	gridPtr->containerPtr = NULL;
	2446	gridPtr->containerDataPtr = NULL;
2447	2447	gridPtr->nextPtr = NULL;
2448		gridPtr->slavePtr = NULL;
	2448	gridPtr->contentPtr = NULL;
2449	2449	gridPtr->binNextPtr = NULL;
2450	2450
2451	2451	gridPtr->column = -1;

2465	2465	gridPtr->sticky = 0;
2466	2466	gridPtr->size = 0;
2467	2467	gridPtr->in = NULL;
2468		gridPtr->masterDataPtr = NULL;
	2468	gridPtr->containerDataPtr = NULL;
2469	2469	Tcl_SetHashValue(hPtr, gridPtr);
2470	2470	Tk_CreateEventHandler(tkwin, StructureNotifyMask,
2471	2471	GridStructureProc, gridPtr);

2477	2477	*
2478	2478	* SetGridSize --
2479	2479	*
2480		* This internal procedure sets the size of the grid occupied by slaves.
	2480	* This internal procedure sets the size of the grid occupied by content.
2481	2481	*
2482	2482	* Results:
2483	2483	* None
2484	2484	*
2485	2485	* Side effects:
2486		* The width and height arguments are filled in the master data
	2486	* The width and height arguments are filled in the container data
2487	2487	* structure. Additional space is allocated for the constraints to
2488	2488	* accommodate the offsets.
2489	2489	*

2492	2492
2493	2493	static void
2494	2494	SetGridSize(
2495		Gridder masterPtr) / The geometry master for this grid. */
	2495	Gridder containerPtr) / The geometry container for this grid. */
2496	2496	{
2497		register Gridder slavePtr; / Current slave window. */
	2497	Gridder contentPtr; / Current content window. */
2498	2498	int maxX = 0, maxY = 0;
2499	2499
2500		for (slavePtr = masterPtr->slavePtr; slavePtr != NULL;
2501		slavePtr = slavePtr->nextPtr) {
2502		maxX = MAX(maxX, slavePtr->numCols + slavePtr->column);
2503		maxY = MAX(maxY, slavePtr->numRows + slavePtr->row);
2504		}
2505		masterPtr->masterDataPtr->columnEnd = maxX;
2506		masterPtr->masterDataPtr->rowEnd = maxY;
2507		CheckSlotData(masterPtr, maxX, COLUMN, CHECK_SPACE);
2508		CheckSlotData(masterPtr, maxY, ROW, CHECK_SPACE);
	2500	for (contentPtr = containerPtr->contentPtr; contentPtr != NULL;
	2501	contentPtr = contentPtr->nextPtr) {
	2502	maxX = MAX(maxX, contentPtr->numCols + contentPtr->column);
	2503	maxY = MAX(maxY, contentPtr->numRows + contentPtr->row);
	2504	}
	2505	containerPtr->containerDataPtr->columnEnd = maxX;
	2506	containerPtr->containerDataPtr->rowEnd = maxY;
	2507	CheckSlotData(containerPtr, maxX, COLUMN, CHECK_SPACE);
	2508	CheckSlotData(containerPtr, maxY, ROW, CHECK_SPACE);
2509	2509	}
2510	2510
2511	2511	/*
2512	2512	*----------------------------------------------------------------------
2513	2513	*
2514		* SetSlaveColumn --
2515		*
2516		* Update column data for a slave, checking that MAX_ELEMENT bound
	2514	* SetContentColumn --
	2515	*
	2516	* Update column data for a content, checking that MAX_ELEMENT bound
2517	2517	* is not passed.
2518	2518	*
2519	2519	* Results:
2520	2520	* TCL_ERROR if out of bounds, TCL_OK otherwise
2521	2521	*
2522	2522	* Side effects:
2523		* Slave fields are updated.
	2523	* Content fields are updated.
2524	2524	*
2525	2525	*----------------------------------------------------------------------
2526	2526	*/
2527	2527
2528	2528	static int
2529		SetSlaveColumn(
	2529	SetContentColumn(
2530	2530	Tcl_Interp interp, / Interp for error message. */
2531		Gridder slavePtr, / Slave to be updated. */
	2531	Gridder contentPtr, / Content to be updated. */
2532	2532	int column, /* New column or -1 to be unchanged. */
2533	2533	int numCols) /* New columnspan or -1 to be unchanged. */
2534	2534	{
2535	2535	int newColumn, newNumCols, lastCol;
2536	2536
2537		newColumn = (column >= 0) ? column : slavePtr->column;
2538		newNumCols = (numCols >= 1) ? numCols : slavePtr->numCols;
	2537	newColumn = (column >= 0) ? column : contentPtr->column;
	2538	newNumCols = (numCols >= 1) ? numCols : contentPtr->numCols;
2539	2539
2540	2540	lastCol = ((newColumn >= 0) ? newColumn : 0) + newNumCols;
2541	2541	if (lastCol >= MAX_ELEMENT) {

2544	2544	return TCL_ERROR;
2545	2545	}
2546	2546
2547		slavePtr->column = newColumn;
2548		slavePtr->numCols = newNumCols;
	2547	contentPtr->column = newColumn;
	2548	contentPtr->numCols = newNumCols;
2549	2549	return TCL_OK;
2550	2550	}
2551	2551
2552	2552	/*
2553	2553	*----------------------------------------------------------------------
2554	2554	*
2555		* SetSlaveRow --
2556		*
2557		* Update row data for a slave, checking that MAX_ELEMENT bound
	2555	* SetContentRow --
	2556	*
	2557	* Update row data for a content, checking that MAX_ELEMENT bound
2558	2558	* is not passed.
2559	2559	*
2560	2560	* Results:
2561	2561	* TCL_ERROR if out of bounds, TCL_OK otherwise
2562	2562	*
2563	2563	* Side effects:
2564		* Slave fields are updated.
	2564	* Content fields are updated.
2565	2565	*
2566	2566	*----------------------------------------------------------------------
2567	2567	*/
2568	2568
2569	2569	static int
2570		SetSlaveRow(
	2570	SetContentRow(
2571	2571	Tcl_Interp interp, / Interp for error message. */
2572		Gridder slavePtr, / Slave to be updated. */
	2572	Gridder contentPtr, / Content to be updated. */
2573	2573	int row, /* New row or -1 to be unchanged. */
2574	2574	int numRows) /* New rowspan or -1 to be unchanged. */
2575	2575	{
2576	2576	int newRow, newNumRows, lastRow;
2577	2577
2578		newRow = (row >= 0) ? row : slavePtr->row;
2579		newNumRows = (numRows >= 1) ? numRows : slavePtr->numRows;
	2578	newRow = (row >= 0) ? row : contentPtr->row;
	2579	newNumRows = (numRows >= 1) ? numRows : contentPtr->numRows;
2580	2580
2581	2581	lastRow = ((newRow >= 0) ? newRow : 0) + newNumRows;
2582	2582	if (lastRow >= MAX_ELEMENT) {

2585	2585	return TCL_ERROR;
2586	2586	}
2587	2587
2588		slavePtr->row = newRow;
2589		slavePtr->numRows = newNumRows;
	2588	contentPtr->row = newRow;
	2589	contentPtr->numRows = newNumRows;
2590	2590	return TCL_OK;
2591	2591	}
2592	2592

2602	2602	* TRUE if the index is OK, False otherwise.
2603	2603	*
2604	2604	* Side effects:
2605		* A new master grid structure may be created. If so, then it is
	2605	* A new container grid structure may be created. If so, then it is
2606	2606	* initialized. In addition, additional storage for a row or column
2607	2607	* constraints may be allocated, and the constraint maximums are
2608	2608	* adjusted.

2612	2612
2613	2613	static int
2614	2614	CheckSlotData(
2615		Gridder masterPtr, / The geometry master for this grid. */
	2615	Gridder containerPtr, / The geometry container for this grid. */
2616	2616	int slot, /* Which slot to look at. */
2617	2617	int slotType, /* ROW or COLUMN. */
2618	2618	int checkOnly) /* Don't allocate new space if true. */

2628	2628	return TCL_ERROR;
2629	2629	}
2630	2630
2631		if ((checkOnly == CHECK_ONLY) && (masterPtr->masterDataPtr == NULL)) {
	2631	if ((checkOnly == CHECK_ONLY) && (containerPtr->containerDataPtr == NULL)) {
2632	2632	return TCL_ERROR;
2633	2633	}
2634	2634

2638	2638	* of the offsets as well.
2639	2639	*/
2640	2640
2641		InitMasterData(masterPtr);
2642		end = (slotType == ROW) ? masterPtr->masterDataPtr->rowMax :
2643		masterPtr->masterDataPtr->columnMax;
	2641	InitContainerData(containerPtr);
	2642	end = (slotType == ROW) ? containerPtr->containerDataPtr->rowMax :
	2643	containerPtr->containerDataPtr->columnMax;
2644	2644	if (checkOnly == CHECK_ONLY) {
2645	2645	return ((end < slot) ? TCL_ERROR : TCL_OK);
2646	2646	} else {
2647		numSlot = (slotType == ROW) ? masterPtr->masterDataPtr->rowSpace
2648		: masterPtr->masterDataPtr->columnSpace;
	2647	numSlot = (slotType == ROW) ? containerPtr->containerDataPtr->rowSpace
	2648	: containerPtr->containerDataPtr->columnSpace;
2649	2649	if (slot >= numSlot) {
2650	2650	int newNumSlot = slot + PREALLOC;
2651	2651	size_t oldSize = numSlot * sizeof(SlotInfo);
2652	2652	size_t newSize = newNumSlot * sizeof(SlotInfo);
2653		SlotInfo *newSI = ckalloc(newSize);
	2653	SlotInfo newSI = (SlotInfo )ckalloc(newSize);
2654	2654	SlotInfo *oldSI = (slotType == ROW)
2655		? masterPtr->masterDataPtr->rowPtr
2656		: masterPtr->masterDataPtr->columnPtr;
	2655	? containerPtr->containerDataPtr->rowPtr
	2656	: containerPtr->containerDataPtr->columnPtr;
2657	2657
2658	2658	memcpy(newSI, oldSI, oldSize);
2659	2659	memset(newSI+numSlot, 0, newSize - oldSize);
2660	2660	ckfree(oldSI);
2661	2661	if (slotType == ROW) {
2662		masterPtr->masterDataPtr->rowPtr = newSI;
2663		masterPtr->masterDataPtr->rowSpace = newNumSlot;
	2662	containerPtr->containerDataPtr->rowPtr = newSI;
	2663	containerPtr->containerDataPtr->rowSpace = newNumSlot;
2664	2664	} else {
2665		masterPtr->masterDataPtr->columnPtr = newSI;
2666		masterPtr->masterDataPtr->columnSpace = newNumSlot;
	2665	containerPtr->containerDataPtr->columnPtr = newSI;
	2666	containerPtr->containerDataPtr->columnSpace = newNumSlot;
2667	2667	}
2668	2668	}
2669	2669	if (slot >= end && checkOnly != CHECK_SPACE) {
2670	2670	if (slotType == ROW) {
2671		masterPtr->masterDataPtr->rowMax = slot+1;
	2671	containerPtr->containerDataPtr->rowMax = slot+1;
2672	2672	} else {
2673		masterPtr->masterDataPtr->columnMax = slot+1;
	2673	containerPtr->containerDataPtr->columnMax = slot+1;
2674	2674	}
2675	2675	}
2676	2676	return TCL_OK;

2680	2680	/*
2681	2681	*----------------------------------------------------------------------
2682	2682	*
2683		* InitMasterData --
	2683	* InitContainerData --
2684	2684	*
2685	2685	* This internal procedure is used to allocate and initialize the data
2686		* for a geometry master, if the data doesn't exist already.
	2686	* for a geometry container, if the data doesn't exist already.
2687	2687	*
2688	2688	* Results:
2689	2689	* none
2690	2690	*
2691	2691	* Side effects:
2692		* A new master grid structure may be created. If so, then it is
	2692	* A new container grid structure may be created. If so, then it is
2693	2693	* initialized.
2694	2694	*
2695	2695	*----------------------------------------------------------------------
2696	2696	*/
2697	2697
2698	2698	static void
2699		InitMasterData(
2700		Gridder *masterPtr)
	2699	InitContainerData(
	2700	Gridder *containerPtr)
2701	2701	{
2702		if (masterPtr->masterDataPtr == NULL) {
2703		GridMaster *gridPtr = masterPtr->masterDataPtr =
2704		ckalloc(sizeof(GridMaster));
	2702	if (containerPtr->containerDataPtr == NULL) {
	2703	GridContainer gridPtr = containerPtr->containerDataPtr = (GridContainer )
	2704	ckalloc(sizeof(GridContainer));
2705	2705	size_t size = sizeof(SlotInfo) * TYPICAL_SIZE;
2706	2706
2707	2707	gridPtr->columnEnd = 0;
2708	2708	gridPtr->columnMax = 0;
2709		gridPtr->columnPtr = ckalloc(size);
	2709	gridPtr->columnPtr = (SlotInfo *)ckalloc(size);
2710	2710	gridPtr->columnSpace = TYPICAL_SIZE;
2711	2711	gridPtr->rowEnd = 0;
2712	2712	gridPtr->rowMax = 0;
2713		gridPtr->rowPtr = ckalloc(size);
	2713	gridPtr->rowPtr = (SlotInfo *)ckalloc(size);
2714	2714	gridPtr->rowSpace = TYPICAL_SIZE;
2715	2715	gridPtr->startX = 0;
2716	2716	gridPtr->startY = 0;

2726	2726	*
2727	2727	* Unlink --
2728	2728	*
2729		* Remove a grid from its master's list of slaves.
	2729	* Remove a grid from its container's list of content.
2730	2730	*
2731	2731	* Results:
2732	2732	* None.
2733	2733	*
2734	2734	* Side effects:
2735		* The master will be scheduled for re-arranging, and the size of the
	2735	* The container will be scheduled for re-arranging, and the size of the
2736	2736	* grid will be adjusted accordingly
2737	2737	*
2738	2738	*----------------------------------------------------------------------

2740	2740
2741	2741	static void
2742	2742	Unlink(
2743		register Gridder slavePtr) / Window to unlink. */
	2743	Gridder contentPtr) / Window to unlink. */
2744	2744	{
2745		register Gridder masterPtr, slavePtr2;
2746
2747		masterPtr = slavePtr->masterPtr;
2748		if (masterPtr == NULL) {
	2745	Gridder containerPtr, contentPtr2;
	2746
	2747	containerPtr = contentPtr->containerPtr;
	2748	if (containerPtr == NULL) {
2749	2749	return;
2750	2750	}
2751	2751
2752		if (masterPtr->slavePtr == slavePtr) {
2753		masterPtr->slavePtr = slavePtr->nextPtr;
	2752	if (containerPtr->contentPtr == contentPtr) {
	2753	containerPtr->contentPtr = contentPtr->nextPtr;
2754	2754	} else {
2755		for (slavePtr2=masterPtr->slavePtr ; ; slavePtr2=slavePtr2->nextPtr) {
2756		if (slavePtr2 == NULL) {
	2755	for (contentPtr2=containerPtr->contentPtr ; ; contentPtr2=contentPtr2->nextPtr) {
	2756	if (contentPtr2 == NULL) {
2757	2757	Tcl_Panic("Unlink couldn't find previous window");
2758	2758	}
2759		if (slavePtr2->nextPtr == slavePtr) {
2760		slavePtr2->nextPtr = slavePtr->nextPtr;
	2759	if (contentPtr2->nextPtr == contentPtr) {
	2760	contentPtr2->nextPtr = contentPtr->nextPtr;
2761	2761	break;
2762	2762	}
2763	2763	}
2764	2764	}
2765		if (!(masterPtr->flags & REQUESTED_RELAYOUT)) {
2766		masterPtr->flags \|= REQUESTED_RELAYOUT;
2767		Tcl_DoWhenIdle(ArrangeGrid, masterPtr);
2768		}
2769		if (masterPtr->abortPtr != NULL) {
2770		*masterPtr->abortPtr = 1;
2771		}
2772
2773		SetGridSize(slavePtr->masterPtr);
2774		slavePtr->masterPtr = NULL;
2775
2776		/*
2777		* If we have emptied this master from slaves it means we are no longer
	2765	if (!(containerPtr->flags & REQUESTED_RELAYOUT)) {
	2766	containerPtr->flags \|= REQUESTED_RELAYOUT;
	2767	Tcl_DoWhenIdle(ArrangeGrid, containerPtr);
	2768	}
	2769	if (containerPtr->abortPtr != NULL) {
	2770	*containerPtr->abortPtr = 1;
	2771	}
	2772
	2773	SetGridSize(contentPtr->containerPtr);
	2774	contentPtr->containerPtr = NULL;
	2775
	2776	/*
	2777	* If we have emptied this container from content it means we are no longer
2778	2778	* handling it and should mark it as free.
2779	2779	*/
2780	2780
2781		if ((masterPtr->slavePtr == NULL) && (masterPtr->flags & ALLOCED_MASTER)) {
2782		TkFreeGeometryMaster(masterPtr->tkwin, "grid");
2783		masterPtr->flags &= ~ALLOCED_MASTER;
	2781	if ((containerPtr->contentPtr == NULL) && (containerPtr->flags & ALLOCED_CONTAINER)) {
	2782	TkFreeGeometryContainer(containerPtr->tkwin, "grid");
	2783	containerPtr->flags &= ~ALLOCED_CONTAINER;
2784	2784	}
2785	2785	}
2786	2786

2792	2792	* This procedure is invoked by Tcl_EventuallyFree or Tcl_Release to
2793	2793	* clean up the internal structure of a grid at a safe time (when no-one
2794	2794	* is using it anymore). Cleaning up the grid involves freeing the main
2795		* structure for all windows and the master structure for geometry
	2795	* structure for all windows and the container structure for geometry
2796	2796	* managers.
2797	2797	*
2798	2798	* Results:

2808	2808	DestroyGrid(
2809	2809	void memPtr) / Info about window that is now dead. */
2810	2810	{
2811		register Gridder *gridPtr = memPtr;
2812
2813		if (gridPtr->masterDataPtr != NULL) {
2814		if (gridPtr->masterDataPtr->rowPtr != NULL) {
2815		ckfree(gridPtr->masterDataPtr -> rowPtr);
2816		}
2817		if (gridPtr->masterDataPtr->columnPtr != NULL) {
2818		ckfree(gridPtr->masterDataPtr -> columnPtr);
2819		}
2820		ckfree(gridPtr->masterDataPtr);
	2811	Gridder gridPtr = (Gridder )memPtr;
	2812
	2813	if (gridPtr->containerDataPtr != NULL) {
	2814	if (gridPtr->containerDataPtr->rowPtr != NULL) {
	2815	ckfree(gridPtr->containerDataPtr -> rowPtr);
	2816	}
	2817	if (gridPtr->containerDataPtr->columnPtr != NULL) {
	2818	ckfree(gridPtr->containerDataPtr -> columnPtr);
	2819	}
	2820	ckfree(gridPtr->containerDataPtr);
2821	2821	}
2822	2822	if (gridPtr->in != NULL) {
2823	2823	Tcl_DecrRefCount(gridPtr->in);

2838	2838	*
2839	2839	* Side effects:
2840	2840	* If a window was just deleted, clean up all its grid-related
2841		* information. If it was just resized, re-configure its slaves, if any.
	2841	* information. If it was just resized, re-configure its content, if any.
2842	2842	*
2843	2843	*----------------------------------------------------------------------
2844	2844	*/

2849	2849	* eventPtr. */
2850	2850	XEvent eventPtr) / Describes what just happened. */
2851	2851	{
2852		register Gridder *gridPtr = clientData;
	2852	Gridder gridPtr = (Gridder )clientData;
2853	2853	TkDisplay dispPtr = ((TkWindow ) gridPtr->tkwin)->dispPtr;
2854	2854
2855	2855	if (eventPtr->type == ConfigureNotify) {
2856		if ((gridPtr->slavePtr != NULL)
	2856	if ((gridPtr->contentPtr != NULL)
2857	2857	&& !(gridPtr->flags & REQUESTED_RELAYOUT)) {
2858	2858	gridPtr->flags \|= REQUESTED_RELAYOUT;
2859	2859	Tcl_DoWhenIdle(ArrangeGrid, gridPtr);
2860	2860	}
2861		if ((gridPtr->masterPtr != NULL) &&
	2861	if ((gridPtr->containerPtr != NULL) &&
2862	2862	(gridPtr->doubleBw != 2*Tk_Changes(gridPtr->tkwin)->border_width)) {
2863		if (!(gridPtr->masterPtr->flags & REQUESTED_RELAYOUT)) {
	2863	if (!(gridPtr->containerPtr->flags & REQUESTED_RELAYOUT)) {
2864	2864	gridPtr->doubleBw = 2*Tk_Changes(gridPtr->tkwin)->border_width;
2865		gridPtr->masterPtr->flags \|= REQUESTED_RELAYOUT;
2866		Tcl_DoWhenIdle(ArrangeGrid, gridPtr->masterPtr);
	2865	gridPtr->containerPtr->flags \|= REQUESTED_RELAYOUT;
	2866	Tcl_DoWhenIdle(ArrangeGrid, gridPtr->containerPtr);
2867	2867	}
2868	2868	}
2869	2869	} else if (eventPtr->type == DestroyNotify) {
2870		register Gridder slavePtr, nextPtr;
2871
2872		if (gridPtr->masterPtr != NULL) {
	2870	Gridder contentPtr, nextPtr;
	2871
	2872	if (gridPtr->containerPtr != NULL) {
2873	2873	Unlink(gridPtr);
2874	2874	}
2875		for (slavePtr = gridPtr->slavePtr; slavePtr != NULL;
2876		slavePtr = nextPtr) {
2877		Tk_ManageGeometry(slavePtr->tkwin, NULL, NULL);
2878		Tk_UnmapWindow(slavePtr->tkwin);
2879		slavePtr->masterPtr = NULL;
2880		nextPtr = slavePtr->nextPtr;
2881		slavePtr->nextPtr = NULL;
	2875	for (contentPtr = gridPtr->contentPtr; contentPtr != NULL;
	2876	contentPtr = nextPtr) {
	2877	Tk_ManageGeometry(contentPtr->tkwin, NULL, NULL);
	2878	Tk_UnmapWindow(contentPtr->tkwin);
	2879	contentPtr->containerPtr = NULL;
	2880	nextPtr = contentPtr->nextPtr;
	2881	contentPtr->nextPtr = NULL;
2882	2882	}
2883	2883	Tcl_DeleteHashEntry(Tcl_FindHashEntry(&dispPtr->gridHashTable,
2884		(char *) gridPtr->tkwin));
	2884	(char *)gridPtr->tkwin));
2885	2885	if (gridPtr->flags & REQUESTED_RELAYOUT) {
2886	2886	Tcl_CancelIdleCall(ArrangeGrid, gridPtr);
2887	2887	}
2888	2888	gridPtr->tkwin = NULL;
2889	2889	Tcl_EventuallyFree(gridPtr, (Tcl_FreeProc *)DestroyGrid);
2890	2890	} else if (eventPtr->type == MapNotify) {
2891		if ((gridPtr->slavePtr != NULL)
	2891	if ((gridPtr->contentPtr != NULL)
2892	2892	&& !(gridPtr->flags & REQUESTED_RELAYOUT)) {
2893	2893	gridPtr->flags \|= REQUESTED_RELAYOUT;
2894	2894	Tcl_DoWhenIdle(ArrangeGrid, gridPtr);
2895	2895	}
2896	2896	} else if (eventPtr->type == UnmapNotify) {
2897		register Gridder *slavePtr;
2898
2899		for (slavePtr = gridPtr->slavePtr; slavePtr != NULL;
2900		slavePtr = slavePtr->nextPtr) {
2901		Tk_UnmapWindow(slavePtr->tkwin);
	2897	Gridder *contentPtr;
	2898
	2899	for (contentPtr = gridPtr->contentPtr; contentPtr != NULL;
	2900	contentPtr = contentPtr->nextPtr) {
	2901	Tk_UnmapWindow(contentPtr->tkwin);
2902	2902	}
2903	2903	}
2904	2904	}

2906	2906	/*
2907	2907	*----------------------------------------------------------------------
2908	2908	*
2909		* ConfigureSlaves --
	2909	* ConfigureContent --
2910	2910	*
2911	2911	* This implements the guts of the "grid configure" command. Given a list
2912		* of slaves and configuration options, it arranges for the grid to
2913		* manage the slaves and sets the specified options. Arguments consist
	2912	* of content and configuration options, it arranges for the grid to
	2913	* manage the content and sets the specified options. Arguments consist
2914	2914	* of windows or window shortcuts followed by "-option value" pairs.
2915	2915	*
2916	2916	* Results:

2918	2918	* and the interp's result is set to contain an error message.
2919	2919	*
2920	2920	* Side effects:
2921		* Slave windows get taken over by the grid.
	2921	* Content windows get taken over by the grid.
2922	2922	*
2923	2923	*----------------------------------------------------------------------
2924	2924	*/
2925	2925
2926	2926	static int
2927		ConfigureSlaves(
	2927	ConfigureContent(
2928	2928	Tcl_Interp interp, / Interpreter for error reporting. */
2929	2929	Tk_Window tkwin, /* Any window in application containing
2930		* slaves. Used to look up slave names. */
	2930	* content. Used to look up content names. */
2931	2931	int objc, /* Number of elements in argv. */
2932	2932	Tcl_Obj const objv[]) / Argument objects: contains one or more
2933	2933	* window names followed by any number of
2934	2934	* "option value" pairs. Caller must make sure
2935	2935	* that there is at least one window name. */
2936	2936	{
2937		Gridder *masterPtr = NULL;
2938		Gridder *slavePtr;
2939		Tk_Window other, slave, parent, ancestor;
2940		TkWindow *master;
	2937	Gridder *containerPtr = NULL;
	2938	Gridder *contentPtr;
	2939	Tk_Window other, content, parent, ancestor;
	2940	TkWindow *container;
2941	2941	int i, j, tmp;
2942	2942	int numWindows;
2943	2943	int width;

2973	2973
2974	2974	if (firstChar == '.') {
2975	2975	/*
2976		* Check that windows are valid, and locate the first slave's
	2976	* Check that windows are valid, and locate the first content's
2977	2977	* parent window (default for -in).
2978	2978	*/
2979	2979
2980		if (TkGetWindowFromObj(interp, tkwin, objv[i], &slave) != TCL_OK) {
	2980	if (TkGetWindowFromObj(interp, tkwin, objv[i], &content) != TCL_OK) {
2981	2981	return TCL_ERROR;
2982	2982	}
2983		if (masterPtr == NULL) {
	2983	if (containerPtr == NULL) {
2984	2984	/*
2985		* Is there any saved -in from a removed slave?
	2985	* Is there any saved -in from a removed content?
2986	2986	* If there is, it becomes default for -in.
2987		* If the stored master does not exist, just ignore it.
	2987	* If the stored container does not exist, just ignore it.
2988	2988	*/
2989	2989
2990		struct Gridder *slavePtr = GetGrid(slave);
2991		if (slavePtr->in != NULL) {
2992		if (TkGetWindowFromObj(interp, slave, slavePtr->in, &parent)
	2990	contentPtr = GetGrid(content);
	2991	if (contentPtr->in != NULL) {
	2992	if (TkGetWindowFromObj(interp, content, contentPtr->in, &parent)
2993	2993	== TCL_OK) {
2994		masterPtr = GetGrid(parent);
2995		InitMasterData(masterPtr);
	2994	containerPtr = GetGrid(parent);
	2995	InitContainerData(containerPtr);
2996	2996	}
2997	2997	}
2998	2998	}
2999		if (masterPtr == NULL) {
3000		parent = Tk_Parent(slave);
	2999	if (containerPtr == NULL) {
	3000	parent = Tk_Parent(content);
3001	3001	if (parent != NULL) {
3002		masterPtr = GetGrid(parent);
3003		InitMasterData(masterPtr);
	3002	containerPtr = GetGrid(parent);
	3003	InitContainerData(containerPtr);
3004	3004	}
3005	3005	}
3006	3006	numWindows++;

3068	3068	TCL_OK) {
3069	3069	return TCL_ERROR;
3070	3070	}
3071		masterPtr = GetGrid(other);
3072		InitMasterData(masterPtr);
	3071	containerPtr = GetGrid(other);
	3072	InitContainerData(containerPtr);
3073	3073	} else if (index == CONF_ROW) {
3074	3074	if (Tcl_GetIntFromObj(interp, objv[i+1], &tmp) != TCL_OK
3075	3075	\|\| tmp < 0) {

3085	3085
3086	3086	/*
3087	3087	* If no -row is given, use the next row after the highest occupied row
3088		* of the master.
	3088	* of the container.
3089	3089	*/
3090	3090
3091	3091	if (defaultRow < 0) {
3092		if (masterPtr != NULL && masterPtr->masterDataPtr != NULL) {
3093		SetGridSize(masterPtr);
3094		defaultRow = masterPtr->masterDataPtr->rowEnd;
	3092	if (containerPtr != NULL && containerPtr->containerDataPtr != NULL) {
	3093	SetGridSize(containerPtr);
	3094	defaultRow = containerPtr->containerDataPtr->rowEnd;
3095	3095	} else {
3096	3096	defaultRow = 0;
3097	3097	}
3098	3098	}
3099	3099
3100	3100	/*
3101		* Iterate over all of the slave windows and short-cuts, parsing options
3102		* for each slave. It's a bit wasteful to re-parse the options for each
3103		* slave, but things get too messy if we try to parse the arguments just
3104		* once at the beginning. For example, if a slave already is managed we
	3101	* Iterate over all of the content windows and short-cuts, parsing options
	3102	* for each content. It's a bit wasteful to re-parse the options for each
	3103	* content, but things get too messy if we try to parse the arguments just
	3104	* once at the beginning. For example, if a content already is managed we
3105	3105	* want to just change a few existing values without resetting everything.
3106	3106	* If there are multiple windows, the -in option only gets processed for
3107	3107	* the first window.

3114	3114
3115	3115	/*
3116	3116	* '^' and 'x' cause us to skip a column. '-' is processed as part of
3117		* its preceeding slave.
	3117	* its preceeding content.
3118	3118	*/
3119	3119
3120	3120	if ((firstChar == REL_VERT) \|\| (firstChar == REL_SKIP)) {

3127	3127
3128	3128	for (defaultColumnSpan = 1; j + defaultColumnSpan < numWindows;
3129	3129	defaultColumnSpan++) {
3130		const char *string = Tcl_GetString(objv[j + defaultColumnSpan]);
	3130	string = Tcl_GetString(objv[j + defaultColumnSpan]);
3131	3131
3132	3132	if (*string != REL_HORIZ) {
3133	3133	break;
3134	3134	}
3135	3135	}
3136	3136
3137		if (TkGetWindowFromObj(interp, tkwin, objv[j], &slave) != TCL_OK) {
	3137	if (TkGetWindowFromObj(interp, tkwin, objv[j], &content) != TCL_OK) {
3138	3138	return TCL_ERROR;
3139	3139	}
3140	3140
3141		if (Tk_TopWinHierarchy(slave)) {
	3141	if (Tk_TopWinHierarchy(content)) {
3142	3142	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
3143	3143	"can't manage \"%s\": it's a top-level window",
3144	3144	Tcl_GetString(objv[j])));
3145	3145	Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "TOPLEVEL", NULL);
3146	3146	return TCL_ERROR;
3147	3147	}
3148		slavePtr = GetGrid(slave);
	3148	contentPtr = GetGrid(content);
3149	3149
3150	3150	/*
3151	3151	* The following statement is taken from tkPack.c:
3152	3152	*
3153		* "If the slave isn't currently managed, reset all of its
	3153	* "If the content isn't currently managed, reset all of its
3154	3154	* configuration information to default values (there could be old
3155	3155	* values left from a previous packer)."
3156	3156	*
3157		* I [D.S.] disagree with this statement. If a slave is disabled
	3157	* I [D.S.] disagree with this statement. If a content is disabled
3158	3158	* (using "forget") and then re-enabled, I submit that 90% of the time
3159	3159	* the programmer will want it to retain its old configuration
3160	3160	* information. If the programmer doesn't want this behavior, then the

3175	3175	Tcl_SetErrorCode(interp, "TK", "VALUE", "COLUMN", NULL);
3176	3176	return TCL_ERROR;
3177	3177	}
3178		if (SetSlaveColumn(interp, slavePtr, tmp, -1) != TCL_OK) {
	3178	if (SetContentColumn(interp, contentPtr, tmp, -1) != TCL_OK) {
3179	3179	return TCL_ERROR;
3180	3180	}
3181	3181	break;

3188	3188	Tcl_SetErrorCode(interp, "TK", "VALUE", "SPAN", NULL);
3189	3189	return TCL_ERROR;
3190	3190	}
3191		if (SetSlaveColumn(interp, slavePtr, -1, tmp) != TCL_OK) {
	3191	if (SetContentColumn(interp, contentPtr, -1, tmp) != TCL_OK) {
3192	3192	return TCL_ERROR;
3193	3193	}
3194	3194	break;

3197	3197	&other) != TCL_OK) {
3198	3198	return TCL_ERROR;
3199	3199	}
3200		if (other == slave) {
	3200	if (other == content) {
3201	3201	Tcl_SetObjResult(interp, Tcl_NewStringObj(
3202	3202	"window can't be managed in itself", -1));
3203	3203	Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "SELF", NULL);
3204	3204	return TCL_ERROR;
3205	3205	}
3206	3206	positionGiven = 1;
3207		masterPtr = GetGrid(other);
3208		InitMasterData(masterPtr);
	3207	containerPtr = GetGrid(other);
	3208	InitContainerData(containerPtr);
3209	3209	break;
3210	3210	case CONF_STICKY: {
3211	3211	int sticky = StringToSticky(Tcl_GetString(objv[i+1]));

3218	3218	Tcl_SetErrorCode(interp, "TK", "VALUE", "STICKY", NULL);
3219	3219	return TCL_ERROR;
3220	3220	}
3221		slavePtr->sticky = sticky;
	3221	contentPtr->sticky = sticky;
3222	3222	break;
3223	3223	}
3224	3224	case CONF_IPADX:
3225		if ((Tk_GetPixelsFromObj(NULL, slave, objv[i+1],
	3225	if ((Tk_GetPixelsFromObj(NULL, content, objv[i+1],
3226	3226	&tmp) != TCL_OK) \|\| (tmp < 0)) {
3227	3227	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
3228	3228	"bad ipadx value \"%s\": must be positive screen distance",

3230	3230	Tcl_SetErrorCode(interp, "TK", "VALUE", "INT_PAD", NULL);
3231	3231	return TCL_ERROR;
3232	3232	}
3233		slavePtr->iPadX = tmp * 2;
	3233	contentPtr->iPadX = tmp * 2;
3234	3234	break;
3235	3235	case CONF_IPADY:
3236		if ((Tk_GetPixelsFromObj(NULL, slave, objv[i+1],
	3236	if ((Tk_GetPixelsFromObj(NULL, content, objv[i+1],
3237	3237	&tmp) != TCL_OK) \|\| (tmp < 0)) {
3238	3238	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
3239	3239	"bad ipady value \"%s\": must be positive screen distance",

3241	3241	Tcl_SetErrorCode(interp, "TK", "VALUE", "INT_PAD", NULL);
3242	3242	return TCL_ERROR;
3243	3243	}
3244		slavePtr->iPadY = tmp * 2;
	3244	contentPtr->iPadY = tmp * 2;
3245	3245	break;
3246	3246	case CONF_PADX:
3247	3247	if (TkParsePadAmount(interp, tkwin, objv[i+1],
3248		&slavePtr->padLeft, &slavePtr->padX) != TCL_OK) {
	3248	&contentPtr->padLeft, &contentPtr->padX) != TCL_OK) {
3249	3249	return TCL_ERROR;
3250	3250	}
3251	3251	break;
3252	3252	case CONF_PADY:
3253	3253	if (TkParsePadAmount(interp, tkwin, objv[i+1],
3254		&slavePtr->padTop, &slavePtr->padY) != TCL_OK) {
	3254	&contentPtr->padTop, &contentPtr->padY) != TCL_OK) {
3255	3255	return TCL_ERROR;
3256	3256	}
3257	3257	break;

3264	3264	Tcl_SetErrorCode(interp, "TK", "VALUE", "COLUMN", NULL);
3265	3265	return TCL_ERROR;
3266	3266	}
3267		if (SetSlaveRow(interp, slavePtr, tmp, -1) != TCL_OK) {
	3267	if (SetContentRow(interp, contentPtr, tmp, -1) != TCL_OK) {
3268	3268	return TCL_ERROR;
3269	3269	}
3270	3270	break;

3277	3277	Tcl_SetErrorCode(interp, "TK", "VALUE", "SPAN", NULL);
3278	3278	return TCL_ERROR;
3279	3279	}
3280		if (SetSlaveRow(interp, slavePtr, -1, tmp) != TCL_OK) {
	3280	if (SetContentRow(interp, contentPtr, -1, tmp) != TCL_OK) {
3281	3281	return TCL_ERROR;
3282	3282	}
3283	3283	break;

3285	3285	}
3286	3286
3287	3287	/*
3288		* If no position was specified via -in and the slave is already
	3288	* If no position was specified via -in and the content is already
3289	3289	* packed, then leave it in its current location.
3290	3290	*/
3291	3291
3292		if (!positionGiven && (slavePtr->masterPtr != NULL)) {
3293		masterPtr = slavePtr->masterPtr;
	3292	if (!positionGiven && (contentPtr->containerPtr != NULL)) {
	3293	containerPtr = contentPtr->containerPtr;
3294	3294	goto scheduleLayout;
3295	3295	}
3296	3296

3299	3299	* its current location.
3300	3300	*/
3301	3301
3302		if (positionGiven && (masterPtr == slavePtr->masterPtr)) {
	3302	if (positionGiven && (containerPtr == contentPtr->containerPtr)) {
3303	3303	goto scheduleLayout;
3304	3304	}
3305	3305
3306	3306	/*
3307		* Make sure we have a geometry master. We look at:
	3307	* Make sure we have a geometry container. We look at:
3308	3308	* 1) the -in flag
3309		* 2) the parent of the first slave.
	3309	* 2) the parent of the first content.
3310	3310	*/
3311	3311
3312		parent = Tk_Parent(slave);
3313		if (masterPtr == NULL) {
3314		masterPtr = GetGrid(parent);
3315		InitMasterData(masterPtr);
	3312	parent = Tk_Parent(content);
	3313	if (containerPtr == NULL) {
	3314	containerPtr = GetGrid(parent);
	3315	InitContainerData(containerPtr);
3316	3316	}
3317	3317
3318		if (slavePtr->masterPtr != NULL && slavePtr->masterPtr != masterPtr) {
3319		if (slavePtr->masterPtr->tkwin != Tk_Parent(slavePtr->tkwin)) {
3320		Tk_UnmaintainGeometry(slavePtr->tkwin, slavePtr->masterPtr->tkwin);
	3318	if (contentPtr->containerPtr != NULL && contentPtr->containerPtr != containerPtr) {
	3319	if (contentPtr->containerPtr->tkwin != Tk_Parent(contentPtr->tkwin)) {
	3320	Tk_UnmaintainGeometry(contentPtr->tkwin, contentPtr->containerPtr->tkwin);
3321	3321	}
3322		Unlink(slavePtr);
3323		slavePtr->masterPtr = NULL;
3324		}
3325
3326		if (slavePtr->masterPtr == NULL) {
3327		Gridder *tempPtr = masterPtr->slavePtr;
3328
3329		slavePtr->masterPtr = masterPtr;
3330		masterPtr->slavePtr = slavePtr;
3331		slavePtr->nextPtr = tempPtr;
	3322	Unlink(contentPtr);
	3323	contentPtr->containerPtr = NULL;
	3324	}
	3325
	3326	if (contentPtr->containerPtr == NULL) {
	3327	Gridder *tempPtr = containerPtr->contentPtr;
	3328
	3329	contentPtr->containerPtr = containerPtr;
	3330	containerPtr->contentPtr = contentPtr;
	3331	contentPtr->nextPtr = tempPtr;
3332	3332	}
3333	3333
3334	3334	/*
3335		* Make sure that the slave's parent is either the master or an
3336		* ancestor of the master, and that the master and slave aren't the
	3335	* Make sure that the content's parent is either the container or an
	3336	* ancestor of the container, and that the container and content aren't the
3337	3337	* same.
3338	3338	*/
3339	3339
3340		for (ancestor = masterPtr->tkwin; ; ancestor = Tk_Parent(ancestor)) {
	3340	for (ancestor = containerPtr->tkwin; ; ancestor = Tk_Parent(ancestor)) {
3341	3341	if (ancestor == parent) {
3342	3342	break;
3343	3343	}
3344	3344	if (Tk_TopWinHierarchy(ancestor)) {
3345	3345	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
3346	3346	"can't put %s inside %s", Tcl_GetString(objv[j]),
3347		Tk_PathName(masterPtr->tkwin)));
	3347	Tk_PathName(containerPtr->tkwin)));
3348	3348	Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "HIERARCHY", NULL);
3349		Unlink(slavePtr);
	3349	Unlink(contentPtr);
3350	3350	return TCL_ERROR;
3351	3351	}
3352	3352	}

3355	3355	* Check for management loops.
3356	3356	*/
3357	3357
3358		for (master = (TkWindow *)masterPtr->tkwin; master != NULL;
3359		master = (TkWindow *)TkGetGeomMaster(master)) {
3360		if (master == (TkWindow *)slave) {
	3358	for (container = (TkWindow *)containerPtr->tkwin; container != NULL;
	3359	container = (TkWindow *)TkGetContainer(container)) {
	3360	if (container == (TkWindow *)content) {
3361	3361	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
3362	3362	"can't put %s inside %s, would cause management loop",
3363		Tcl_GetString(objv[j]), Tk_PathName(masterPtr->tkwin)));
	3363	Tcl_GetString(objv[j]), Tk_PathName(containerPtr->tkwin)));
3364	3364	Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "LOOP", NULL);
3365		Unlink(slavePtr);
	3365	Unlink(contentPtr);
3366	3366	return TCL_ERROR;
3367	3367	}
3368	3368	}
3369		if (masterPtr->tkwin != Tk_Parent(slave)) {
3370		((TkWindow )slave)->maintainerPtr = (TkWindow )masterPtr->tkwin;
3371		}
3372
3373		Tk_ManageGeometry(slave, &gridMgrType, slavePtr);
3374
3375		if (!(masterPtr->flags & DONT_PROPAGATE)) {
3376		if (TkSetGeometryMaster(interp, masterPtr->tkwin, "grid")
	3369	if (containerPtr->tkwin != Tk_Parent(content)) {
	3370	((TkWindow )content)->maintainerPtr = (TkWindow )containerPtr->tkwin;
	3371	}
	3372
	3373	Tk_ManageGeometry(content, &gridMgrType, contentPtr);
	3374
	3375	if (!(containerPtr->flags & DONT_PROPAGATE)) {
	3376	if (TkSetGeometryContainer(interp, containerPtr->tkwin, "grid")
3377	3377	!= TCL_OK) {
3378		Tk_ManageGeometry(slave, NULL, NULL);
3379		Unlink(slavePtr);
	3378	Tk_ManageGeometry(content, NULL, NULL);
	3379	Unlink(contentPtr);
3380	3380	return TCL_ERROR;
3381	3381	}
3382		masterPtr->flags \|= ALLOCED_MASTER;
	3382	containerPtr->flags \|= ALLOCED_CONTAINER;
3383	3383	}
3384	3384
3385	3385	/*
3386	3386	* Assign default position information.
3387	3387	*/
3388	3388
3389		if (slavePtr->column == -1) {
3390		if (SetSlaveColumn(interp, slavePtr, defaultColumn,-1) != TCL_OK){
	3389	if (contentPtr->column == -1) {
	3390	if (SetContentColumn(interp, contentPtr, defaultColumn,-1) != TCL_OK){
3391	3391	return TCL_ERROR;
3392	3392	}
3393	3393	}
3394		if (SetSlaveColumn(interp, slavePtr, -1,
3395		slavePtr->numCols + defaultColumnSpan - 1) != TCL_OK) {
	3394	if (SetContentColumn(interp, contentPtr, -1,
	3395	contentPtr->numCols + defaultColumnSpan - 1) != TCL_OK) {
3396	3396	return TCL_ERROR;
3397	3397	}
3398		if (slavePtr->row == -1) {
3399		if (SetSlaveRow(interp, slavePtr, defaultRow, -1) != TCL_OK) {
	3398	if (contentPtr->row == -1) {
	3399	if (SetContentRow(interp, contentPtr, defaultRow, -1) != TCL_OK) {
3400	3400	return TCL_ERROR;
3401	3401	}
3402	3402	}
3403		defaultColumn += slavePtr->numCols;
	3403	defaultColumn += contentPtr->numCols;
3404	3404	defaultColumnSpan = 1;
3405	3405
3406	3406	/*
3407		* Arrange for the master to be re-arranged at the first idle moment.
	3407	* Arrange for the container to be re-arranged at the first idle moment.
3408	3408	*/
3409	3409
3410	3410	scheduleLayout:
3411		if (masterPtr->abortPtr != NULL) {
3412		*masterPtr->abortPtr = 1;
3413		}
3414		if (!(masterPtr->flags & REQUESTED_RELAYOUT)) {
3415		masterPtr->flags \|= REQUESTED_RELAYOUT;
3416		Tcl_DoWhenIdle(ArrangeGrid, masterPtr);
	3411	if (containerPtr->abortPtr != NULL) {
	3412	*containerPtr->abortPtr = 1;
	3413	}
	3414	if (!(containerPtr->flags & REQUESTED_RELAYOUT)) {
	3415	containerPtr->flags \|= REQUESTED_RELAYOUT;
	3416	Tcl_DoWhenIdle(ArrangeGrid, containerPtr);
3417	3417	}
3418	3418	}
3419	3419

3429	3429	int lastRow, lastColumn; /* Implied end of table. */
3430	3430
3431	3431	string = Tcl_GetString(objv[j]);
3432		firstChar = string[0];
3433
3434		if (firstChar == '.') {
	3432	firstChar = string[0];
	3433
	3434	if (firstChar == '.') {
3435	3435	lastWindow = string;
3436	3436	numSkip = 0;
3437	3437	}

3442	3442	continue;
3443	3443	}
3444	3444
3445		if (masterPtr == NULL) {
	3445	if (containerPtr == NULL) {
3446	3446	Tcl_SetObjResult(interp, Tcl_NewStringObj(
3447	3447	"can't use '^', cant find master", -1));
3448	3448	Tcl_SetErrorCode(interp, "TK", "GRID", "SHORTCUT_USAGE", NULL);

3454	3454	*/
3455	3455
3456	3456	for (width = 1; width + j < numWindows; width++) {
3457		const char *string = Tcl_GetString(objv[j+width]);
	3457	string = Tcl_GetString(objv[j+width]);
3458	3458
3459	3459	if (*string != REL_VERT) {
3460	3460	break;

3478	3478	lastColumn += numSkip;
3479	3479
3480	3480	match = 0;
3481		for (slavePtr = masterPtr->slavePtr; slavePtr != NULL;
3482		slavePtr = slavePtr->nextPtr) {
3483
3484		if (slavePtr->column == lastColumn
3485		&& slavePtr->row + slavePtr->numRows - 1 == lastRow) {
3486		if (slavePtr->numCols <= width) {
3487		if (SetSlaveRow(interp, slavePtr, -1,
3488		slavePtr->numRows + 1) != TCL_OK) {
	3481	for (contentPtr = containerPtr->contentPtr; contentPtr != NULL;
	3482	contentPtr = contentPtr->nextPtr) {
	3483
	3484	if (contentPtr->column == lastColumn
	3485	&& contentPtr->row + contentPtr->numRows - 1 == lastRow) {
	3486	if (contentPtr->numCols <= width) {
	3487	if (SetContentRow(interp, contentPtr, -1,
	3488	contentPtr->numRows + 1) != TCL_OK) {
3489	3489	return TCL_ERROR;
3490	3490	}
3491	3491	match++;
3492		j += slavePtr->numCols - 1;
3493		lastWindow = Tk_PathName(slavePtr->tkwin);
	3492	j += contentPtr->numCols - 1;
	3493	lastWindow = Tk_PathName(contentPtr->tkwin);
3494	3494	numSkip = 0;
3495	3495	break;
3496	3496	}

3504	3504	}
3505	3505	}
3506	3506
3507		if (masterPtr == NULL) {
	3507	if (containerPtr == NULL) {
3508	3508	Tcl_SetObjResult(interp, Tcl_NewStringObj(
3509	3509	"can't determine master window", -1));
3510	3510	Tcl_SetErrorCode(interp, "TK", "GRID", "SHORTCUT_USAGE", NULL);
3511	3511	return TCL_ERROR;
3512	3512	}
3513		SetGridSize(masterPtr);
3514
3515		/*
3516		* If we have emptied this master from slaves it means we are no longer
	3513	SetGridSize(containerPtr);
	3514
	3515	/*
	3516	* If we have emptied this container from content it means we are no longer
3517	3517	* handling it and should mark it as free.
3518	3518	*/
3519	3519
3520		if (masterPtr->slavePtr == NULL && masterPtr->flags & ALLOCED_MASTER) {
3521		TkFreeGeometryMaster(masterPtr->tkwin, "grid");
3522		masterPtr->flags &= ~ALLOCED_MASTER;
	3520	if (containerPtr->contentPtr == NULL && containerPtr->flags & ALLOCED_CONTAINER) {
	3521	TkFreeGeometryContainer(containerPtr->tkwin, "grid");
	3522	containerPtr->flags &= ~ALLOCED_CONTAINER;
3523	3523	}
3524	3524
3525	3525	return TCL_OK;

+148

-151

generic/tkImage.c less more

25	25	Display display; / Display for tkwin. Needed because when the
26	26	* image is eventually freed tkwin may not
27	27	* exist anymore. */
28		struct ImageMaster *masterPtr;
29		/* Master for this image (identifiers image
	28	struct ImageModel *modelPtr;
	29	/* Model for this image (identifiers image
30	30	* manager, for example). */
31	31	ClientData instanceData; /* One word argument to pass to image manager
32	32	* when dealing with this image instance. */

39	39	} Image;
40	40
41	41	/*
42		* For each image master there is one of the following structures, which
	42	* For each image model there is one of the following structures, which
43	43	* represents a name in the image table and all of the images instantiated
44	44	* from it. Entries in mainPtr->imageTable point to these structures.
45	45	*/
46	46
47		typedef struct ImageMaster {
	47	typedef struct ImageModel {
48	48	Tk_ImageType typePtr; / Information about image type. NULL means
49	49	* that no image manager owns this image: the
50	50	* image was deleted. */
51		ClientData masterData; /* One-word argument to pass to image mgr when
52		* dealing with the master, as opposed to
	51	ClientData modelData; /* One-word argument to pass to image mgr when
	52	* dealing with the model, as opposed to
53	53	* instances. */
54	54	int width, height; /* Last known dimensions for image. */
55	55	Tcl_HashTable tablePtr; / Pointer to hash table containing image (the

63	63	int deleted; /* Flag set when image is being deleted. */
64	64	TkWindow winPtr; / Main window of interpreter (used to detect
65	65	* when the world is falling apart.) */
66		} ImageMaster;
	66	} ImageModel;
67	67
68	68	typedef struct {
69	69	Tk_ImageType imageTypeList;/ First in a list of all known image

81	81	*/
82	82
83	83	static void ImageTypeThreadExitProc(ClientData clientData);
84		static void DeleteImage(ImageMaster *masterPtr);
85		static void EventuallyDeleteImage(ImageMaster *masterPtr,
	84	static void DeleteImage(ImageModel *modelPtr);
	85	static void EventuallyDeleteImage(ImageModel *modelPtr,
86	86	int forgetImageHashNow);
87	87
88	88	/*

103	103
104	104	static void
105	105	ImageTypeThreadExitProc(
106		ClientData clientData) /* not used */
	106	TCL_UNUSED(void *))
107	107	{
108	108	Tk_ImageType *freePtr;
109		ThreadSpecificData *tsdPtr =
	109	ThreadSpecificData tsdPtr = (ThreadSpecificData )
110	110	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
111	111
112	112	while (tsdPtr->oldImageTypeList != NULL) {

148	148	* by caller. */
149	149	{
150	150	Tk_ImageType *copyPtr;
151		ThreadSpecificData *tsdPtr =
	151	ThreadSpecificData tsdPtr = (ThreadSpecificData )
152	152	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
153	153
154	154	if (!tsdPtr->initialized) {
155	155	tsdPtr->initialized = 1;
156	156	Tcl_CreateThreadExitHandler(ImageTypeThreadExitProc, NULL);
157	157	}
158		copyPtr = ckalloc(sizeof(Tk_ImageType));
	158	copyPtr = (Tk_ImageType *)ckalloc(sizeof(Tk_ImageType));
159	159	copyPtr = typePtr;
160	160	copyPtr->nextPtr = tsdPtr->oldImageTypeList;
161	161	tsdPtr->oldImageTypeList = copyPtr;

169	169	* by caller. */
170	170	{
171	171	Tk_ImageType *copyPtr;
172		ThreadSpecificData *tsdPtr =
	172	ThreadSpecificData tsdPtr = (ThreadSpecificData )
173	173	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
174	174
175	175	if (!tsdPtr->initialized) {
176	176	tsdPtr->initialized = 1;
177	177	Tcl_CreateThreadExitHandler(ImageTypeThreadExitProc, NULL);
178	178	}
179		copyPtr = ckalloc(sizeof(Tk_ImageType));
	179	copyPtr = (Tk_ImageType *)ckalloc(sizeof(Tk_ImageType));
180	180	copyPtr = typePtr;
181	181	copyPtr->nextPtr = tsdPtr->imageTypeList;
182	182	tsdPtr->imageTypeList = copyPtr;

214	214	IMAGE_CREATE, IMAGE_DELETE, IMAGE_HEIGHT, IMAGE_INUSE, IMAGE_NAMES,
215	215	IMAGE_TYPE, IMAGE_TYPES, IMAGE_WIDTH
216	216	};
217		TkWindow *winPtr = clientData;
	217	TkWindow winPtr = (TkWindow )clientData;
218	218	int i, isNew, firstOption, index;
219	219	Tk_ImageType *typePtr;
220		ImageMaster *masterPtr;
	220	ImageModel *modelPtr;
221	221	Image *imagePtr;
222	222	Tcl_HashEntry *hPtr;
223	223	Tcl_HashSearch search;

225	225	TkDisplay *dispPtr = winPtr->dispPtr;
226	226	const char arg, name;
227	227	Tcl_Obj *resultObj;
228		ThreadSpecificData *tsdPtr =
	228	ThreadSpecificData tsdPtr = (ThreadSpecificData )
229	229	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
230	230
231	231	if (objc < 2) {

296	296
297	297	/*
298	298	* Need to check if the _command_ that we are about to create is
299		* the name of the current master widget command (normally "." but
	299	* the name of the current model widget command (normally "." but
300	300	* could have been renamed) and fail in that case before a really
301	301	* nasty and hard to stop crash happens.
302	302	*/

317	317
318	318	hPtr = Tcl_CreateHashEntry(&winPtr->mainPtr->imageTable, name, &isNew);
319	319	if (isNew) {
320		masterPtr = ckalloc(sizeof(ImageMaster));
321		masterPtr->typePtr = NULL;
322		masterPtr->masterData = NULL;
323		masterPtr->width = masterPtr->height = 1;
324		masterPtr->tablePtr = &winPtr->mainPtr->imageTable;
325		masterPtr->hPtr = hPtr;
326		masterPtr->instancePtr = NULL;
327		masterPtr->deleted = 0;
328		masterPtr->winPtr = winPtr->mainPtr->winPtr;
329		Tcl_Preserve(masterPtr->winPtr);
330		Tcl_SetHashValue(hPtr, masterPtr);
	320	modelPtr = (ImageModel *)ckalloc(sizeof(ImageModel));
	321	modelPtr->typePtr = NULL;
	322	modelPtr->modelData = NULL;
	323	modelPtr->width = modelPtr->height = 1;
	324	modelPtr->tablePtr = &winPtr->mainPtr->imageTable;
	325	modelPtr->hPtr = hPtr;
	326	modelPtr->instancePtr = NULL;
	327	modelPtr->deleted = 0;
	328	modelPtr->winPtr = winPtr->mainPtr->winPtr;
	329	Tcl_Preserve(modelPtr->winPtr);
	330	Tcl_SetHashValue(hPtr, modelPtr);
331	331	} else {
332	332	/*
333	333	* An image already exists by this name. Disconnect the instances
334		* from the master.
	334	* from the model.
335	335	*/
336	336
337		masterPtr = Tcl_GetHashValue(hPtr);
338		if (masterPtr->typePtr != NULL) {
339		for (imagePtr = masterPtr->instancePtr; imagePtr != NULL;
	337	modelPtr = (ImageModel *)Tcl_GetHashValue(hPtr);
	338	if (modelPtr->typePtr != NULL) {
	339	for (imagePtr = modelPtr->instancePtr; imagePtr != NULL;
340	340	imagePtr = imagePtr->nextPtr) {
341		masterPtr->typePtr->freeProc(imagePtr->instanceData,
	341	modelPtr->typePtr->freeProc(imagePtr->instanceData,
342	342	imagePtr->display);
343	343	imagePtr->changeProc(imagePtr->widgetClientData, 0, 0,
344		masterPtr->width, masterPtr->height,
345		masterPtr->width, masterPtr->height);
	344	modelPtr->width, modelPtr->height,
	345	modelPtr->width, modelPtr->height);
346	346	}
347		masterPtr->typePtr->deleteProc(masterPtr->masterData);
348		masterPtr->typePtr = NULL;
	347	modelPtr->typePtr->deleteProc(modelPtr->modelData);
	348	modelPtr->typePtr = NULL;
349	349	}
350		masterPtr->deleted = 0;
	350	modelPtr->deleted = 0;
351	351	}
352	352
353	353	/*

360	360	objc -= firstOption;
361	361	args = (Tcl_Obj **) objv;
362	362	if (oldimage) {
363		int i;
364
365		args = ckalloc((objc+1) * sizeof(char *));
	363	args = (Tcl_Obj *)ckalloc((objc+1) sizeof(Tcl_Obj *));
366	364	for (i = 0; i < objc; i++) {
367	365	args[i] = (Tcl_Obj *) Tcl_GetString(objv[i]);
368	366	}
369	367	args[objc] = NULL;
370	368	}
371		Tcl_Preserve(masterPtr);
	369	Tcl_Preserve(modelPtr);
372	370	if (typePtr->createProc(interp, name, objc, args, typePtr,
373		(Tk_ImageMaster)masterPtr, &masterPtr->masterData) != TCL_OK){
374		EventuallyDeleteImage(masterPtr, 0);
375		Tcl_Release(masterPtr);
	371	(Tk_ImageModel)modelPtr, &modelPtr->modelData) != TCL_OK){
	372	EventuallyDeleteImage(modelPtr, 0);
	373	Tcl_Release(modelPtr);
376	374	if (oldimage) {
377	375	ckfree(args);
378	376	}
379	377	return TCL_ERROR;
380	378	}
381		Tcl_Release(masterPtr);
	379	Tcl_Release(modelPtr);
382	380	if (oldimage) {
383	381	ckfree(args);
384	382	}
385		masterPtr->typePtr = typePtr;
386		for (imagePtr = masterPtr->instancePtr; imagePtr != NULL;
	383	modelPtr->typePtr = typePtr;
	384	for (imagePtr = modelPtr->instancePtr; imagePtr != NULL;
387	385	imagePtr = imagePtr->nextPtr) {
388	386	imagePtr->instanceData = typePtr->getProc(imagePtr->tkwin,
389		masterPtr->masterData);
	387	modelPtr->modelData);
390	388	}
391	389	Tcl_SetObjResult(interp, Tcl_NewStringObj(
392		Tcl_GetHashKey(&winPtr->mainPtr->imageTable, hPtr), -1));
	390	(const char *)Tcl_GetHashKey(&winPtr->mainPtr->imageTable, hPtr), -1));
393	391	break;
394	392	}
395	393	case IMAGE_DELETE:

399	397	if (hPtr == NULL) {
400	398	goto alreadyDeleted;
401	399	}
402		masterPtr = Tcl_GetHashValue(hPtr);
403		if (masterPtr->deleted) {
	400	modelPtr = (ImageModel *)Tcl_GetHashValue(hPtr);
	401	if (modelPtr->deleted) {
404	402	goto alreadyDeleted;
405	403	}
406		DeleteImage(masterPtr);
	404	DeleteImage(modelPtr);
407	405	}
408	406	break;
409	407	case IMAGE_NAMES:

414	412	hPtr = Tcl_FirstHashEntry(&winPtr->mainPtr->imageTable, &search);
415	413	resultObj = Tcl_NewObj();
416	414	for ( ; hPtr != NULL; hPtr = Tcl_NextHashEntry(&search)) {
417		masterPtr = Tcl_GetHashValue(hPtr);
418		if (masterPtr->deleted) {
	415	modelPtr = (ImageModel *)Tcl_GetHashValue(hPtr);
	416	if (modelPtr->deleted) {
419	417	continue;
420	418	}
421	419	Tcl_ListObjAppendElement(NULL, resultObj, Tcl_NewStringObj(
422		Tcl_GetHashKey(&winPtr->mainPtr->imageTable, hPtr), -1));
	420	(const char *)Tcl_GetHashKey(&winPtr->mainPtr->imageTable, hPtr), -1));
423	421	}
424	422	Tcl_SetObjResult(interp, resultObj);
425	423	break;

448	446	case IMAGE_WIDTH:
449	447	/*
450	448	* These operations all parse virtually identically. First check to
451		* see if three args are given. Then get a non-deleted master from the
	449	* see if three args are given. Then get a non-deleted model from the
452	450	* third arg.
453	451	*/
454	452

462	460	if (hPtr == NULL) {
463	461	goto alreadyDeleted;
464	462	}
465		masterPtr = Tcl_GetHashValue(hPtr);
466		if (masterPtr->deleted) {
	463	modelPtr = (ImageModel *)Tcl_GetHashValue(hPtr);
	464	if (modelPtr->deleted) {
467	465	goto alreadyDeleted;
468	466	}
469	467

473	471
474	472	switch ((enum options) index) {
475	473	case IMAGE_HEIGHT:
476		Tcl_SetObjResult(interp, Tcl_NewIntObj(masterPtr->height));
	474	Tcl_SetObjResult(interp, Tcl_NewIntObj(modelPtr->height));
477	475	break;
478	476	case IMAGE_INUSE:
479	477	Tcl_SetObjResult(interp, Tcl_NewBooleanObj(
480		masterPtr->typePtr && masterPtr->instancePtr));
	478	modelPtr->typePtr && modelPtr->instancePtr));
481	479	break;
482	480	case IMAGE_TYPE:
483		if (masterPtr->typePtr != NULL) {
	481	if (modelPtr->typePtr != NULL) {
484	482	Tcl_SetObjResult(interp,
485		Tcl_NewStringObj(masterPtr->typePtr->name, -1));
	483	Tcl_NewStringObj(modelPtr->typePtr->name, -1));
486	484	}
487	485	break;
488	486	case IMAGE_WIDTH:
489		Tcl_SetObjResult(interp, Tcl_NewIntObj(masterPtr->width));
	487	Tcl_SetObjResult(interp, Tcl_NewIntObj(modelPtr->width));
490	488	break;
491	489	default:
492	490	Tcl_Panic("can't happen");

522	520
523	521	void
524	522	Tk_ImageChanged(
525		Tk_ImageMaster imageMaster, /* Image that needs redisplay. */
	523	Tk_ImageModel imageModel, /* Image that needs redisplay. */
526	524	int x, int y, /* Coordinates of upper-left pixel of region
527	525	* of image that needs to be redrawn. */
528	526	int width, int height, /* Dimensions (in pixels) of region of image

533	531	int imageWidth, int imageHeight)
534	532	/* New dimensions of image. */
535	533	{
536		ImageMaster masterPtr = (ImageMaster ) imageMaster;
	534	ImageModel modelPtr = (ImageModel ) imageModel;
537	535	Image *imagePtr;
538	536
539		masterPtr->width = imageWidth;
540		masterPtr->height = imageHeight;
541		for (imagePtr = masterPtr->instancePtr; imagePtr != NULL;
	537	modelPtr->width = imageWidth;
	538	modelPtr->height = imageHeight;
	539	for (imagePtr = modelPtr->instancePtr; imagePtr != NULL;
542	540	imagePtr = imagePtr->nextPtr) {
543	541	imagePtr->changeProc(imagePtr->widgetClientData, x, y, width, height,
544	542	imageWidth, imageHeight);

550	548	*
551	549	* Tk_NameOfImage --
552	550	*
553		* Given a token for an image master, this function returns the name of
	551	* Given a token for an image model, this function returns the name of
554	552	* the image.
555	553	*
556	554	* Results:
557		* The return value is the string name for imageMaster.
	555	* The return value is the string name for imageModel.
558	556	*
559	557	* Side effects:
560	558	* None.

564	562
565	563	const char *
566	564	Tk_NameOfImage(
567		Tk_ImageMaster imageMaster) /* Token for image. */
568		{
569		ImageMaster masterPtr = (ImageMaster ) imageMaster;
570
571		if (masterPtr->hPtr == NULL) {
	565	Tk_ImageModel imageModel) /* Token for image. */
	566	{
	567	ImageModel modelPtr = (ImageModel ) imageModel;
	568
	569	if (modelPtr->hPtr == NULL) {
572	570	return NULL;
573	571	}
574		return Tcl_GetHashKey(masterPtr->tablePtr, masterPtr->hPtr);
	572	return (const char *)Tcl_GetHashKey(modelPtr->tablePtr, modelPtr->hPtr);
575	573	}
576	574
577	575	/*

609	607	ClientData clientData) /* One-word argument to pass to damageProc. */
610	608	{
611	609	Tcl_HashEntry *hPtr;
612		ImageMaster *masterPtr;
	610	ImageModel *modelPtr;
613	611	Image *imagePtr;
614	612
615	613	hPtr = Tcl_FindHashEntry(&((TkWindow *) tkwin)->mainPtr->imageTable, name);
616	614	if (hPtr == NULL) {
617	615	goto noSuchImage;
618	616	}
619		masterPtr = Tcl_GetHashValue(hPtr);
620		if (masterPtr->typePtr == NULL) {
	617	modelPtr = (ImageModel *)Tcl_GetHashValue(hPtr);
	618	if (modelPtr->typePtr == NULL) {
621	619	goto noSuchImage;
622	620	}
623		if (masterPtr->deleted) {
	621	if (modelPtr->deleted) {
624	622	goto noSuchImage;
625	623	}
626		imagePtr = ckalloc(sizeof(Image));
	624	imagePtr = (Image *)ckalloc(sizeof(Image));
627	625	imagePtr->tkwin = tkwin;
628	626	imagePtr->display = Tk_Display(tkwin);
629		imagePtr->masterPtr = masterPtr;
	627	imagePtr->modelPtr = modelPtr;
630	628	imagePtr->instanceData =
631		masterPtr->typePtr->getProc(tkwin, masterPtr->masterData);
	629	modelPtr->typePtr->getProc(tkwin, modelPtr->modelData);
632	630	imagePtr->changeProc = changeProc;
633	631	imagePtr->widgetClientData = clientData;
634		imagePtr->nextPtr = masterPtr->instancePtr;
635		masterPtr->instancePtr = imagePtr;
	632	imagePtr->nextPtr = modelPtr->instancePtr;
	633	modelPtr->instancePtr = imagePtr;
636	634	return (Tk_Image) imagePtr;
637	635
638	636	noSuchImage:

668	666	* a widget. */
669	667	{
670	668	Image imagePtr = (Image ) image;
671		ImageMaster *masterPtr = imagePtr->masterPtr;
	669	ImageModel *modelPtr = imagePtr->modelPtr;
672	670	Image *prevPtr;
673	671
674	672	/*
675	673	* Clean up the particular instance.
676	674	*/
677	675
678		if (masterPtr->typePtr != NULL) {
679		masterPtr->typePtr->freeProc(imagePtr->instanceData,
	676	if (modelPtr->typePtr != NULL) {
	677	modelPtr->typePtr->freeProc(imagePtr->instanceData,
680	678	imagePtr->display);
681	679	}
682		prevPtr = masterPtr->instancePtr;
	680	prevPtr = modelPtr->instancePtr;
683	681	if (prevPtr == imagePtr) {
684		masterPtr->instancePtr = imagePtr->nextPtr;
	682	modelPtr->instancePtr = imagePtr->nextPtr;
685	683	} else {
686	684	while (prevPtr->nextPtr != imagePtr) {
687	685	prevPtr = prevPtr->nextPtr;

691	689	ckfree(imagePtr);
692	690
693	691	/*
694		* If there are no more instances left for the master, and if the master
695		* image has been deleted, then delete the master too.
	692	* If there are no more instances left for the model, and if the model
	693	* image has been deleted, then delete the model too.
696	694	*/
697	695
698		if ((masterPtr->typePtr == NULL) && (masterPtr->instancePtr == NULL)) {
699		if (masterPtr->hPtr != NULL) {
700		Tcl_DeleteHashEntry(masterPtr->hPtr);
701		}
702		Tcl_Release(masterPtr->winPtr);
703		ckfree(masterPtr);
	696	if ((modelPtr->typePtr == NULL) && (modelPtr->instancePtr == NULL)) {
	697	if (modelPtr->hPtr != NULL) {
	698	Tcl_DeleteHashEntry(modelPtr->hPtr);
	699	}
	700	Tcl_Release(modelPtr->winPtr);
	701	ckfree(modelPtr);
704	702	}
705	703	}
706	704

740	738	GC newGC;
741	739	XGCValues gcValues;
742	740
743		if (imagePtr->masterPtr->typePtr == NULL) {
	741	if (imagePtr->modelPtr->typePtr == NULL) {
744	742	/*
745		* No master for image, so nothing to display on postscript.
	743	* No model for image, so nothing to display on postscript.
746	744	*/
747	745
748	746	return TCL_OK;

753	751	* otherwise go on with generic code.
754	752	*/
755	753
756		if (imagePtr->masterPtr->typePtr->postscriptProc != NULL) {
757		return imagePtr->masterPtr->typePtr->postscriptProc(
758		imagePtr->masterPtr->masterData, interp, tkwin, psinfo,
	754	if (imagePtr->modelPtr->typePtr->postscriptProc != NULL) {
	755	return imagePtr->modelPtr->typePtr->postscriptProc(
	756	imagePtr->modelPtr->modelData, interp, tkwin, psinfo,
759	757	x, y, width, height, prepass);
760	758	}
761	759

836	834	{
837	835	Image imagePtr = (Image ) image;
838	836
839		if (imagePtr->masterPtr->typePtr == NULL) {
	837	if (imagePtr->modelPtr->typePtr == NULL) {
840	838	/*
841		* No master for image, so nothing to display.
	839	* No model for image, so nothing to display.
842	840	*/
843	841
844	842	return;

858	856	drawableY -= imageY;
859	857	imageY = 0;
860	858	}
861		if ((imageX + width) > imagePtr->masterPtr->width) {
862		width = imagePtr->masterPtr->width - imageX;
863		}
864		if ((imageY + height) > imagePtr->masterPtr->height) {
865		height = imagePtr->masterPtr->height - imageY;
866		}
867		imagePtr->masterPtr->typePtr->displayProc(imagePtr->instanceData,
	859	if ((imageX + width) > imagePtr->modelPtr->width) {
	860	width = imagePtr->modelPtr->width - imageX;
	861	}
	862	if ((imageY + height) > imagePtr->modelPtr->height) {
	863	height = imagePtr->modelPtr->height - imageY;
	864	}
	865	imagePtr->modelPtr->typePtr->displayProc(imagePtr->instanceData,
868	866	imagePtr->display, drawable, imageX, imageY, width, height,
869	867	drawableX, drawableY);
870	868	}

894	892	{
895	893	Image imagePtr = (Image ) image;
896	894
897		*widthPtr = imagePtr->masterPtr->width;
898		*heightPtr = imagePtr->masterPtr->height;
	895	*widthPtr = imagePtr->modelPtr->width;
	896	*heightPtr = imagePtr->modelPtr->height;
899	897	}
900	898
901	899	/*

932	930	if (hPtr == NULL) {
933	931	return;
934	932	}
935		DeleteImage(Tcl_GetHashValue(hPtr));
	933	DeleteImage((ImageModel *)Tcl_GetHashValue(hPtr));
936	934	}
937	935
938	936	/*

947	945	*
948	946	* Side effects:
949	947	* The connection is dropped between instances of this image and an image
950		* master. Image instances will redisplay themselves as empty areas, but
	948	* model. Image instances will redisplay themselves as empty areas, but
951	949	* existing instances will not be deleted.
952	950	*
953	951	*----------------------------------------------------------------------

955	953
956	954	static void
957	955	DeleteImage(
958		ImageMaster masterPtr) / Pointer to main data structure for image. */
	956	ImageModel modelPtr) / Pointer to main data structure for image. */
959	957	{
960	958	Image *imagePtr;
961	959	Tk_ImageType *typePtr;
962	960
963		typePtr = masterPtr->typePtr;
964		masterPtr->typePtr = NULL;
	961	typePtr = modelPtr->typePtr;
	962	modelPtr->typePtr = NULL;
965	963	if (typePtr != NULL) {
966		for (imagePtr = masterPtr->instancePtr; imagePtr != NULL;
	964	for (imagePtr = modelPtr->instancePtr; imagePtr != NULL;
967	965	imagePtr = imagePtr->nextPtr) {
968	966	typePtr->freeProc(imagePtr->instanceData, imagePtr->display);
969	967	imagePtr->changeProc(imagePtr->widgetClientData, 0, 0,
970		masterPtr->width, masterPtr->height, masterPtr->width,
971		masterPtr->height);
972		}
973		typePtr->deleteProc(masterPtr->masterData);
974		}
975		if (masterPtr->instancePtr == NULL) {
976		if (masterPtr->hPtr != NULL) {
977		Tcl_DeleteHashEntry(masterPtr->hPtr);
978		}
979		Tcl_Release(masterPtr->winPtr);
980		ckfree(masterPtr);
	968	modelPtr->width, modelPtr->height, modelPtr->width,
	969	modelPtr->height);
	970	}
	971	typePtr->deleteProc(modelPtr->modelData);
	972	}
	973	if (modelPtr->instancePtr == NULL) {
	974	if (modelPtr->hPtr != NULL) {
	975	Tcl_DeleteHashEntry(modelPtr->hPtr);
	976	}
	977	Tcl_Release(modelPtr->winPtr);
	978	ckfree(modelPtr);
981	979	} else {
982		masterPtr->deleted = 1;
	980	modelPtr->deleted = 1;
983	981	}
984	982	}
985	983

1003	1001
1004	1002	static void
1005	1003	EventuallyDeleteImage(
1006		ImageMaster masterPtr, / Pointer to main data structure for image. */
	1004	ImageModel modelPtr, / Pointer to main data structure for image. */
1007	1005	int forgetImageHashNow) /* Flag to say whether the hash table is about
1008	1006	* to vanish. */
1009	1007	{
1010	1008	if (forgetImageHashNow) {
1011		masterPtr->hPtr = NULL;
1012		}
1013		if (!masterPtr->deleted) {
1014		masterPtr->deleted = 1;
1015		Tcl_EventuallyFree(masterPtr, (Tcl_FreeProc *) DeleteImage);
	1009	modelPtr->hPtr = NULL;
	1010	}
	1011	if (!modelPtr->deleted) {
	1012	modelPtr->deleted = 1;
	1013	Tcl_EventuallyFree(modelPtr, (Tcl_FreeProc *) DeleteImage);
1016	1014	}
1017	1015	}
1018	1016

1044	1042
1045	1043	for (hPtr = Tcl_FirstHashEntry(&mainPtr->imageTable, &search);
1046	1044	hPtr != NULL; hPtr = Tcl_NextHashEntry(&search)) {
1047		EventuallyDeleteImage(Tcl_GetHashValue(hPtr), 1);
	1045	EventuallyDeleteImage((ImageModel *)Tcl_GetHashValue(hPtr), 1);
1048	1046	}
1049	1047	Tcl_DeleteHashTable(&mainPtr->imageTable);
1050	1048	}

1052	1050	/*
1053	1051	*----------------------------------------------------------------------
1054	1052	*
1055		* Tk_GetImageMasterData --
	1053	* Tk_GetImageModelData --
1056	1054	*
1057	1055	* Given the name of an image, this function returns the type of the
1058		* image and the clientData associated with its master.
	1056	* image and the clientData associated with its model.
1059	1057	*
1060	1058	* Results:
1061	1059	* If there is no image by the given name, then NULL is returned and a

1070	1068	*/
1071	1069
1072	1070	ClientData
1073		Tk_GetImageMasterData(
	1071	Tk_GetImageModelData(
1074	1072	Tcl_Interp interp, / Interpreter in which the image was
1075	1073	* created. */
1076	1074	const char name, / Name of image. */

1080	1078	{
1081	1079	TkWindow winPtr = (TkWindow ) Tk_MainWindow(interp);
1082	1080	Tcl_HashEntry *hPtr;
1083		ImageMaster *masterPtr;
	1081	ImageModel *modelPtr;
1084	1082
1085	1083	hPtr = Tcl_FindHashEntry(&winPtr->mainPtr->imageTable, name);
1086	1084	if (hPtr == NULL) {
1087	1085	*typePtrPtr = NULL;
1088	1086	return NULL;
1089	1087	}
1090		masterPtr = Tcl_GetHashValue(hPtr);
1091		if (masterPtr->deleted) {
	1088	modelPtr = (ImageModel *)Tcl_GetHashValue(hPtr);
	1089	if (modelPtr->deleted) {
1092	1090	*typePtrPtr = NULL;
1093	1091	return NULL;
1094	1092	}
1095		*typePtrPtr = masterPtr->typePtr;
1096		return masterPtr->masterData;
	1093	*typePtrPtr = modelPtr->typePtr;
	1094	return modelPtr->modelData;
1097	1095	}
1098	1096
1099	1097	/*

1117	1115	*----------------------------------------------------------------------
1118	1116	*/
1119	1117
1120		/ARGSUSED/
1121	1118	void
1122	1119	Tk_SetTSOrigin(
1123	1120	Tk_Window tkwin,

+144

-144

generic/tkImgBmap.c less more

13	13	#include "tkInt.h"
14	14
15	15	/*
16		* The following data structure represents the master for a bitmap
	16	* The following data structure represents the model for a bitmap
17	17	* image:
18	18	*/
19	19
20		typedef struct BitmapMaster {
21		Tk_ImageMaster tkMaster; /* Tk's token for image master. NULL means the
	20	typedef struct BitmapModel {
	21	Tk_ImageModel tkModel; /* Tk's token for image model. NULL means the
22	22	* image is being deleted. */
23	23	Tcl_Interp interp; / Interpreter for application that is using
24	24	* image. */

39	39	char maskDataString; / Value of -maskdata option (malloc'ed). */
40	40	struct BitmapInstance *instancePtr;
41	41	/* First in list of all instances associated
42		* with this master. */
43		} BitmapMaster;
	42	* with this model. */
	43	} BitmapModel;
44	44
45	45	/*
46	46	* The following data structure represents all of the instances of an image

50	50	typedef struct BitmapInstance {
51	51	int refCount; /* Number of instances that share this data
52	52	* structure. */
53		BitmapMaster masterPtr; / Pointer to master for image. */
	53	BitmapModel modelPtr; / Pointer to model for image. */
54	54	Tk_Window tkwin; /* Window in which the instances will be
55	55	* displayed. */
56	56	XColor fg; / Foreground color for displaying image. */

64	64	* displayed. */
65	65	struct BitmapInstance *nextPtr;
66	66	/* Next in list of all instance structures
67		* associated with masterPtr (NULL means end
	67	* associated with modelPtr (NULL means end
68	68	* of list). */
69	69	} BitmapInstance;
70	70

75	75	static int GetByte(Tcl_Channel chan);
76	76	static int ImgBmapCreate(Tcl_Interp *interp,
77	77	const char name, int argc, Tcl_Obj const objv[],
78		const Tk_ImageType *typePtr, Tk_ImageMaster master,
	78	const Tk_ImageType *typePtr, Tk_ImageModel model,
79	79	ClientData *clientDataPtr);
80	80	static ClientData ImgBmapGet(Tk_Window tkwin, ClientData clientData);
81	81	static void ImgBmapDisplay(ClientData clientData,

107	107
108	108	static const Tk_ConfigSpec configSpecs[] = {
109	109	{TK_CONFIG_UID, "-background", NULL, NULL,
110		"", Tk_Offset(BitmapMaster, bgUid), 0, NULL},
	110	"", Tk_Offset(BitmapModel, bgUid), 0, NULL},
111	111	{TK_CONFIG_STRING, "-data", NULL, NULL,
112		NULL, Tk_Offset(BitmapMaster, dataString), TK_CONFIG_NULL_OK, NULL},
	112	NULL, Tk_Offset(BitmapModel, dataString), TK_CONFIG_NULL_OK, NULL},
113	113	{TK_CONFIG_STRING, "-file", NULL, NULL,
114		NULL, Tk_Offset(BitmapMaster, fileString), TK_CONFIG_NULL_OK, NULL},
	114	NULL, Tk_Offset(BitmapModel, fileString), TK_CONFIG_NULL_OK, NULL},
115	115	{TK_CONFIG_UID, "-foreground", NULL, NULL,
116		"#000000", Tk_Offset(BitmapMaster, fgUid), 0, NULL},
	116	"#000000", Tk_Offset(BitmapModel, fgUid), 0, NULL},
117	117	{TK_CONFIG_STRING, "-maskdata", NULL, NULL,
118		NULL, Tk_Offset(BitmapMaster, maskDataString), TK_CONFIG_NULL_OK, NULL},
	118	NULL, Tk_Offset(BitmapModel, maskDataString), TK_CONFIG_NULL_OK, NULL},
119	119	{TK_CONFIG_STRING, "-maskfile", NULL, NULL,
120		NULL, Tk_Offset(BitmapMaster, maskFileString), TK_CONFIG_NULL_OK, NULL},
	120	NULL, Tk_Offset(BitmapModel, maskFileString), TK_CONFIG_NULL_OK, NULL},
121	121	{TK_CONFIG_END, NULL, NULL, NULL, NULL, 0, 0, NULL}
122	122	};
123	123

148	148	int argc, Tcl_Obj *const objv[]);
149	149	static void ImgBmapCmdDeletedProc(ClientData clientData);
150	150	static void ImgBmapConfigureInstance(BitmapInstance *instancePtr);
151		static int ImgBmapConfigureMaster(BitmapMaster *masterPtr,
	151	static int ImgBmapConfigureModel(BitmapModel *modelPtr,
152	152	int argc, Tcl_Obj *const objv[], int flags);
153	153	static int NextBitmapWord(ParseInfo *parseInfoPtr);
154	154

178	178	Tcl_Obj const argv[], / Argument objects for options (doesn't
179	179	* include image name or type). */
180	180	const Tk_ImageType typePtr,/ Pointer to our type record (not used). */
181		Tk_ImageMaster master, /* Token for image, to be used by us in later
	181	Tk_ImageModel model, /* Token for image, to be used by us in later
182	182	* callbacks. */
183	183	ClientData clientDataPtr) / Store manager's token for image here; it
184	184	* will be returned in later callbacks. */
185	185	{
186		BitmapMaster *masterPtr = ckalloc(sizeof(BitmapMaster));
187
188		masterPtr->tkMaster = master;
189		masterPtr->interp = interp;
190		masterPtr->imageCmd = Tcl_CreateObjCommand(interp, name, ImgBmapCmd,
191		masterPtr, ImgBmapCmdDeletedProc);
192		masterPtr->width = masterPtr->height = 0;
193		masterPtr->data = NULL;
194		masterPtr->maskData = NULL;
195		masterPtr->fgUid = NULL;
196		masterPtr->bgUid = NULL;
197		masterPtr->fileString = NULL;
198		masterPtr->dataString = NULL;
199		masterPtr->maskFileString = NULL;
200		masterPtr->maskDataString = NULL;
201		masterPtr->instancePtr = NULL;
202		if (ImgBmapConfigureMaster(masterPtr, argc, argv, 0) != TCL_OK) {
203		ImgBmapDelete(masterPtr);
	186	BitmapModel *modelPtr = ckalloc(sizeof(BitmapModel));
	187
	188	modelPtr->tkModel = model;
	189	modelPtr->interp = interp;
	190	modelPtr->imageCmd = Tcl_CreateObjCommand(interp, name, ImgBmapCmd,
	191	modelPtr, ImgBmapCmdDeletedProc);
	192	modelPtr->width = modelPtr->height = 0;
	193	modelPtr->data = NULL;
	194	modelPtr->maskData = NULL;
	195	modelPtr->fgUid = NULL;
	196	modelPtr->bgUid = NULL;
	197	modelPtr->fileString = NULL;
	198	modelPtr->dataString = NULL;
	199	modelPtr->maskFileString = NULL;
	200	modelPtr->maskDataString = NULL;
	201	modelPtr->instancePtr = NULL;
	202	if (ImgBmapConfigureModel(modelPtr, argc, argv, 0) != TCL_OK) {
	203	ImgBmapDelete(modelPtr);
204	204	return TCL_ERROR;
205	205	}
206		*clientDataPtr = masterPtr;
	206	*clientDataPtr = modelPtr;
207	207	return TCL_OK;
208	208	}
209	209
210	210	/*
211	211	*----------------------------------------------------------------------
212	212	*
213		* ImgBmapConfigureMaster --
	213	* ImgBmapConfigureModel --
214	214	*
215	215	* This procedure is called when a bitmap image is created or
216	216	* reconfigured. It process configuration options and resets any

218	218	*
219	219	* Results:
220	220	* A standard Tcl return value. If TCL_ERROR is returned then an error
221		* message is left in the masterPtr->interp's result.
	221	* message is left in the modelPtr->interp's result.
222	222	*
223	223	* Side effects:
224	224	* Existing instances of the image will be redisplayed to match the new

228	228	*/
229	229
230	230	static int
231		ImgBmapConfigureMaster(
232		BitmapMaster masterPtr, / Pointer to data structure describing
	231	ImgBmapConfigureModel(
	232	BitmapModel modelPtr, / Pointer to data structure describing
233	233	* overall bitmap image to (reconfigure). */
234	234	int objc, /* Number of entries in objv. */
235	235	Tcl_Obj const objv[], / Pairs of configuration options for image. */

245	245	}
246	246	argv[objc] = NULL;
247	247
248		if (Tk_ConfigureWidget(masterPtr->interp, Tk_MainWindow(masterPtr->interp),
249		configSpecs, objc, argv, (char *) masterPtr, flags) != TCL_OK) {
	248	if (Tk_ConfigureWidget(modelPtr->interp, Tk_MainWindow(modelPtr->interp),
	249	configSpecs, objc, argv, (char *) modelPtr, flags) != TCL_OK) {
250	250	ckfree(argv);
251	251	return TCL_ERROR;
252	252	}

257	257	* bitmap and mask have the same dimensions.
258	258	*/
259	259
260		if (masterPtr->data != NULL) {
261		ckfree(masterPtr->data);
262		masterPtr->data = NULL;
263		}
264		if ((masterPtr->fileString != NULL) \|\| (masterPtr->dataString != NULL)) {
265		masterPtr->data = TkGetBitmapData(masterPtr->interp,
266		masterPtr->dataString, masterPtr->fileString,
267		&masterPtr->width, &masterPtr->height, &dummy1, &dummy2);
268		if (masterPtr->data == NULL) {
	260	if (modelPtr->data != NULL) {
	261	ckfree(modelPtr->data);
	262	modelPtr->data = NULL;
	263	}
	264	if ((modelPtr->fileString != NULL) \|\| (modelPtr->dataString != NULL)) {
	265	modelPtr->data = TkGetBitmapData(modelPtr->interp,
	266	modelPtr->dataString, modelPtr->fileString,
	267	&modelPtr->width, &modelPtr->height, &dummy1, &dummy2);
	268	if (modelPtr->data == NULL) {
269	269	return TCL_ERROR;
270	270	}
271	271	}
272		if (masterPtr->maskData != NULL) {
273		ckfree(masterPtr->maskData);
274		masterPtr->maskData = NULL;
275		}
276		if ((masterPtr->maskFileString != NULL)
277		\|\| (masterPtr->maskDataString != NULL)) {
278		if (masterPtr->data == NULL) {
279		Tcl_SetObjResult(masterPtr->interp, Tcl_NewStringObj(
	272	if (modelPtr->maskData != NULL) {
	273	ckfree(modelPtr->maskData);
	274	modelPtr->maskData = NULL;
	275	}
	276	if ((modelPtr->maskFileString != NULL)
	277	\|\| (modelPtr->maskDataString != NULL)) {
	278	if (modelPtr->data == NULL) {
	279	Tcl_SetObjResult(modelPtr->interp, Tcl_NewStringObj(
280	280	"can't have mask without bitmap", -1));
281		Tcl_SetErrorCode(masterPtr->interp, "TK", "IMAGE", "BITMAP",
	281	Tcl_SetErrorCode(modelPtr->interp, "TK", "IMAGE", "BITMAP",
282	282	"NO_BITMAP", NULL);
283	283	return TCL_ERROR;
284	284	}
285		masterPtr->maskData = TkGetBitmapData(masterPtr->interp,
286		masterPtr->maskDataString, masterPtr->maskFileString,
	285	modelPtr->maskData = TkGetBitmapData(modelPtr->interp,
	286	modelPtr->maskDataString, modelPtr->maskFileString,
287	287	&maskWidth, &maskHeight, &dummy1, &dummy2);
288		if (masterPtr->maskData == NULL) {
	288	if (modelPtr->maskData == NULL) {
289	289	return TCL_ERROR;
290	290	}
291		if ((maskWidth != masterPtr->width)
292		\|\| (maskHeight != masterPtr->height)) {
293		ckfree(masterPtr->maskData);
294		masterPtr->maskData = NULL;
295		Tcl_SetObjResult(masterPtr->interp, Tcl_NewStringObj(
	291	if ((maskWidth != modelPtr->width)
	292	\|\| (maskHeight != modelPtr->height)) {
	293	ckfree(modelPtr->maskData);
	294	modelPtr->maskData = NULL;
	295	Tcl_SetObjResult(modelPtr->interp, Tcl_NewStringObj(
296	296	"bitmap and mask have different sizes", -1));
297		Tcl_SetErrorCode(masterPtr->interp, "TK", "IMAGE", "BITMAP",
	297	Tcl_SetErrorCode(modelPtr->interp, "TK", "IMAGE", "BITMAP",
298	298	"MASK_SIZE", NULL);
299	299	return TCL_ERROR;
300	300	}

306	306	* everywhere that it is used.
307	307	*/
308	308
309		for (instancePtr = masterPtr->instancePtr; instancePtr != NULL;
	309	for (instancePtr = modelPtr->instancePtr; instancePtr != NULL;
310	310	instancePtr = instancePtr->nextPtr) {
311	311	ImgBmapConfigureInstance(instancePtr);
312	312	}
313		Tk_ImageChanged(masterPtr->tkMaster, 0, 0, masterPtr->width,
314		masterPtr->height, masterPtr->width, masterPtr->height);
	313	Tk_ImageChanged(modelPtr->tkModel, 0, 0, modelPtr->width,
	314	modelPtr->height, modelPtr->width, modelPtr->height);
315	315	return TCL_OK;
316	316	}
317	317

321	321	* ImgBmapConfigureInstance --
322	322	*
323	323	* This procedure is called to create displaying information for a bitmap
324		* image instance based on the configuration information in the master.
325		* It is invoked both when new instances are created and when the master
	324	* image instance based on the configuration information in the model.
	325	* It is invoked both when new instances are created and when the model
326	326	* is reconfigured.
327	327	*
328	328	* Results:

339	339	ImgBmapConfigureInstance(
340	340	BitmapInstance instancePtr)/ Instance to reconfigure. */
341	341	{
342		BitmapMaster *masterPtr = instancePtr->masterPtr;
	342	BitmapModel *modelPtr = instancePtr->modelPtr;
343	343	XColor *colorPtr;
344	344	XGCValues gcValues;
345	345	GC gc;

347	347	Pixmap oldBitmap, oldMask;
348	348
349	349	/*
350		* For each of the options in masterPtr, translate the string form into an
	350	* For each of the options in modelPtr, translate the string form into an
351	351	* internal form appropriate for instancePtr.
352	352	*/
353	353
354		if (*masterPtr->bgUid != 0) {
355		colorPtr = Tk_GetColor(masterPtr->interp, instancePtr->tkwin,
356		masterPtr->bgUid);
	354	if (*modelPtr->bgUid != 0) {
	355	colorPtr = Tk_GetColor(modelPtr->interp, instancePtr->tkwin,
	356	modelPtr->bgUid);
357	357	if (colorPtr == NULL) {
358	358	goto error;
359	359	}

365	365	}
366	366	instancePtr->bg = colorPtr;
367	367
368		colorPtr = Tk_GetColor(masterPtr->interp, instancePtr->tkwin,
369		masterPtr->fgUid);
	368	colorPtr = Tk_GetColor(modelPtr->interp, instancePtr->tkwin,
	369	modelPtr->fgUid);
370	370	if (colorPtr == NULL) {
371	371	goto error;
372	372	}

387	387	oldMask = instancePtr->mask;
388	388	instancePtr->mask = None;
389	389
390		if (masterPtr->data != NULL) {
	390	if (modelPtr->data != NULL) {
391	391	instancePtr->bitmap = XCreateBitmapFromData(
392	392	Tk_Display(instancePtr->tkwin),
393	393	RootWindowOfScreen(Tk_Screen(instancePtr->tkwin)),
394		masterPtr->data, (unsigned) masterPtr->width,
395		(unsigned) masterPtr->height);
396		}
397		if (masterPtr->maskData != NULL) {
	394	modelPtr->data, (unsigned) modelPtr->width,
	395	(unsigned) modelPtr->height);
	396	}
	397	if (modelPtr->maskData != NULL) {
398	398	instancePtr->mask = XCreateBitmapFromData(
399	399	Tk_Display(instancePtr->tkwin),
400	400	RootWindowOfScreen(Tk_Screen(instancePtr->tkwin)),
401		masterPtr->maskData, (unsigned) masterPtr->width,
402		(unsigned) masterPtr->height);
	401	modelPtr->maskData, (unsigned) modelPtr->width,
	402	(unsigned) modelPtr->height);
403	403	}
404	404
405	405	if (oldMask != None) {

409	409	Tk_FreePixmap(Tk_Display(instancePtr->tkwin), oldBitmap);
410	410	}
411	411
412		if (masterPtr->data != NULL) {
	412	if (modelPtr->data != NULL) {
413	413	gcValues.foreground = instancePtr->fg->pixel;
414	414	gcValues.graphics_exposures = False;
415	415	mask = GCForeground\|GCGraphicsExposures;

444	444	Tk_FreeGC(Tk_Display(instancePtr->tkwin), instancePtr->gc);
445	445	}
446	446	instancePtr->gc = NULL;
447		Tcl_AppendObjToErrorInfo(masterPtr->interp, Tcl_ObjPrintf(
	447	Tcl_AppendObjToErrorInfo(modelPtr->interp, Tcl_ObjPrintf(
448	448	"\n (while configuring image \"%s\")", Tk_NameOfImage(
449		masterPtr->tkMaster)));
450		Tcl_BackgroundException(masterPtr->interp, TCL_ERROR);
	449	modelPtr->tkModel)));
	450	Tcl_BackgroundException(modelPtr->interp, TCL_ERROR);
451	451	}
452	452
453	453	/*

750	750
751	751	static int
752	752	ImgBmapCmd(
753		ClientData clientData, /* Information about the image master. */
	753	ClientData clientData, /* Information about the image model. */
754	754	Tcl_Interp interp, / Current interpreter. */
755	755	int objc, /* Number of arguments. */
756	756	Tcl_Obj const objv[]) / Argument objects. */
757	757	{
758	758	static const char *const bmapOptions[] = {"cget", "configure", NULL};
759		BitmapMaster *masterPtr = clientData;
	759	BitmapModel *modelPtr = clientData;
760	760	int index;
761	761
762	762	if (objc < 2) {

774	774	return TCL_ERROR;
775	775	}
776	776	return Tk_ConfigureValue(interp, Tk_MainWindow(interp), configSpecs,
777		(char *) masterPtr, Tcl_GetString(objv[2]), 0);
	777	(char *) modelPtr, Tcl_GetString(objv[2]), 0);
778	778	case 1: /* configure */
779	779	if (objc == 2) {
780	780	return Tk_ConfigureInfo(interp, Tk_MainWindow(interp),
781		configSpecs, (char *) masterPtr, NULL, 0);
	781	configSpecs, (char *) modelPtr, NULL, 0);
782	782	} else if (objc == 3) {
783	783	return Tk_ConfigureInfo(interp, Tk_MainWindow(interp),
784		configSpecs, (char *) masterPtr,
	784	configSpecs, (char *) modelPtr,
785	785	Tcl_GetString(objv[2]), 0);
786	786	} else {
787		return ImgBmapConfigureMaster(masterPtr, objc-2, objv+2,
	787	return ImgBmapConfigureModel(modelPtr, objc-2, objv+2,
788	788	TK_CONFIG_ARGV_ONLY);
789	789	}
790	790	default:

815	815	ImgBmapGet(
816	816	Tk_Window tkwin, /* Window in which the instance will be
817	817	* used. */
818		ClientData masterData) /* Pointer to our master structure for the
	818	ClientData modelData) /* Pointer to our model structure for the
819	819	* image. */
820	820	{
821		BitmapMaster *masterPtr = masterData;
	821	BitmapModel *modelPtr = modelData;
822	822	BitmapInstance *instancePtr;
823	823
824	824	/*

826	826	* re-use it.
827	827	*/
828	828
829		for (instancePtr = masterPtr->instancePtr; instancePtr != NULL;
	829	for (instancePtr = modelPtr->instancePtr; instancePtr != NULL;
830	830	instancePtr = instancePtr->nextPtr) {
831	831	if (instancePtr->tkwin == tkwin) {
832	832	instancePtr->refCount++;

841	841
842	842	instancePtr = ckalloc(sizeof(BitmapInstance));
843	843	instancePtr->refCount = 1;
844		instancePtr->masterPtr = masterPtr;
	844	instancePtr->modelPtr = modelPtr;
845	845	instancePtr->tkwin = tkwin;
846	846	instancePtr->fg = NULL;
847	847	instancePtr->bg = NULL;
848	848	instancePtr->bitmap = None;
849	849	instancePtr->mask = None;
850	850	instancePtr->gc = NULL;
851		instancePtr->nextPtr = masterPtr->instancePtr;
852		masterPtr->instancePtr = instancePtr;
	851	instancePtr->nextPtr = modelPtr->instancePtr;
	852	modelPtr->instancePtr = instancePtr;
853	853	ImgBmapConfigureInstance(instancePtr);
854	854
855	855	/*

857	857	*/
858	858
859	859	if (instancePtr->nextPtr == NULL) {
860		Tk_ImageChanged(masterPtr->tkMaster, 0, 0, 0, 0, masterPtr->width,
861		masterPtr->height);
	860	Tk_ImageChanged(modelPtr->tkModel, 0, 0, 0, 0, modelPtr->width,
	861	modelPtr->height);
862	862	}
863	863
864	864	return instancePtr;

975	975	if (instancePtr->gc != NULL) {
976	976	Tk_FreeGC(display, instancePtr->gc);
977	977	}
978		if (instancePtr->masterPtr->instancePtr == instancePtr) {
979		instancePtr->masterPtr->instancePtr = instancePtr->nextPtr;
	978	if (instancePtr->modelPtr->instancePtr == instancePtr) {
	979	instancePtr->modelPtr->instancePtr = instancePtr->nextPtr;
980	980	} else {
981		for (prevPtr = instancePtr->masterPtr->instancePtr;
	981	for (prevPtr = instancePtr->modelPtr->instancePtr;
982	982	prevPtr->nextPtr != instancePtr; prevPtr = prevPtr->nextPtr) {
983	983	/* Empty loop body */
984	984	}

992	992	*
993	993	* ImgBmapDelete --
994	994	*
995		* This procedure is called by the image code to delete the master
	995	* This procedure is called by the image code to delete the model
996	996	* structure for an image.
997	997	*
998	998	* Results:

1006	1006
1007	1007	static void
1008	1008	ImgBmapDelete(
1009		ClientData masterData) /* Pointer to BitmapMaster structure for
	1009	ClientData modelData) /* Pointer to BitmapModel structure for
1010	1010	* image. Must not have any more instances. */
1011	1011	{
1012		BitmapMaster *masterPtr = masterData;
1013
1014		if (masterPtr->instancePtr != NULL) {
	1012	BitmapModel *modelPtr = modelData;
	1013
	1014	if (modelPtr->instancePtr != NULL) {
1015	1015	Tcl_Panic("tried to delete bitmap image when instances still exist");
1016	1016	}
1017		masterPtr->tkMaster = NULL;
1018		if (masterPtr->imageCmd != NULL) {
1019		Tcl_DeleteCommandFromToken(masterPtr->interp, masterPtr->imageCmd);
1020		}
1021		if (masterPtr->data != NULL) {
1022		ckfree(masterPtr->data);
1023		}
1024		if (masterPtr->maskData != NULL) {
1025		ckfree(masterPtr->maskData);
1026		}
1027		Tk_FreeOptions(configSpecs, (char *) masterPtr, NULL, 0);
1028		ckfree(masterPtr);
	1017	modelPtr->tkModel = NULL;
	1018	if (modelPtr->imageCmd != NULL) {
	1019	Tcl_DeleteCommandFromToken(modelPtr->interp, modelPtr->imageCmd);
	1020	}
	1021	if (modelPtr->data != NULL) {
	1022	ckfree(modelPtr->data);
	1023	}
	1024	if (modelPtr->maskData != NULL) {
	1025	ckfree(modelPtr->maskData);
	1026	}
	1027	Tk_FreeOptions(configSpecs, (char *) modelPtr, NULL, 0);
	1028	ckfree(modelPtr);
1029	1029	}
1030	1030
1031	1031	/*

1047	1047
1048	1048	static void
1049	1049	ImgBmapCmdDeletedProc(
1050		ClientData clientData) /* Pointer to BitmapMaster structure for
	1050	ClientData clientData) /* Pointer to BitmapModel structure for
1051	1051	* image. */
1052	1052	{
1053		BitmapMaster *masterPtr = clientData;
1054
1055		masterPtr->imageCmd = NULL;
1056		if (masterPtr->tkMaster != NULL) {
1057		Tk_DeleteImage(masterPtr->interp, Tk_NameOfImage(masterPtr->tkMaster));
	1053	BitmapModel *modelPtr = clientData;
	1054
	1055	modelPtr->imageCmd = NULL;
	1056	if (modelPtr->tkModel != NULL) {
	1057	Tk_DeleteImage(modelPtr->interp, Tk_NameOfImage(modelPtr->tkModel));
1058	1058	}
1059	1059	}
1060	1060

1082	1082	int size;
1083	1083
1084	1084	size = Tcl_Read(chan, &buffer, 1);
1085		if (size <= 0) {
	1085	if (size != 1) {
1086	1086	return EOF;
1087	1087	} else {
1088	1088	return buffer;

1197	1197	int x, int y, int width, int height,
1198	1198	int prepass)
1199	1199	{
1200		BitmapMaster *masterPtr = clientData;
	1200	BitmapModel *modelPtr = clientData;
1201	1201	Tcl_InterpState interpState;
1202	1202	Tcl_Obj *psObj;
1203	1203

1209	1209	* There is nothing to do for bitmaps with zero width or height.
1210	1210	*/
1211	1211
1212		if (width<=0 \|\| height<=0 \|\| masterPtr->width<=0 \|\| masterPtr->height<=0){
	1212	if (width<=0 \|\| height<=0 \|\| modelPtr->width<=0 \|\| modelPtr->height<=0){
1213	1213	return TCL_OK;
1214	1214	}
1215	1215

1219	1219	* we bail out.
1220	1220	*/
1221	1221
1222		if (masterPtr->width*masterPtr->height > 60000) {
	1222	if (modelPtr->width*modelPtr->height > 60000) {
1223	1223	Tcl_SetObjResult(interp, Tcl_NewStringObj(
1224	1224	"unable to generate postscript for bitmaps larger than 60000"
1225	1225	" pixels", -1));

1258	1258	* color to the bits specified by the mask.
1259	1259	*/
1260	1260
1261		if ((masterPtr->bgUid != NULL) && (masterPtr->bgUid[0] != '\000')) {
	1261	if ((modelPtr->bgUid != NULL) && (modelPtr->bgUid[0] != '\000')) {
1262	1262	XColor color;
1263	1263
1264		TkParseColor(Tk_Display(tkwin), Tk_Colormap(tkwin), masterPtr->bgUid,
	1264	TkParseColor(Tk_Display(tkwin), Tk_Colormap(tkwin), modelPtr->bgUid,
1265	1265	&color);
1266	1266	Tcl_ResetResult(interp);
1267	1267	if (Tk_PostscriptColor(interp, psinfo, &color) != TCL_OK) {

1269	1269	}
1270	1270	Tcl_AppendObjToObj(psObj, Tcl_GetObjResult(interp));
1271	1271
1272		if (masterPtr->maskData == NULL) {
	1272	if (modelPtr->maskData == NULL) {
1273	1273	Tcl_AppendToObj(psObj,
1274	1274	"0 0 moveto 1 0 rlineto 0 1 rlineto -1 0 rlineto "
1275	1275	"closepath fill\n", -1);
1276	1276	} else {
1277		ImgBmapPsImagemask(psObj, masterPtr->width, masterPtr->height,
1278		masterPtr->maskData);
	1277	ImgBmapPsImagemask(psObj, modelPtr->width, modelPtr->height,
	1278	modelPtr->maskData);
1279	1279	}
1280	1280	}
1281	1281

1283	1283	* Draw the bitmap foreground, assuming there is one.
1284	1284	*/
1285	1285
1286		if ((masterPtr->fgUid != NULL) && (masterPtr->data != NULL)) {
	1286	if ((modelPtr->fgUid != NULL) && (modelPtr->data != NULL)) {
1287	1287	XColor color;
1288	1288
1289		TkParseColor(Tk_Display(tkwin), Tk_Colormap(tkwin), masterPtr->fgUid,
	1289	TkParseColor(Tk_Display(tkwin), Tk_Colormap(tkwin), modelPtr->fgUid,
1290	1290	&color);
1291	1291	Tcl_ResetResult(interp);
1292	1292	if (Tk_PostscriptColor(interp, psinfo, &color) != TCL_OK) {

1294	1294	}
1295	1295	Tcl_AppendObjToObj(psObj, Tcl_GetObjResult(interp));
1296	1296
1297		ImgBmapPsImagemask(psObj, masterPtr->width, masterPtr->height,
1298		masterPtr->data);
	1297	ImgBmapPsImagemask(psObj, modelPtr->width, modelPtr->height,
	1298	modelPtr->data);
1299	1299	}
1300	1300
1301	1301	/*

+2

-2

generic/tkImgPNG.c less more

625	625	int blockSz = PNG_MIN(destSz, PNG_BLOCK_SZ);
626	626
627	627	blockSz = Tcl_Read(pngPtr->channel, (char *)destPtr, blockSz);
628		if (blockSz < 0) {
	628	if (blockSz == -1) {
629	629	/* TODO: failure info... */
630	630	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
631	631	"channel read failed: %s", Tcl_PosixError(interp)));

2883	2883	}
2884	2884
2885	2885	memcpy(destPtr+objSz, srcPtr, srcSz);
2886		} else if (Tcl_Write(pngPtr->channel, (const char *) srcPtr, srcSz) < 0) {
	2886	} else if (Tcl_Write(pngPtr->channel, (const char *) srcPtr, srcSz) == -1) {
2887	2887	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
2888	2888	"write to channel failed: %s", Tcl_PosixError(interp)));
2889	2889	return TCL_ERROR;

+13

-14

generic/tkImgPPM.c less more

93	93	static int
94	94	FileMatchPPM(
95	95	Tcl_Channel chan, /* The image file, open for reading. */
96		const char fileName, / The name of the image file. */
97		Tcl_Obj format, / User-specified format string, or NULL. */
	96	TCL_UNUSED(const char ), / The name of the image file. */
	97	TCL_UNUSED(Tcl_Obj ), / User-specified format string, or NULL. */
98	98	int widthPtr, int heightPtr,
99	99	/* The dimensions of the image are returned
100	100	* here if the file is a valid raw PPM
101	101	* file. */
102		Tcl_Interp interp) / unused */
	102	TCL_UNUSED(Tcl_Interp )) / unused */
103	103	{
104	104	int dummy;
105	105

130	130	Tcl_Interp interp, / Interpreter to use for reporting errors. */
131	131	Tcl_Channel chan, /* The image file, open for reading. */
132	132	const char fileName, / The name of the image file. */
133		Tcl_Obj format, / User-specified format string, or NULL. */
	133	TCL_UNUSED(Tcl_Obj ), / User-specified format string, or NULL. */
134	134	Tk_PhotoHandle imageHandle, /* The photo image to write into. */
135	135	int destX, int destY, /* Coordinates of top-left pixel in photo
136	136	* image to be written to. */

210	210	nLines = 1;
211	211	}
212	212	nBytes = nLines * block.pitch;
213		pixelPtr = ckalloc(nBytes);
	213	pixelPtr = (unsigned char *)ckalloc(nBytes);
214	214	block.pixelPtr = pixelPtr + srcX * block.pixelSize;
215	215
216	216	for (h = height; h > 0; h -= nLines) {

280	280	FileWritePPM(
281	281	Tcl_Interp *interp,
282	282	const char *fileName,
283		Tcl_Obj *format,
	283	TCL_UNUSED(Tcl_Obj *),
284	284	Tk_PhotoImageBlock *blockPtr)
285	285	{
286	286	Tcl_Channel chan;

322	322	pixelPtr = pixLinePtr;
323	323	for (w = blockPtr->width; w > 0; w--) {
324	324	if ( Tcl_Write(chan,(char *)&pixelPtr[0], 1) == -1 \|\|
325		Tcl_Write(chan,(char *)&pixelPtr[greenOffset],1)==-1 \|\|
326		Tcl_Write(chan,(char *)&pixelPtr[blueOffset],1) ==-1) {
	325	Tcl_Write(chan,(char *)&pixelPtr[greenOffset],1) == -1 \|\|
	326	Tcl_Write(chan,(char *)&pixelPtr[blueOffset],1) == -1) {
327	327	goto writeerror;
328	328	}
329	329	pixelPtr += blockPtr->pixelSize;

367	367	static int
368	368	StringWritePPM(
369	369	Tcl_Interp *interp,
370		Tcl_Obj *format,
	370	TCL_UNUSED(Tcl_Obj *),
371	371	Tk_PhotoImageBlock *blockPtr)
372	372	{
373	373	int w, h, size, greenOffset, blueOffset;

443	443	static int
444	444	StringMatchPPM(
445	445	Tcl_Obj dataObj, / The image data. */
446		Tcl_Obj format, / User-specified format string, or NULL. */
	446	TCL_UNUSED(Tcl_Obj ), / User-specified format string, or NULL. */
447	447	int widthPtr, int heightPtr,
448	448	/* The dimensions of the image are returned
449	449	* here if the file is a valid raw PPM
450	450	* file. */
451		Tcl_Interp interp) / unused */
	451	TCL_UNUSED(Tcl_Interp )) / unused */
452	452	{
453	453	int dummy;
454	454

478	478	StringReadPPM(
479	479	Tcl_Interp interp, / Interpreter to use for reporting errors. */
480	480	Tcl_Obj dataObj, / The image data. */
481		Tcl_Obj format, / User-specified format string, or NULL. */
	481	TCL_UNUSED(Tcl_Obj ), / User-specified format string, or NULL. */
482	482	Tk_PhotoHandle imageHandle, /* The photo image to write into. */
483	483	int destX, int destY, /* Coordinates of top-left pixel in photo
484	484	* image to be written to. */

577	577	nLines = 1;
578	578	}
579	579	nBytes = nLines * block.pitch;
580		pixelPtr = ckalloc(nBytes);
	580	pixelPtr = (unsigned char *)ckalloc(nBytes);
581	581	block.pixelPtr = pixelPtr + srcX * block.pixelSize;
582	582
583	583	for (h = height; h > 0; h -= nLines) {

599	599	p = (((int) dataBuffer) * 255)/maxIntensity;
600	600	}
601	601	} else {
602		unsigned char *p;
603	602	unsigned int value;
604	603
605	604	for (p = pixelPtr,count=nBytes; count > 1; count-=2, p += 2) {

+77

-82

generic/tkImgPhInstance.c less more

18	18	*/
19	19
20	20	#include "tkImgPhoto.h"
21		#ifdef MAC_OSX_TK
22		#define TKPUTIMAGE_CAN_BLEND
23		#endif
	21	#include "tkPort.h"
24	22
25	23	/*
26	24	* Declaration for internal Xlib function used here:

60	58	* TkImgPhotoConfigureInstance --
61	59	*
62	60	* This function is called to create displaying information for a photo
63		* image instance based on the configuration information in the master.
64		* It is invoked both when new instances are created and when the master
	61	* image instance based on the configuration information in the model.
	62	* It is invoked both when new instances are created and when the model
65	63	* is reconfigured.
66	64	*
67	65	* Results:

78	76	TkImgPhotoConfigureInstance(
79	77	PhotoInstance instancePtr) / Instance to reconfigure. */
80	78	{
81		PhotoMaster *masterPtr = instancePtr->masterPtr;
	79	PhotoModel *modelPtr = instancePtr->masterPtr;
82	80	XImage *imagePtr;
83	81	int bitsPerPixel;
84	82	ColorTable *colorTablePtr;
85	83	XRectangle validBox;
86	84
87	85	/*
88		* If the -palette configuration option has been set for the master, use
	86	* If the -palette configuration option has been set for the model, use
89	87	* the value specified for our palette, but only if it is a valid palette
90		* for our windows. Use the gamma value specified the master.
91		*/
92
93		if ((masterPtr->palette && masterPtr->palette[0])
94		&& IsValidPalette(instancePtr, masterPtr->palette)) {
95		instancePtr->palette = masterPtr->palette;
	88	* for our windows. Use the gamma value specified the model.
	89	*/
	90
	91	if ((modelPtr->palette && modelPtr->palette[0])
	92	&& IsValidPalette(instancePtr, modelPtr->palette)) {
	93	instancePtr->palette = modelPtr->palette;
96	94	} else {
97	95	instancePtr->palette = instancePtr->defaultPalette;
98	96	}
99		instancePtr->gamma = masterPtr->gamma;
	97	instancePtr->gamma = modelPtr->gamma;
100	98
101	99	/*
102	100	* If we don't currently have a color table, or if the one we have no

160	158	}
161	159
162	160	/*
163		* If the user has specified a width and/or height for the master which is
	161	* If the user has specified a width and/or height for the model which is
164	162	* different from our current width/height, set the size to the values
165	163	* specified by the user. If we have no pixmap, we do this also, since it
166	164	* has the side effect of allocating a pixmap for us.
167	165	*/
168	166
169	167	if ((instancePtr->pixels == None) \|\| (instancePtr->error == NULL)
170		\|\| (instancePtr->width != masterPtr->width)
171		\|\| (instancePtr->height != masterPtr->height)) {
	168	\|\| (instancePtr->width != modelPtr->width)
	169	\|\| (instancePtr->height != modelPtr->height)) {
172	170	TkImgPhotoInstanceSetSize(instancePtr);
173	171	}
174	172

176	174	* Redither this instance if necessary.
177	175	*/
178	176
179		if ((masterPtr->flags & IMAGE_CHANGED)
	177	if ((modelPtr->flags & IMAGE_CHANGED)
180	178	\|\| (instancePtr->colorTablePtr != colorTablePtr)) {
181		TkClipBox(masterPtr->validRegion, &validBox);
	179	TkClipBox(modelPtr->validRegion, &validBox);
182	180	if ((validBox.width > 0) && (validBox.height > 0)) {
183	181	TkImgDitherInstance(instancePtr, validBox.x, validBox.y,
184	182	validBox.width, validBox.height);

208	206	TkImgPhotoGet(
209	207	Tk_Window tkwin, /* Window in which the instance will be
210	208	* used. */
211		ClientData masterData) /* Pointer to our master structure for the
	209	ClientData modelData) /* Pointer to our model structure for the
212	210	* image. */
213	211	{
214		PhotoMaster *masterPtr = masterData;
	212	PhotoModel *modelPtr = modelData;
215	213	PhotoInstance *instancePtr;
216	214	Colormap colormap;
217	215	int mono, nRed, nGreen, nBlue, numVisuals;

248	246	*/
249	247
250	248	colormap = Tk_Colormap(tkwin);
251		for (instancePtr = masterPtr->instancePtr; instancePtr != NULL;
	249	for (instancePtr = modelPtr->instancePtr; instancePtr != NULL;
252	250	instancePtr = instancePtr->nextPtr) {
253	251	if ((colormap == instancePtr->colormap)
254	252	&& (Tk_Display(tkwin) == instancePtr->display)) {

278	276	*/
279	277
280	278	instancePtr = ckalloc(sizeof(PhotoInstance));
281		instancePtr->masterPtr = masterPtr;
	279	instancePtr->masterPtr = modelPtr;
282	280	instancePtr->display = Tk_Display(tkwin);
283	281	instancePtr->colormap = Tk_Colormap(tkwin);
284	282	Tk_PreserveColormap(instancePtr->display, instancePtr->colormap);

289	287	instancePtr->width = 0;
290	288	instancePtr->height = 0;
291	289	instancePtr->imagePtr = 0;
292		instancePtr->nextPtr = masterPtr->instancePtr;
293		masterPtr->instancePtr = instancePtr;
	290	instancePtr->nextPtr = modelPtr->instancePtr;
	291	modelPtr->instancePtr = instancePtr;
294	292
295	293	/*
296	294	* Obtain information about the visual and decide on the default palette.

350	348	* Make a GC with background = black and foreground = white.
351	349	*/
352	350
353		white = Tk_GetColor(masterPtr->interp, tkwin, "white");
354		black = Tk_GetColor(masterPtr->interp, tkwin, "black");
	351	white = Tk_GetColor(modelPtr->interp, tkwin, "white");
	352	black = Tk_GetColor(modelPtr->interp, tkwin, "black");
355	353	gcValues.foreground = (white != NULL)? white->pixel:
356	354	WhitePixelOfScreen(Tk_Screen(tkwin));
357	355	gcValues.background = (black != NULL)? black->pixel:

374	372	*/
375	373
376	374	if (instancePtr->nextPtr == NULL) {
377		Tk_ImageChanged(masterPtr->tkMaster, 0, 0, 0, 0,
378		masterPtr->width, masterPtr->height);
	375	Tk_ImageChanged(modelPtr->tkMaster, 0, 0, 0, 0,
	376	modelPtr->width, modelPtr->height);
379	377	}
380	378
381	379	return instancePtr;

407	405	* slower, so it's only used for 15bpp+.
408	406	*
409	407	* Note that Win32 pre-defines those operations that we really need.
410		*
411		* Note that on MacOS, if the background comes from a Retina display
412		* then it will be twice as wide and twice as high as the photoimage.
413	408	*
414	409	*----------------------------------------------------------------------
415	410	*/

438	433	{
439	434	int x, y, line;
440	435	unsigned long pixel;
441		unsigned char r, g, b, alpha, unalpha, *masterPtr;
	436	unsigned char r, g, b, alpha, unalpha, *modelPtr;
442	437	unsigned char *alphaAr = iPtr->masterPtr->pix32;
443	438
444	439	/*

498	493	for (y = 0; y < height; y++) {
499	494	line = (y + yOffset) * iPtr->masterPtr->width;
500	495	for (x = 0; x < width; x++) {
501		masterPtr = alphaAr + ((line + x + xOffset) * 4);
502		alpha = masterPtr[3];
	496	modelPtr = alphaAr + ((line + x + xOffset) * 4);
	497	alpha = modelPtr[3];
503	498
504	499	/*
505	500	* Ignore pixels that are fully transparent

511	506	* 24 and 32 bit displays, but this seems "fast enough".
512	507	*/
513	508
514		r = masterPtr[0];
515		g = masterPtr[1];
516		b = masterPtr[2];
	509	r = modelPtr[0];
	510	g = modelPtr[1];
	511	b = modelPtr[2];
517	512	if (alpha != 255) {
518	513	/*
519	514	* Only blend pixels that have some transparency

541	536	for (y = 0; y < height; y++) {
542	537	line = (y + yOffset) * iPtr->masterPtr->width;
543	538	for (x = 0; x < width; x++) {
544		masterPtr = alphaAr + ((line + x + xOffset) * 4);
545		alpha = masterPtr[3];
	539	modelPtr = alphaAr + ((line + x + xOffset) * 4);
	540	alpha = modelPtr[3];
546	541
547	542	/*
548	543	* Ignore pixels that are fully transparent

554	549	* and 32 bit displays, but this seems "fast enough".
555	550	*/
556	551
557		r = masterPtr[0];
558		g = masterPtr[1];
559		b = masterPtr[2];
	552	r = modelPtr[0];
	553	g = modelPtr[1];
	554	b = modelPtr[2];
560	555	if (alpha != 255) {
561	556	/*
562	557	* Only blend pixels that have some transparency

683	678	Tk_DeleteErrorHandler(handler);
684	679	} else {
685	680	/*
686		* masterPtr->region describes which parts of the image contain valid
	681	* modelPtr->region describes which parts of the image contain valid
687	682	* data. We set this region as the clip mask for the gc, setting its
688	683	* origin appropriately, and use it when drawing the image.
689	684	*/

772	767	TkImgPhotoInstanceSetSize(
773	768	PhotoInstance instancePtr) / Instance whose size is to be changed. */
774	769	{
775		PhotoMaster *masterPtr;
	770	PhotoModel *modelPtr;
776	771	schar newError, errSrcPtr, *errDestPtr;
777	772	int h, offset;
778	773	XRectangle validBox;
779	774	Pixmap newPixmap;
780	775
781		masterPtr = instancePtr->masterPtr;
782		TkClipBox(masterPtr->validRegion, &validBox);
783
784		if ((instancePtr->width != masterPtr->width)
785		\|\| (instancePtr->height != masterPtr->height)
	776	modelPtr = instancePtr->masterPtr;
	777	TkClipBox(modelPtr->validRegion, &validBox);
	778
	779	if ((instancePtr->width != modelPtr->width)
	780	\|\| (instancePtr->height != modelPtr->height)
786	781	\|\| (instancePtr->pixels == None)) {
787	782	newPixmap = Tk_GetPixmap(instancePtr->display,
788	783	RootWindow(instancePtr->display,
789	784	instancePtr->visualInfo.screen),
790		(masterPtr->width > 0) ? masterPtr->width: 1,
791		(masterPtr->height > 0) ? masterPtr->height: 1,
	785	(modelPtr->width > 0) ? modelPtr->width: 1,
	786	(modelPtr->height > 0) ? modelPtr->height: 1,
792	787	instancePtr->visualInfo.depth);
793	788	if (!newPixmap) {
794	789	Tcl_Panic("Fail to create pixmap with Tk_GetPixmap in TkImgPhotoInstanceSetSize");

818	813	instancePtr->pixels = newPixmap;
819	814	}
820	815
821		if ((instancePtr->width != masterPtr->width)
822		\|\| (instancePtr->height != masterPtr->height)
	816	if ((instancePtr->width != modelPtr->width)
	817	\|\| (instancePtr->height != modelPtr->height)
823	818	\|\| (instancePtr->error == NULL)) {
824		if (masterPtr->height > 0 && masterPtr->width > 0) {
	819	if (modelPtr->height > 0 && modelPtr->width > 0) {
825	820	/*
826	821	* TODO: use attemptckalloc() here once there is a strategy that
827	822	* will allow us to recover from failure. Right now, there's no
828	823	* such possibility.
829	824	*/
830	825
831		newError = ckalloc(masterPtr->height * masterPtr->width
	826	newError = ckalloc(modelPtr->height * modelPtr->width
832	827	* 3 * sizeof(schar));
833	828
834	829	/*

837	832	*/
838	833
839	834	if ((instancePtr->error != NULL)
840		&& ((instancePtr->width == masterPtr->width)
841		\|\| (validBox.width == masterPtr->width))) {
	835	&& ((instancePtr->width == modelPtr->width)
	836	\|\| (validBox.width == modelPtr->width))) {
842	837	if (validBox.y > 0) {
843	838	memset(newError, 0, (size_t)
844		validBox.y * masterPtr->width * 3 * sizeof(schar));
	839	validBox.y * modelPtr->width * 3 * sizeof(schar));
845	840	}
846	841	h = validBox.y + validBox.height;
847		if (h < masterPtr->height) {
848		memset(newError + hmasterPtr->width3, 0,
849		(size_t) (masterPtr->height - h)
850		* masterPtr->width * 3 * sizeof(schar));
	842	if (h < modelPtr->height) {
	843	memset(newError + hmodelPtr->width3, 0,
	844	(size_t) (modelPtr->height - h)
	845	* modelPtr->width * 3 * sizeof(schar));
851	846	}
852	847	} else {
853	848	memset(newError, 0, (size_t)
854		masterPtr->height * masterPtr->width 3sizeof(schar));
	849	modelPtr->height * modelPtr->width 3sizeof(schar));
855	850	}
856	851	} else {
857	852	newError = NULL;

863	858	* array.
864	859	*/
865	860
866		if (masterPtr->width == instancePtr->width) {
867		offset = validBox.y * masterPtr->width * 3;
	861	if (modelPtr->width == instancePtr->width) {
	862	offset = validBox.y * modelPtr->width * 3;
868	863	memcpy(newError + offset, instancePtr->error + offset,
869	864	(size_t) (validBox.height
870		* masterPtr->width * 3 * sizeof(schar)));
	865	* modelPtr->width * 3 * sizeof(schar)));
871	866
872	867	} else if (validBox.width > 0 && validBox.height > 0) {
873	868	errDestPtr = newError +
874		(validBox.y * masterPtr->width + validBox.x) * 3;
	869	(validBox.y * modelPtr->width + validBox.x) * 3;
875	870	errSrcPtr = instancePtr->error +
876	871	(validBox.y * instancePtr->width + validBox.x) * 3;
877	872
878	873	for (h = validBox.height; h > 0; --h) {
879	874	memcpy(errDestPtr, errSrcPtr,
880	875	validBox.width * 3 * sizeof(schar));
881		errDestPtr += masterPtr->width * 3;
	876	errDestPtr += modelPtr->width * 3;
882	877	errSrcPtr += instancePtr->width * 3;
883	878	}
884	879	}

888	883	instancePtr->error = newError;
889	884	}
890	885
891		instancePtr->width = masterPtr->width;
892		instancePtr->height = masterPtr->height;
	886	instancePtr->width = modelPtr->width;
	887	instancePtr->height = modelPtr->height;
893	888	}
894	889
895	890	/*

1621	1616	* TkImgDitherInstance --
1622	1617	*
1623	1618	* This function is called to update an area of an instance's pixmap by
1624		* dithering the corresponding area of the master.
	1619	* dithering the corresponding area of the model.
1625	1620	*
1626	1621	* Results:
1627	1622	* None.

1639	1634	* block to be dithered. */
1640	1635	int width, int height) /* Dimensions of the block to be dithered. */
1641	1636	{
1642		PhotoMaster *masterPtr = instancePtr->masterPtr;
	1637	PhotoModel *modelPtr = instancePtr->masterPtr;
1643	1638	ColorTable *colorPtr = instancePtr->colorTablePtr;
1644	1639	XImage *imagePtr;
1645	1640	int nLines, bigEndian, i, c, x, y, xEnd, doDithering = 1;

1697	1692	bigEndian = imagePtr->bitmap_bit_order == MSBFirst;
1698	1693	firstBit = bigEndian? (1 << (imagePtr->bitmap_unit - 1)): 1;
1699	1694
1700		lineLength = masterPtr->width * 3;
1701		srcLinePtr = masterPtr->pix32 + (yStart * masterPtr->width + xStart) * 4;
	1695	lineLength = modelPtr->width * 3;
	1696	srcLinePtr = modelPtr->pix32 + (yStart * modelPtr->width + xStart) * 4;
1702	1697	errLinePtr = instancePtr->error + yStart * lineLength + xStart * 3;
1703	1698	xEnd = xStart + width;
1704	1699

1753	1748	c += errPtr[-lineLength-3];
1754	1749	}
1755	1750	c += errPtr[-lineLength] * 5;
1756		if ((x + 1) < masterPtr->width) {
	1751	if ((x + 1) < modelPtr->width) {
1757	1752	c += errPtr[-lineLength+3] * 3;
1758	1753	}
1759	1754	}

1824	1819	/*
1825	1820	* Multibit monochrome window. The operation here is similar
1826	1821	* to the color window case above, except that there is only
1827		* one component. If the master image is in color, use the
	1822	* one component. If the model image is in color, use the
1828	1823	* luminance computed as
1829	1824	* 0.344 * red + 0.5 * green + 0.156 * blue.
1830	1825	*/

1836	1831	c += errPtr[-lineLength-1];
1837	1832	}
1838	1833	c += errPtr[-lineLength] * 5;
1839		if (x + 1 < masterPtr->width) {
	1834	if (x + 1 < modelPtr->width) {
1840	1835	c += errPtr[-lineLength+1] * 3;
1841	1836	}
1842	1837	}
1843	1838	c = ((c + 2056) >> 4) - 128;
1844	1839
1845		if (masterPtr->flags & COLOR_IMAGE) {
	1840	if (modelPtr->flags & COLOR_IMAGE) {
1846	1841	c += (unsigned) (srcPtr[0] * 11 + srcPtr[1] * 16
1847	1842	+ srcPtr[2] * 5 + 16) >> 5;
1848	1843	} else {

1909	1904	c += errPtr[-lineLength-1];
1910	1905	}
1911	1906	c += errPtr[-lineLength] * 5;
1912		if (x + 1 < masterPtr->width) {
	1907	if (x + 1 < modelPtr->width) {
1913	1908	c += errPtr[-lineLength+1] * 3;
1914	1909	}
1915	1910	}
1916	1911	c = ((c + 2056) >> 4) - 128;
1917	1912
1918		if (masterPtr->flags & COLOR_IMAGE) {
	1913	if (modelPtr->flags & COLOR_IMAGE) {
1919	1914	c += (unsigned)(srcPtr[0] * 11 + srcPtr[1] * 16
1920	1915	+ srcPtr[2] * 5 + 16) >> 5;
1921	1916	} else {

1938	1933	}
1939	1934	*destLongPtr = word;
1940	1935	}
1941		srcLinePtr += masterPtr->width * 4;
	1936	srcLinePtr += modelPtr->width * 4;
1942	1937	errLinePtr += lineLength;
1943	1938	dstLinePtr += bytesPerLine;
1944	1939	}

+436

-410

generic/tkImgPhoto.c less more

100	100
101	101	static int ImgPhotoCreate(Tcl_Interp interp, const char name,
102	102	int objc, Tcl_Obj *const objv[],
103		const Tk_ImageType *typePtr, Tk_ImageMaster master,
	103	const Tk_ImageType *typePtr, Tk_ImageModel model,
104	104	ClientData *clientDataPtr);
105	105	static void ImgPhotoDelete(ClientData clientData);
106	106	static int ImgPhotoPostscript(ClientData clientData,

151	151
152	152	static const Tk_ConfigSpec configSpecs[] = {
153	153	{TK_CONFIG_STRING, "-file", NULL, NULL,
154		NULL, Tk_Offset(PhotoMaster, fileString), TK_CONFIG_NULL_OK, NULL},
	154	NULL, Tk_Offset(PhotoModel, fileString), TK_CONFIG_NULL_OK, NULL},
155	155	{TK_CONFIG_DOUBLE, "-gamma", NULL, NULL,
156		DEF_PHOTO_GAMMA, Tk_Offset(PhotoMaster, gamma), 0, NULL},
	156	DEF_PHOTO_GAMMA, Tk_Offset(PhotoModel, gamma), 0, NULL},
157	157	{TK_CONFIG_INT, "-height", NULL, NULL,
158		DEF_PHOTO_HEIGHT, Tk_Offset(PhotoMaster, userHeight), 0, NULL},
	158	DEF_PHOTO_HEIGHT, Tk_Offset(PhotoModel, userHeight), 0, NULL},
159	159	{TK_CONFIG_UID, "-palette", NULL, NULL,
160		DEF_PHOTO_PALETTE, Tk_Offset(PhotoMaster, palette), 0, NULL},
	160	DEF_PHOTO_PALETTE, Tk_Offset(PhotoModel, palette), 0, NULL},
161	161	{TK_CONFIG_INT, "-width", NULL, NULL,
162		DEF_PHOTO_WIDTH, Tk_Offset(PhotoMaster, userWidth), 0, NULL},
	162	DEF_PHOTO_WIDTH, Tk_Offset(PhotoModel, userWidth), 0, NULL},
163	163	{TK_CONFIG_END, NULL, NULL, NULL, NULL, 0, 0, NULL}
164	164	};
165	165

175	175	Tcl_Interp *interp, int allowedOptions,
176	176	int indexPtr, int objc, Tcl_Obj const objv[]);
177	177	static void ImgPhotoCmdDeletedProc(ClientData clientData);
178		static int ImgPhotoConfigureMaster(Tcl_Interp *interp,
179		PhotoMaster *masterPtr, int objc,
	178	static int ImgPhotoConfigureModel(Tcl_Interp *interp,
	179	PhotoModel *modelPtr, int objc,
180	180	Tcl_Obj *const objv[], int flags);
181		static int ToggleComplexAlphaIfNeeded(PhotoMaster *mPtr);
182		static int ImgPhotoSetSize(PhotoMaster *masterPtr, int width,
	181	static int ToggleComplexAlphaIfNeeded(PhotoModel *mPtr);
	182	static int ImgPhotoSetSize(PhotoModel *modelPtr, int width,
183	183	int height);
184	184	static int ImgStringWrite(Tcl_Interp *interp,
185	185	Tcl_Obj *formatString,
186	186	Tk_PhotoImageBlock *blockPtr);
187		static char * ImgGetPhoto(PhotoMaster *masterPtr,
	187	static char * ImgGetPhoto(PhotoModel *modelPtr,
188	188	Tk_PhotoImageBlock *blockPtr,
189	189	struct SubcommandOptions *optPtr);
190	190	static int MatchFileFormat(Tcl_Interp *interp, Tcl_Channel chan,

215	215
216	216	static void
217	217	PhotoFormatThreadExitProc(
218		ClientData clientData) /* not used */
	218	TCL_UNUSED(void )) / not used */
219	219	{
220	220	Tk_PhotoImageFormat *freePtr;
221		ThreadSpecificData *tsdPtr =
	221	ThreadSpecificData tsdPtr = (ThreadSpecificData )
222	222	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
223	223
224	224	while (tsdPtr->oldFormatList != NULL) {

261	261	* by caller. */
262	262	{
263	263	Tk_PhotoImageFormat *copyPtr;
264		ThreadSpecificData *tsdPtr =
	264	ThreadSpecificData tsdPtr = (ThreadSpecificData )
265	265	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
266	266
267	267	if (!tsdPtr->initialized) {
268	268	tsdPtr->initialized = 1;
269	269	Tcl_CreateThreadExitHandler(PhotoFormatThreadExitProc, NULL);
270	270	}
271		copyPtr = ckalloc(sizeof(Tk_PhotoImageFormat));
	271	copyPtr = (Tk_PhotoImageFormat *)ckalloc(sizeof(Tk_PhotoImageFormat));
272	272	copyPtr = formatPtr;
273	273	copyPtr->nextPtr = tsdPtr->oldFormatList;
274	274	tsdPtr->oldFormatList = copyPtr;

282	282	* by caller. */
283	283	{
284	284	Tk_PhotoImageFormat *copyPtr;
285		ThreadSpecificData *tsdPtr =
	285	ThreadSpecificData tsdPtr = (ThreadSpecificData )
286	286	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
287	287
288	288	if (!tsdPtr->initialized) {
289	289	tsdPtr->initialized = 1;
290	290	Tcl_CreateThreadExitHandler(PhotoFormatThreadExitProc, NULL);
291	291	}
292		copyPtr = ckalloc(sizeof(Tk_PhotoImageFormat));
	292	copyPtr = (Tk_PhotoImageFormat *)ckalloc(sizeof(Tk_PhotoImageFormat));
293	293	copyPtr = formatPtr;
294	294	if (isupper((unsigned char) *formatPtr->name)) {
295	295	copyPtr->nextPtr = tsdPtr->oldFormatList;
296	296	tsdPtr->oldFormatList = copyPtr;
297	297	} else {
298	298	/* for compatibility with aMSN: make a copy of formatPtr->name */
299		char *name = ckalloc(strlen(formatPtr->name) + 1);
	299	char name = (char )ckalloc(strlen(formatPtr->name) + 1);
300	300	strcpy(name, formatPtr->name);
301	301	copyPtr->name = name;
302	302	copyPtr->nextPtr = tsdPtr->formatList;

329	329	int objc, /* Number of arguments. */
330	330	Tcl_Obj const objv[], / Argument objects for options (doesn't
331	331	* include image name or type). */
332		const Tk_ImageType typePtr,/ Pointer to our type record (not used). */
333		Tk_ImageMaster master, /* Token for image, to be used by us in later
	332	TCL_UNUSED(const Tk_ImageType ),/ Pointer to our type record (not used). */
	333	Tk_ImageModel model, /* Token for image, to be used by us in later
334	334	* callbacks. */
335	335	ClientData clientDataPtr) / Store manager's token for image here; it
336	336	* will be returned in later callbacks. */
337	337	{
338		PhotoMaster *masterPtr;
	338	PhotoModel *modelPtr;
339	339
340	340	/*
341		* Allocate and initialize the photo image master record.
	341	* Allocate and initialize the photo image model record.
342	342	*/
343	343
344		masterPtr = ckalloc(sizeof(PhotoMaster));
345		memset(masterPtr, 0, sizeof(PhotoMaster));
346		masterPtr->tkMaster = master;
347		masterPtr->interp = interp;
348		masterPtr->imageCmd = Tcl_CreateObjCommand(interp, name, ImgPhotoCmd,
349		masterPtr, ImgPhotoCmdDeletedProc);
350		masterPtr->palette = NULL;
351		masterPtr->pix32 = NULL;
352		masterPtr->instancePtr = NULL;
353		masterPtr->validRegion = TkCreateRegion();
	344	modelPtr = (PhotoModel *)ckalloc(sizeof(PhotoModel));
	345	memset(modelPtr, 0, sizeof(PhotoModel));
	346	modelPtr->tkMaster = model;
	347	modelPtr->interp = interp;
	348	modelPtr->imageCmd = Tcl_CreateObjCommand(interp, name, ImgPhotoCmd,
	349	modelPtr, ImgPhotoCmdDeletedProc);
	350	modelPtr->palette = NULL;
	351	modelPtr->pix32 = NULL;
	352	modelPtr->instancePtr = NULL;
	353	modelPtr->validRegion = TkCreateRegion();
354	354
355	355	/*
356	356	* Process configuration options given in the image create command.
357	357	*/
358	358
359		if (ImgPhotoConfigureMaster(interp, masterPtr, objc, objv, 0) != TCL_OK) {
360		ImgPhotoDelete(masterPtr);
	359	if (ImgPhotoConfigureModel(interp, modelPtr, objc, objv, 0) != TCL_OK) {
	360	ImgPhotoDelete(modelPtr);
361	361	return TCL_ERROR;
362	362	}
363	363
364		*clientDataPtr = masterPtr;
	364	*clientDataPtr = modelPtr;
365	365	return TCL_OK;
366	366	}
367	367

385	385
386	386	static int
387	387	ImgPhotoCmd(
388		ClientData clientData, /* Information about photo master. */
	388	ClientData clientData, /* Information about photo model. */
389	389	Tcl_Interp interp, / Current interpreter. */
390	390	int objc, /* Number of arguments. */
391	391	Tcl_Obj const objv[]) / Argument objects. */

400	400	PHOTO_WRITE
401	401	};
402	402
403		PhotoMaster *masterPtr = clientData;
	403	PhotoModel *modelPtr = clientData;
404	404	int result, index, x, y, width, height, dataWidth, dataHeight, listObjc;
405	405	struct SubcommandOptions options;
406	406	Tcl_Obj listObjv, srcObjv;

412	412	int imageWidth, imageHeight, matched, oldformat = 0;
413	413	Tcl_Channel chan;
414	414	Tk_PhotoHandle srcHandle;
415		ThreadSpecificData *tsdPtr =
	415	ThreadSpecificData tsdPtr = (ThreadSpecificData )
416	416	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
417	417
418	418	if (objc < 2) {

432	432	*/
433	433
434	434	if (objc == 2) {
435		Tk_PhotoBlank(masterPtr);
	435	Tk_PhotoBlank(modelPtr);
436	436	return TCL_OK;
437	437	} else {
438	438	Tcl_WrongNumArgs(interp, 2, objv, NULL);

449	449	arg = Tcl_GetString(objv[2]);
450	450	length = objv[2]->length;
451	451	if (strncmp(arg,"-data", length) == 0) {
452		if (masterPtr->dataString) {
453		Tcl_SetObjResult(interp, masterPtr->dataString);
	452	if (modelPtr->dataString) {
	453	Tcl_SetObjResult(interp, modelPtr->dataString);
454	454	}
455	455	} else if (strncmp(arg,"-format", length) == 0) {
456		if (masterPtr->format) {
457		Tcl_SetObjResult(interp, masterPtr->format);
	456	if (modelPtr->format) {
	457	Tcl_SetObjResult(interp, modelPtr->format);
458	458	}
459	459	} else {
460	460	Tk_ConfigureValue(interp, Tk_MainWindow(interp), configSpecs,
461		(char *) masterPtr, Tcl_GetString(objv[2]), 0);
	461	(char *) modelPtr, Tcl_GetString(objv[2]), 0);
462	462	}
463	463	return TCL_OK;
464	464	}

472	472	Tcl_Obj obj, subobj;
473	473
474	474	result = Tk_ConfigureInfo(interp, Tk_MainWindow(interp),
475		configSpecs, (char *) masterPtr, NULL, 0);
	475	configSpecs, (char *) modelPtr, NULL, 0);
476	476	if (result != TCL_OK) {
477	477	return result;
478	478	}
479	479	obj = Tcl_NewObj();
480	480	subobj = Tcl_NewStringObj("-data {} {} {}", 14);
481		if (masterPtr->dataString) {
482		Tcl_ListObjAppendElement(NULL, subobj, masterPtr->dataString);
	481	if (modelPtr->dataString) {
	482	Tcl_ListObjAppendElement(NULL, subobj, modelPtr->dataString);
483	483	} else {
484	484	Tcl_AppendStringsToObj(subobj, " {}", NULL);
485	485	}
486	486	Tcl_ListObjAppendElement(interp, obj, subobj);
487	487	subobj = Tcl_NewStringObj("-format {} {} {}", 16);
488		if (masterPtr->format) {
489		Tcl_ListObjAppendElement(NULL, subobj, masterPtr->format);
	488	if (modelPtr->format) {
	489	Tcl_ListObjAppendElement(NULL, subobj, modelPtr->format);
490	490	} else {
491	491	Tcl_AppendStringsToObj(subobj, " {}", NULL);
492	492	}

501	501	length = objv[2]->length;
502	502	if (length > 1 && !strncmp(arg, "-data", length)) {
503	503	Tcl_AppendResult(interp, "-data {} {} {}", NULL);
504		if (masterPtr->dataString) {
	504	if (modelPtr->dataString) {
505	505	/*
506	506	* TODO: Modifying result is bad!
507	507	*/
508	508
509	509	Tcl_ListObjAppendElement(NULL, Tcl_GetObjResult(interp),
510		masterPtr->dataString);
	510	modelPtr->dataString);
511	511	} else {
512	512	Tcl_AppendResult(interp, " {}", NULL);
513	513	}

515	515	} else if (length > 1 &&
516	516	!strncmp(arg, "-format", length)) {
517	517	Tcl_AppendResult(interp, "-format {} {} {}", NULL);
518		if (masterPtr->format) {
	518	if (modelPtr->format) {
519	519	/*
520	520	* TODO: Modifying result is bad!
521	521	*/
522	522
523	523	Tcl_ListObjAppendElement(NULL, Tcl_GetObjResult(interp),
524		masterPtr->format);
	524	modelPtr->format);
525	525	} else {
526	526	Tcl_AppendResult(interp, " {}", NULL);
527	527	}
528	528	return TCL_OK;
529	529	} else {
530	530	return Tk_ConfigureInfo(interp, Tk_MainWindow(interp),
531		configSpecs, (char *) masterPtr, arg, 0);
	531	configSpecs, (char *) modelPtr, arg, 0);
532	532	}
533	533	} else {
534		return ImgPhotoConfigureMaster(interp, masterPtr, objc-2, objv+2,
	534	return ImgPhotoConfigureModel(interp, modelPtr, objc-2, objv+2,
535	535	TK_CONFIG_ARGV_ONLY);
536	536	}
537	537

590	590	* has a simple alpha channel.
591	591	*/
592	592
593		if (!(((PhotoMaster *) srcHandle)->flags & COMPLEX_ALPHA)) {
	593	if (!(((PhotoModel *) srcHandle)->flags & COMPLEX_ALPHA)) {
594	594	options.compositingRule \|= SOURCE_IS_SIMPLE_ALPHA_PHOTO;
595	595	}
596	596

634	634	+ options.fromY * block.pitch;
635	635	block.width = options.fromX2 - options.fromX;
636	636	block.height = options.fromY2 - options.fromY;
637		result = Tk_PhotoPutZoomedBlock(interp, (Tk_PhotoHandle) masterPtr,
	637	result = Tk_PhotoPutZoomedBlock(interp, (Tk_PhotoHandle) modelPtr,
638	638	&block, options.toX, options.toY, options.toX2 - options.toX,
639	639	options.toY2 - options.toY, options.zoomX, options.zoomY,
640	640	options.subsampleX, options.subsampleY,

648	648	*/
649	649
650	650	if (options.options & OPT_SHRINK) {
651		if (ImgPhotoSetSize(masterPtr, options.toX2,
	651	if (ImgPhotoSetSize(modelPtr, options.toX2,
652	652	options.toY2) != TCL_OK) {
653	653	if (options.background) {
654	654	Tk_FreeColor(options.background);

659	659	return TCL_ERROR;
660	660	}
661	661	}
662		Tk_ImageChanged(masterPtr->tkMaster, 0, 0, 0, 0,
663		masterPtr->width, masterPtr->height);
	662	Tk_ImageChanged(modelPtr->tkMaster, 0, 0, 0, 0,
	663	modelPtr->width, modelPtr->height);
664	664	if (options.background) {
665	665	Tk_FreeColor(options.background);
666	666	}

690	690	Tcl_WrongNumArgs(interp, 2, objv, "?-option value ...?");
691	691	return TCL_ERROR;
692	692	}
693		if ((options.fromX > masterPtr->width)
694		\|\| (options.fromY > masterPtr->height)
695		\|\| (options.fromX2 > masterPtr->width)
696		\|\| (options.fromY2 > masterPtr->height)) {
	693	if ((options.fromX > modelPtr->width)
	694	\|\| (options.fromY > modelPtr->height)
	695	\|\| (options.fromX2 > modelPtr->width)
	696	\|\| (options.fromY2 > modelPtr->height)) {
697	697	Tcl_SetObjResult(interp, Tcl_NewStringObj(
698	698	"coordinates for -from option extend outside image", -1));
699	699	Tcl_SetErrorCode(interp, "TK", "IMAGE", "PHOTO", "BAD_FROM", NULL);

705	705	*/
706	706
707	707	if (!(options.options & OPT_FROM) \|\| (options.fromX2 < 0)) {
708		options.fromX2 = masterPtr->width;
709		options.fromY2 = masterPtr->height;
	708	options.fromX2 = modelPtr->width;
	709	options.fromY2 = modelPtr->height;
710	710	}
711	711
712	712	/*

758	758	* Call the handler's string write function to write out the image.
759	759	*/
760	760
761		data = ImgGetPhoto(masterPtr, &block, &options);
	761	data = ImgGetPhoto(modelPtr, &block, &options);
762	762
763	763	if (oldformat) {
764	764	Tcl_DString buffer;

767	767	Tk_PhotoImageBlock *blockPtr);
768	768
769	769	Tcl_DStringInit(&buffer);
770		result = ((OldStringWriteProc) stringWriteProc)(interp, &buffer,
	770	result = ((OldStringWriteProc)(void *)stringWriteProc)(interp, &buffer,
771	771	Tcl_GetString(options.format), &block);
772	772	if (result == TCL_OK) {
773	773	Tcl_DStringResult(interp, &buffer);

779	779	Tcl_Obj formatString, Tk_PhotoImageBlock blockPtr,
780	780	void *dummy);
781	781
782		result = ((NewStringWriteProc) stringWriteProc)(interp,
	782	result = ((NewStringWriteProc)(void *)stringWriteProc)(interp,
783	783	options.format, &block, NULL);
784	784	}
785	785	if (options.background) {

806	806	\|\| (Tcl_GetIntFromObj(interp, objv[3], &y) != TCL_OK)) {
807	807	return TCL_ERROR;
808	808	}
809		if ((x < 0) \|\| (x >= masterPtr->width)
810		\|\| (y < 0) \|\| (y >= masterPtr->height)) {
	809	if ((x < 0) \|\| (x >= modelPtr->width)
	810	\|\| (y < 0) \|\| (y >= modelPtr->height)) {
811	811	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
812	812	"%s get: coordinates out of range",
813	813	Tcl_GetString(objv[0])));

817	817	}
818	818
819	819	/*
820		* Extract the value of the desired pixel and format it as a string.
821		*/
822
823		pixelPtr = masterPtr->pix32 + (y * masterPtr->width + x) * 4;
	820	* Extract the value of the desired pixel and format it as a list.
	821	*/
	822
	823	pixelPtr = modelPtr->pix32 + (y * modelPtr->width + x) * 4;
824	824	channels[0] = Tcl_NewIntObj(pixelPtr[0]);
825	825	channels[1] = Tcl_NewIntObj(pixelPtr[1]);
826	826	channels[2] = Tcl_NewIntObj(pixelPtr[2]);

869	869	data = (Tcl_Obj *) Tcl_GetString(data);
870	870	}
871	871	if (imageFormat->stringReadProc(interp, data, format,
872		(Tk_PhotoHandle) masterPtr, options.toX, options.toY,
	872	(Tk_PhotoHandle) modelPtr, options.toX, options.toY,
873	873	imageWidth, imageHeight, 0, 0) != TCL_OK) {
874	874	return TCL_ERROR;
875	875	}
876		masterPtr->flags \|= IMAGE_CHANGED;
	876	modelPtr->flags \|= IMAGE_CHANGED;
877	877	return TCL_OK;
878	878	}
879	879	if (options.options & OPT_FORMAT) {

1006	1006	block.offset[1] = 1;
1007	1007	block.offset[2] = 2;
1008	1008	block.offset[3] = 0;
1009		result = Tk_PhotoPutBlock(interp, masterPtr, &block,
	1009	result = Tk_PhotoPutBlock(interp, modelPtr, &block,
1010	1010	options.toX, options.toY, options.toX2 - options.toX,
1011	1011	options.toY2 - options.toY,
1012	1012	TK_PHOTO_COMPOSITE_SET);

1099	1099	*/
1100	1100
1101	1101	if (options.options & OPT_SHRINK) {
1102		if (ImgPhotoSetSize(masterPtr, options.toX + width,
	1102	if (ImgPhotoSetSize(modelPtr, options.toX + width,
1103	1103	options.toY + height) != TCL_OK) {
1104	1104	Tcl_ResetResult(interp);
1105	1105	Tcl_SetObjResult(interp, Tcl_NewStringObj(
1106	1106	TK_PHOTO_ALLOC_FAILURE_MESSAGE, -1));
1107	1107	Tcl_SetErrorCode(interp, "TK", "MALLOC", NULL);
	1108	Tcl_Close(NULL, chan);
1108	1109	return TCL_ERROR;
1109	1110	}
1110	1111	}

1120	1121	}
1121	1122	result = imageFormat->fileReadProc(interp, chan,
1122	1123	Tcl_GetString(options.name),
1123		format, (Tk_PhotoHandle) masterPtr, options.toX,
	1124	format, (Tk_PhotoHandle) modelPtr, options.toX,
1124	1125	options.toY, width, height, options.fromX, options.fromY);
1125	1126	if (chan != NULL) {
1126	1127	Tcl_Close(NULL, chan);

1139	1140	* present.
1140	1141	*/
1141	1142
1142		x = masterPtr->ditherX;
1143		y = masterPtr->ditherY;
1144		if (masterPtr->ditherX != 0) {
1145		Tk_DitherPhoto((Tk_PhotoHandle) masterPtr, x, y,
1146		masterPtr->width - x, 1);
1147		}
1148		if (masterPtr->ditherY < masterPtr->height) {
	1143	x = modelPtr->ditherX;
	1144	y = modelPtr->ditherY;
	1145	if (modelPtr->ditherX != 0) {
	1146	Tk_DitherPhoto((Tk_PhotoHandle) modelPtr, x, y,
	1147	modelPtr->width - x, 1);
	1148	}
	1149	if (modelPtr->ditherY < modelPtr->height) {
1149	1150	x = 0;
1150		Tk_DitherPhoto((Tk_PhotoHandle)masterPtr, 0,
1151		masterPtr->ditherY, masterPtr->width,
1152		masterPtr->height - masterPtr->ditherY);
1153		}
1154
1155		if (y < masterPtr->height) {
	1151	Tk_DitherPhoto((Tk_PhotoHandle)modelPtr, 0,
	1152	modelPtr->ditherY, modelPtr->width,
	1153	modelPtr->height - modelPtr->ditherY);
	1154	}
	1155
	1156	if (y < modelPtr->height) {
1156	1157	/*
1157	1158	* Tell the core image code that part of the image has changed.
1158	1159	*/
1159	1160
1160		Tk_ImageChanged(masterPtr->tkMaster, x, y,
1161		(masterPtr->width - x), (masterPtr->height - y),
1162		masterPtr->width, masterPtr->height);
	1161	Tk_ImageChanged(modelPtr->tkMaster, x, y,
	1162	(modelPtr->width - x), (modelPtr->height - y),
	1163	modelPtr->width, modelPtr->height);
1163	1164	}
1164	1165	return TCL_OK;
1165	1166

1193	1194	\|\| (Tcl_GetIntFromObj(interp, objv[4], &y) != TCL_OK)) {
1194	1195	return TCL_ERROR;
1195	1196	}
1196		if ((x < 0) \|\| (x >= masterPtr->width)
1197		\|\| (y < 0) \|\| (y >= masterPtr->height)) {
	1197	if ((x < 0) \|\| (x >= modelPtr->width)
	1198	\|\| (y < 0) \|\| (y >= modelPtr->height)) {
1198	1199	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
1199	1200	"%s transparency get: coordinates out of range",
1200	1201	Tcl_GetString(objv[0])));

1210	1211	/* What a way to do a test! */
1211	1212	testRegion = TkCreateRegion();
1212	1213	TkUnionRectWithRegion(&testBox, testRegion, testRegion);
1213		TkIntersectRegion(testRegion, masterPtr->validRegion, testRegion);
	1214	TkIntersectRegion(testRegion, modelPtr->validRegion, testRegion);
1214	1215	TkClipBox(testRegion, &testBox);
1215	1216	TkDestroyRegion(testRegion);
1216	1217

1233	1234	&transFlag) != TCL_OK)) {
1234	1235	return TCL_ERROR;
1235	1236	}
1236		if ((x < 0) \|\| (x >= masterPtr->width)
1237		\|\| (y < 0) \|\| (y >= masterPtr->height)) {
	1237	if ((x < 0) \|\| (x >= modelPtr->width)
	1238	\|\| (y < 0) \|\| (y >= modelPtr->height)) {
1238	1239	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
1239	1240	"%s transparency set: coordinates out of range",
1240	1241	Tcl_GetString(objv[0])));

1247	1248	setBox.y = y;
1248	1249	setBox.width = 1;
1249	1250	setBox.height = 1;
1250		pixelPtr = masterPtr->pix32 + (y * masterPtr->width + x) * 4;
	1251	pixelPtr = modelPtr->pix32 + (y * modelPtr->width + x) * 4;
1251	1252
1252	1253	if (transFlag) {
1253	1254	/*

1257	1258	TkRegion clearRegion = TkCreateRegion();
1258	1259
1259	1260	TkUnionRectWithRegion(&setBox, clearRegion, clearRegion);
1260		TkSubtractRegion(masterPtr->validRegion, clearRegion,
1261		masterPtr->validRegion);
	1261	TkSubtractRegion(modelPtr->validRegion, clearRegion,
	1262	modelPtr->validRegion);
1262	1263	TkDestroyRegion(clearRegion);
1263	1264
1264	1265	/*

1271	1272	* Make pixel opaque.
1272	1273	*/
1273	1274
1274		TkUnionRectWithRegion(&setBox, masterPtr->validRegion,
1275		masterPtr->validRegion);
	1275	TkUnionRectWithRegion(&setBox, modelPtr->validRegion,
	1276	modelPtr->validRegion);
1276	1277	pixelPtr[3] = 255;
1277	1278	}
1278	1279

1281	1282	* has (potentially) changed.
1282	1283	*/
1283	1284
1284		Tk_ImageChanged(masterPtr->tkMaster, x, y, 1, 1,
1285		masterPtr->width, masterPtr->height);
1286		masterPtr->flags &= ~IMAGE_CHANGED;
	1285	Tk_ImageChanged(modelPtr->tkMaster, x, y, 1, 1,
	1286	modelPtr->width, modelPtr->height);
	1287	modelPtr->flags &= ~IMAGE_CHANGED;
1287	1288	return TCL_OK;
1288	1289	}
1289	1290

1325	1326	Tcl_WrongNumArgs(interp, 2, objv, "fileName ?-option value ...?");
1326	1327	return TCL_ERROR;
1327	1328	}
1328		if ((options.fromX > masterPtr->width)
1329		\|\| (options.fromY > masterPtr->height)
1330		\|\| (options.fromX2 > masterPtr->width)
1331		\|\| (options.fromY2 > masterPtr->height)) {
	1329	if ((options.fromX > modelPtr->width)
	1330	\|\| (options.fromY > modelPtr->height)
	1331	\|\| (options.fromX2 > modelPtr->width)
	1332	\|\| (options.fromY2 > modelPtr->height)) {
1332	1333	Tcl_SetObjResult(interp, Tcl_NewStringObj(
1333	1334	"coordinates for -from option extend outside image", -1));
1334	1335	Tcl_SetErrorCode(interp, "TK", "IMAGE", "PHOTO", "BAD_FROM", NULL);

1342	1343	*/
1343	1344
1344	1345	if (!(options.options & OPT_FROM) \|\| (options.fromX2 < 0)) {
1345		options.fromX2 = masterPtr->width;
1346		options.fromY2 = masterPtr->height;
	1346	options.fromX2 = modelPtr->width;
	1347	options.fromY2 = modelPtr->height;
1347	1348	}
1348	1349	if (options.format == NULL) {
1349	1350	fmtString = GetExtension(Tcl_GetString(options.name));

1418	1419	* Call the handler's file write function to write out the image.
1419	1420	*/
1420	1421
1421		data = ImgGetPhoto(masterPtr, &block, &options);
	1422	data = ImgGetPhoto(modelPtr, &block, &options);
1422	1423	format = options.format;
1423	1424	if (oldformat && format) {
1424	1425	format = (Tcl_Obj *) Tcl_GetString(options.format);

1757	1758	/*
1758	1759	*----------------------------------------------------------------------
1759	1760	*
1760		* ImgPhotoConfigureMaster --
	1761	* ImgPhotoConfigureModel --
1761	1762	*
1762	1763	* This function is called when a photo image is created or reconfigured.
1763	1764	* It processes configuration options and resets any instances of the

1765	1766	*
1766	1767	* Results:
1767	1768	* A standard Tcl return value. If TCL_ERROR is returned then an error
1768		* message is left in the masterPtr->interp's result.
	1769	* message is left in the modelPtr->interp's result.
1769	1770	*
1770	1771	* Side effects:
1771	1772	* Existing instances of the image will be redisplayed to match the new

1775	1776	*/
1776	1777
1777	1778	static int
1778		ImgPhotoConfigureMaster(
	1779	ImgPhotoConfigureModel(
1779	1780	Tcl_Interp interp, / Interpreter to use for reporting errors. */
1780		PhotoMaster masterPtr, / Pointer to data structure describing
	1781	PhotoModel modelPtr, / Pointer to data structure describing
1781	1782	* overall photo image to (re)configure. */
1782	1783	int objc, /* Number of entries in objv. */
1783	1784	Tcl_Obj const objv[], / Pairs of configuration options for image. */

1795	1796	Tk_PhotoImageFormat *imageFormat;
1796	1797	const char **args;
1797	1798
1798		args = ckalloc((objc + 1) * sizeof(char *));
	1799	args = (const char *)ckalloc((objc + 1) sizeof(char *));
1799	1800	for (i = 0, j = 0; i < objc; i++,j++) {
1800	1801	args[j] = Tcl_GetString(objv[i]);
1801	1802	length = objv[i]->length;

1837	1838	* the format string influences how "-data" or "-file" is interpreted.
1838	1839	*/
1839	1840
1840		oldFileString = masterPtr->fileString;
	1841	oldFileString = modelPtr->fileString;
1841	1842	if (oldFileString == NULL) {
1842		oldData = masterPtr->dataString;
	1843	oldData = modelPtr->dataString;
1843	1844	if (oldData != NULL) {
1844	1845	Tcl_IncrRefCount(oldData);
1845	1846	}
1846	1847	} else {
1847	1848	oldData = NULL;
1848	1849	}
1849		oldFormat = masterPtr->format;
	1850	oldFormat = modelPtr->format;
1850	1851	if (oldFormat != NULL) {
1851	1852	Tcl_IncrRefCount(oldFormat);
1852	1853	}
1853		oldPaletteString = masterPtr->palette;
1854		oldGamma = masterPtr->gamma;
	1854	oldPaletteString = modelPtr->palette;
	1855	oldGamma = modelPtr->gamma;
1855	1856
1856	1857	/*
1857	1858	* Process the configuration options specified.
1858	1859	*/
1859	1860
1860	1861	if (Tk_ConfigureWidget(interp, Tk_MainWindow(interp), configSpecs,
1861		j, args, (char *) masterPtr, flags) != TCL_OK) {
	1862	j, args, (char *) modelPtr, flags) != TCL_OK) {
1862	1863	ckfree(args);
1863	1864	goto errorExit;
1864	1865	}

1868	1869	* Regard the empty string for -file, -data or -format as the null value.
1869	1870	*/
1870	1871
1871		if ((masterPtr->fileString != NULL) && (masterPtr->fileString[0] == 0)) {
1872		ckfree(masterPtr->fileString);
1873		masterPtr->fileString = NULL;
	1872	if ((modelPtr->fileString != NULL) && (modelPtr->fileString[0] == 0)) {
	1873	ckfree(modelPtr->fileString);
	1874	modelPtr->fileString = NULL;
1874	1875	}
1875	1876	if (data) {
1876	1877	/*

1885	1886	} else {
1886	1887	data = NULL;
1887	1888	}
1888		if (masterPtr->dataString) {
1889		Tcl_DecrRefCount(masterPtr->dataString);
1890		}
1891		masterPtr->dataString = data;
	1889	if (modelPtr->dataString) {
	1890	Tcl_DecrRefCount(modelPtr->dataString);
	1891	}
	1892	modelPtr->dataString = data;
1892	1893	}
1893	1894	if (format) {
1894	1895	/*

1902	1903	} else {
1903	1904	format = NULL;
1904	1905	}
1905		if (masterPtr->format) {
1906		Tcl_DecrRefCount(masterPtr->format);
1907		}
1908		masterPtr->format = format;
	1906	if (modelPtr->format) {
	1907	Tcl_DecrRefCount(modelPtr->format);
	1908	}
	1909	modelPtr->format = format;
1909	1910	}
1910	1911	/*
1911	1912	* Set the image to the user-requested size, if any, and make sure storage
1912	1913	* is correctly allocated for this image.
1913	1914	*/
1914	1915
1915		if (ImgPhotoSetSize(masterPtr, masterPtr->width,
1916		masterPtr->height) != TCL_OK) {
	1916	if (ImgPhotoSetSize(modelPtr, modelPtr->width,
	1917	modelPtr->height) != TCL_OK) {
1917	1918	Tcl_SetObjResult(interp, Tcl_NewStringObj(
1918	1919	TK_PHOTO_ALLOC_FAILURE_MESSAGE, -1));
1919	1920	Tcl_SetErrorCode(interp, "TK", "MALLOC", NULL);

1925	1926	* -file or -data option.
1926	1927	*/
1927	1928
1928		if ((masterPtr->fileString != NULL)
1929		&& ((masterPtr->fileString != oldFileString)
1930		\|\| (masterPtr->format != oldFormat))) {
	1929	if ((modelPtr->fileString != NULL)
	1930	&& ((modelPtr->fileString != oldFileString)
	1931	\|\| (modelPtr->format != oldFormat))) {
1931	1932	/*
1932	1933	* Prevent file system access in a safe interpreter.
1933	1934	*/

1941	1942	goto errorExit;
1942	1943	}
1943	1944
1944		chan = Tcl_OpenFileChannel(interp, masterPtr->fileString, "r", 0);
	1945	chan = Tcl_OpenFileChannel(interp, modelPtr->fileString, "r", 0);
1945	1946	if (chan == NULL) {
1946	1947	goto errorExit;
1947	1948	}

1952	1953
1953	1954	if ((Tcl_SetChannelOption(interp, chan,
1954	1955	"-translation", "binary") != TCL_OK) \|\|
1955		(MatchFileFormat(interp, chan, masterPtr->fileString,
1956		masterPtr->format, &imageFormat, &imageWidth,
	1956	(MatchFileFormat(interp, chan, modelPtr->fileString,
	1957	modelPtr->format, &imageFormat, &imageWidth,
1957	1958	&imageHeight, &oldformat) != TCL_OK)) {
1958	1959	Tcl_Close(NULL, chan);
1959	1960	goto errorExit;
1960	1961	}
1961		result = ImgPhotoSetSize(masterPtr, imageWidth, imageHeight);
	1962	result = ImgPhotoSetSize(modelPtr, imageWidth, imageHeight);
1962	1963	if (result != TCL_OK) {
1963	1964	Tcl_Close(NULL, chan);
1964	1965	Tcl_SetObjResult(interp, Tcl_NewStringObj(

1966	1967	Tcl_SetErrorCode(interp, "TK", "MALLOC", NULL);
1967	1968	goto errorExit;
1968	1969	}
1969		tempformat = masterPtr->format;
	1970	tempformat = modelPtr->format;
1970	1971	if (oldformat && tempformat) {
1971	1972	tempformat = (Tcl_Obj *) Tcl_GetString(tempformat);
1972	1973	}
1973	1974	result = imageFormat->fileReadProc(interp, chan,
1974		masterPtr->fileString, tempformat, (Tk_PhotoHandle) masterPtr,
	1975	modelPtr->fileString, tempformat, (Tk_PhotoHandle) modelPtr,
1975	1976	0, 0, imageWidth, imageHeight, 0, 0);
1976	1977	Tcl_Close(NULL, chan);
1977	1978	if (result != TCL_OK) {

1979	1980	}
1980	1981
1981	1982	Tcl_ResetResult(interp);
1982		masterPtr->flags \|= IMAGE_CHANGED;
1983		}
1984
1985		if ((masterPtr->fileString == NULL) && (masterPtr->dataString != NULL)
1986		&& ((masterPtr->dataString != oldData)
1987		\|\| (masterPtr->format != oldFormat))) {
1988
1989		if (MatchStringFormat(interp, masterPtr->dataString,
1990		masterPtr->format, &imageFormat, &imageWidth,
	1983	modelPtr->flags \|= IMAGE_CHANGED;
	1984	}
	1985
	1986	if ((modelPtr->fileString == NULL) && (modelPtr->dataString != NULL)
	1987	&& ((modelPtr->dataString != oldData)
	1988	\|\| (modelPtr->format != oldFormat))) {
	1989
	1990	if (MatchStringFormat(interp, modelPtr->dataString,
	1991	modelPtr->format, &imageFormat, &imageWidth,
1991	1992	&imageHeight, &oldformat) != TCL_OK) {
1992	1993	goto errorExit;
1993	1994	}
1994		if (ImgPhotoSetSize(masterPtr, imageWidth, imageHeight) != TCL_OK) {
	1995	if (ImgPhotoSetSize(modelPtr, imageWidth, imageHeight) != TCL_OK) {
1995	1996	Tcl_SetObjResult(interp, Tcl_NewStringObj(
1996	1997	TK_PHOTO_ALLOC_FAILURE_MESSAGE, -1));
1997	1998	Tcl_SetErrorCode(interp, "TK", "MALLOC", NULL);
1998	1999	goto errorExit;
1999	2000	}
2000		tempformat = masterPtr->format;
2001		tempdata = masterPtr->dataString;
	2001	tempformat = modelPtr->format;
	2002	tempdata = modelPtr->dataString;
2002	2003	if (oldformat) {
2003	2004	if (tempformat) {
2004	2005	tempformat = (Tcl_Obj *) Tcl_GetString(tempformat);

2006	2007	tempdata = (Tcl_Obj *) Tcl_GetString(tempdata);
2007	2008	}
2008	2009	if (imageFormat->stringReadProc(interp, tempdata, tempformat,
2009		(Tk_PhotoHandle) masterPtr, 0, 0, imageWidth, imageHeight,
	2010	(Tk_PhotoHandle) modelPtr, 0, 0, imageWidth, imageHeight,
2010	2011	0, 0) != TCL_OK) {
2011	2012	goto errorExit;
2012	2013	}
2013	2014
2014	2015	Tcl_ResetResult(interp);
2015		masterPtr->flags \|= IMAGE_CHANGED;
	2016	modelPtr->flags \|= IMAGE_CHANGED;
2016	2017	}
2017	2018
2018	2019	/*
2019	2020	* Enforce a reasonable value for gamma.
2020	2021	*/
2021	2022
2022		if (masterPtr->gamma <= 0) {
2023		masterPtr->gamma = 1.0;
2024		}
2025
2026		if ((masterPtr->gamma != oldGamma)
2027		\|\| (masterPtr->palette != oldPaletteString)) {
2028		masterPtr->flags \|= IMAGE_CHANGED;
	2023	if (modelPtr->gamma <= 0) {
	2024	modelPtr->gamma = 1.0;
	2025	}
	2026
	2027	if ((modelPtr->gamma != oldGamma)
	2028	\|\| (modelPtr->palette != oldPaletteString)) {
	2029	modelPtr->flags \|= IMAGE_CHANGED;
2029	2030	}
2030	2031
2031	2032	/*

2034	2035	* everywhere that it is used.
2035	2036	*/
2036	2037
2037		for (instancePtr = masterPtr->instancePtr; instancePtr != NULL;
	2038	for (instancePtr = modelPtr->instancePtr; instancePtr != NULL;
2038	2039	instancePtr = instancePtr->nextPtr) {
2039	2040	TkImgPhotoConfigureInstance(instancePtr);
2040	2041	}

2043	2044	* Inform the generic image code that the image has (potentially) changed.
2044	2045	*/
2045	2046
2046		Tk_ImageChanged(masterPtr->tkMaster, 0, 0, masterPtr->width,
2047		masterPtr->height, masterPtr->width, masterPtr->height);
2048		masterPtr->flags &= ~IMAGE_CHANGED;
	2047	Tk_ImageChanged(modelPtr->tkMaster, 0, 0, modelPtr->width,
	2048	modelPtr->height, modelPtr->width, modelPtr->height);
	2049	modelPtr->flags &= ~IMAGE_CHANGED;
2049	2050
2050	2051	if (oldData != NULL) {
2051	2052	Tcl_DecrRefCount(oldData);

2054	2055	Tcl_DecrRefCount(oldFormat);
2055	2056	}
2056	2057
2057		ToggleComplexAlphaIfNeeded(masterPtr);
	2058	ToggleComplexAlphaIfNeeded(modelPtr);
2058	2059
2059	2060	return TCL_OK;
2060	2061

2081	2082	* None.
2082	2083	*
2083	2084	* Side effects:
2084		* (Re)sets COMPLEX_ALPHA flag of master.
	2085	* (Re)sets COMPLEX_ALPHA flag of model.
2085	2086	*
2086	2087	*----------------------------------------------------------------------
2087	2088	*/
2088	2089
2089	2090	static int
2090	2091	ToggleComplexAlphaIfNeeded(
2091		PhotoMaster *mPtr)
	2092	PhotoModel *mPtr)
2092	2093	{
2093	2094	size_t len = (size_t)MAX(mPtr->userWidth, mPtr->width) *
2094	2095	(size_t)MAX(mPtr->userHeight, mPtr->height) * 4;

2119	2120	*
2120	2121	* ImgPhotoDelete --
2121	2122	*
2122		* This function is called by the image code to delete the master
	2123	* This function is called by the image code to delete the model
2123	2124	* structure for an image.
2124	2125	*
2125	2126	* Results:

2133	2134
2134	2135	static void
2135	2136	ImgPhotoDelete(
2136		ClientData masterData) /* Pointer to PhotoMaster structure for image.
	2137	ClientData modelData) /* Pointer to PhotoModel structure for image.
2137	2138	* Must not have any more instances. */
2138	2139	{
2139		PhotoMaster *masterPtr = masterData;
	2140	PhotoModel modelPtr = (PhotoModel )modelData;
2140	2141	PhotoInstance *instancePtr;
2141	2142
2142		while ((instancePtr = masterPtr->instancePtr) != NULL) {
	2143	while ((instancePtr = modelPtr->instancePtr) != NULL) {
2143	2144	if (instancePtr->refCount > 0) {
2144	2145	Tcl_Panic("tried to delete photo image when instances still exist");
2145	2146	}
2146	2147	Tcl_CancelIdleCall(TkImgDisposeInstance, instancePtr);
2147	2148	TkImgDisposeInstance(instancePtr);
2148	2149	}
2149		masterPtr->tkMaster = NULL;
2150		if (masterPtr->imageCmd != NULL) {
2151		Tcl_DeleteCommandFromToken(masterPtr->interp, masterPtr->imageCmd);
2152		}
2153		if (masterPtr->pix32 != NULL) {
2154		ckfree(masterPtr->pix32);
2155		}
2156		if (masterPtr->validRegion != NULL) {
2157		TkDestroyRegion(masterPtr->validRegion);
2158		}
2159		if (masterPtr->dataString != NULL) {
2160		Tcl_DecrRefCount(masterPtr->dataString);
2161		}
2162		if (masterPtr->format != NULL) {
2163		Tcl_DecrRefCount(masterPtr->format);
2164		}
2165		Tk_FreeOptions(configSpecs, (char *) masterPtr, NULL, 0);
2166		ckfree(masterPtr);
	2150	modelPtr->tkMaster = NULL;
	2151	if (modelPtr->imageCmd != NULL) {
	2152	Tcl_DeleteCommandFromToken(modelPtr->interp, modelPtr->imageCmd);
	2153	}
	2154	if (modelPtr->pix32 != NULL) {
	2155	ckfree(modelPtr->pix32);
	2156	}
	2157	if (modelPtr->validRegion != NULL) {
	2158	TkDestroyRegion(modelPtr->validRegion);
	2159	}
	2160	if (modelPtr->dataString != NULL) {
	2161	Tcl_DecrRefCount(modelPtr->dataString);
	2162	}
	2163	if (modelPtr->format != NULL) {
	2164	Tcl_DecrRefCount(modelPtr->format);
	2165	}
	2166	Tk_FreeOptions(configSpecs, (char *) modelPtr, NULL, 0);
	2167	ckfree(modelPtr);
2167	2168	}
2168	2169
2169	2170	/*

2185	2186
2186	2187	static void
2187	2188	ImgPhotoCmdDeletedProc(
2188		ClientData clientData) /* Pointer to PhotoMaster structure for
	2189	ClientData clientData) /* Pointer to PhotoModel structure for
2189	2190	* image. */
2190	2191	{
2191		PhotoMaster *masterPtr = clientData;
2192
2193		masterPtr->imageCmd = NULL;
2194		if (masterPtr->tkMaster != NULL) {
2195		Tk_DeleteImage(masterPtr->interp, Tk_NameOfImage(masterPtr->tkMaster));
	2192	PhotoModel modelPtr = (PhotoModel )clientData;
	2193
	2194	modelPtr->imageCmd = NULL;
	2195	if (modelPtr->tkMaster != NULL) {
	2196	Tk_DeleteImage(modelPtr->interp, Tk_NameOfImage(modelPtr->tkMaster));
2196	2197	}
2197	2198	}
2198	2199

2210	2211	* with memory allocation.)
2211	2212	*
2212	2213	* Side effects:
2213		* Storage gets reallocated, for the master and all its instances.
	2214	* Storage gets reallocated, for the model and all its instances.
2214	2215	*
2215	2216	*----------------------------------------------------------------------
2216	2217	*/
2217	2218
2218	2219	static int
2219	2220	ImgPhotoSetSize(
2220		PhotoMaster *masterPtr,
	2221	PhotoModel *modelPtr,
2221	2222	int width, int height)
2222	2223	{
2223	2224	unsigned char *newPix32 = NULL;

2227	2228	TkRegion clipRegion;
2228	2229	PhotoInstance *instancePtr;
2229	2230
2230		if (masterPtr->userWidth > 0) {
2231		width = masterPtr->userWidth;
2232		}
2233		if (masterPtr->userHeight > 0) {
2234		height = masterPtr->userHeight;
	2231	if (modelPtr->userWidth > 0) {
	2232	width = modelPtr->userWidth;
	2233	}
	2234	if (modelPtr->userHeight > 0) {
	2235	height = modelPtr->userHeight;
2235	2236	}
2236	2237
2237	2238	if (width > INT_MAX / 4) {

2245	2246	* failures will leave the photo unchanged.
2246	2247	*/
2247	2248
2248		if ((width != masterPtr->width) \|\| (height != masterPtr->height)
2249		\|\| (masterPtr->pix32 == NULL)) {
	2249	if ((width != modelPtr->width) \|\| (height != modelPtr->height)
	2250	\|\| (modelPtr->pix32 == NULL)) {
2250	2251	unsigned newPixSize;
2251	2252
2252	2253	if (pitch && height > (int)(UINT_MAX / pitch)) {

2261	2262	if (newPixSize == 0) {
2262	2263	newPix32 = NULL;
2263	2264	} else {
2264		newPix32 = attemptckalloc(newPixSize);
	2265	newPix32 = (unsigned char *)attemptckalloc(newPixSize);
2265	2266	if (newPix32 == NULL) {
2266	2267	return TCL_ERROR;
2267	2268	}

2273	2274	* image size.
2274	2275	*/
2275	2276
2276		TkClipBox(masterPtr->validRegion, &validBox);
	2277	TkClipBox(modelPtr->validRegion, &validBox);
2277	2278	if ((validBox.x + validBox.width > width)
2278	2279	\|\| (validBox.y + validBox.height > height)) {
2279	2280	clipBox.x = 0;

2282	2283	clipBox.height = height;
2283	2284	clipRegion = TkCreateRegion();
2284	2285	TkUnionRectWithRegion(&clipBox, clipRegion, clipRegion);
2285		TkIntersectRegion(masterPtr->validRegion, clipRegion,
2286		masterPtr->validRegion);
	2286	TkIntersectRegion(modelPtr->validRegion, clipRegion,
	2287	modelPtr->validRegion);
2287	2288	TkDestroyRegion(clipRegion);
2288		TkClipBox(masterPtr->validRegion, &validBox);
	2289	TkClipBox(modelPtr->validRegion, &validBox);
2289	2290	}
2290	2291
2291	2292	/*

2301	2302	* or written to a file.
2302	2303	*/
2303	2304
2304		if ((masterPtr->pix32 != NULL)
2305		&& ((width == masterPtr->width) \|\| (width == validBox.width))) {
	2305	if ((modelPtr->pix32 != NULL)
	2306	&& ((width == modelPtr->width) \|\| (width == validBox.width))) {
2306	2307	if (validBox.y > 0) {
2307	2308	memset(newPix32, 0, ((size_t) validBox.y * pitch));
2308	2309	}

2314	2315	memset(newPix32, 0, ((size_t)height * pitch));
2315	2316	}
2316	2317
2317		if (masterPtr->pix32 != NULL) {
	2318	if (modelPtr->pix32 != NULL) {
2318	2319	/*
2319	2320	* Copy the common area over to the new array array and free the
2320	2321	* old array.
2321	2322	*/
2322	2323
2323		if (width == masterPtr->width) {
	2324	if (width == modelPtr->width) {
2324	2325
2325	2326	/*
2326	2327	* The region to be copied is contiguous.
2327	2328	*/
2328	2329
2329	2330	offset = validBox.y * pitch;
2330		memcpy(newPix32 + offset, masterPtr->pix32 + offset,
	2331	memcpy(newPix32 + offset, modelPtr->pix32 + offset,
2331	2332	((size_t)validBox.height * pitch));
2332	2333
2333	2334	} else if ((validBox.width > 0) && (validBox.height > 0)) {

2336	2337	*/
2337	2338
2338	2339	destPtr = newPix32 + (validBox.y * width + validBox.x) * 4;
2339		srcPtr = masterPtr->pix32 + (validBox.y * masterPtr->width
	2340	srcPtr = modelPtr->pix32 + (validBox.y * modelPtr->width
2340	2341	+ validBox.x) * 4;
2341	2342	for (h = validBox.height; h > 0; h--) {
2342	2343	memcpy(destPtr, srcPtr, ((size_t)validBox.width * 4));
2343	2344	destPtr += width * 4;
2344		srcPtr += masterPtr->width * 4;
	2345	srcPtr += modelPtr->width * 4;
2345	2346	}
2346	2347	}
2347	2348
2348		ckfree(masterPtr->pix32);
2349		}
2350
2351		masterPtr->pix32 = newPix32;
2352		masterPtr->width = width;
2353		masterPtr->height = height;
	2349	ckfree(modelPtr->pix32);
	2350	}
	2351
	2352	modelPtr->pix32 = newPix32;
	2353	modelPtr->width = width;
	2354	modelPtr->height = height;
2354	2355
2355	2356	/*
2356	2357	* Dithering will be correct up to the end of the last pre-existing

2358	2359	*/
2359	2360
2360	2361	if ((validBox.x > 0) \|\| (validBox.y > 0)) {
2361		masterPtr->ditherX = 0;
2362		masterPtr->ditherY = 0;
	2362	modelPtr->ditherX = 0;
	2363	modelPtr->ditherY = 0;
2363	2364	} else if (validBox.width == width) {
2364		if ((int) validBox.height < masterPtr->ditherY) {
2365		masterPtr->ditherX = 0;
2366		masterPtr->ditherY = validBox.height;
2367		}
2368		} else if ((masterPtr->ditherY > 0)
2369		\|\| ((int) validBox.width < masterPtr->ditherX)) {
2370		masterPtr->ditherX = validBox.width;
2371		masterPtr->ditherY = 0;
2372		}
2373		}
2374
2375		ToggleComplexAlphaIfNeeded(masterPtr);
	2365	if ((int) validBox.height < modelPtr->ditherY) {
	2366	modelPtr->ditherX = 0;
	2367	modelPtr->ditherY = validBox.height;
	2368	}
	2369	} else if ((modelPtr->ditherY > 0)
	2370	\|\| ((int) validBox.width < modelPtr->ditherX)) {
	2371	modelPtr->ditherX = validBox.width;
	2372	modelPtr->ditherY = 0;
	2373	}
	2374	}
	2375
	2376	ToggleComplexAlphaIfNeeded(modelPtr);
2376	2377
2377	2378	/*
2378	2379	* Now adjust the sizes of the pixmaps for all of the instances.
2379	2380	*/
2380	2381
2381		for (instancePtr = masterPtr->instancePtr; instancePtr != NULL;
	2382	for (instancePtr = modelPtr->instancePtr; instancePtr != NULL;
2382	2383	instancePtr = instancePtr->nextPtr) {
2383	2384	TkImgPhotoInstanceSetSize(instancePtr);
2384	2385	}

2424	2425	{
2425	2426	int matched = 0, useoldformat = 0;
2426	2427	Tk_PhotoImageFormat *formatPtr;
2427		ThreadSpecificData *tsdPtr =
	2428	ThreadSpecificData tsdPtr = (ThreadSpecificData )
2428	2429	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
2429	2430	const char *formatString = NULL;
2430	2431

2564	2565	{
2565	2566	int matched = 0, useoldformat = 0;
2566	2567	Tk_PhotoImageFormat *formatPtr;
2567		ThreadSpecificData *tsdPtr =
	2568	ThreadSpecificData tsdPtr = (ThreadSpecificData )
2568	2569	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
2569	2570	const char *formatString = NULL;
2570	2571

2657	2658	* Tk_FindPhoto --
2658	2659	*
2659	2660	* This function is called to get an opaque handle (actually a
2660		* PhotoMaster *) for a given image, which can be used in subsequent
	2661	* PhotoModel *) for a given image, which can be used in subsequent
2661	2662	* calls to Tk_PhotoPutBlock, etc. The `name' parameter is the name of
2662	2663	* the image.
2663	2664	*

2722	2723	int compRule) /* Compositing rule to use when processing
2723	2724	* transparent pixels. */
2724	2725	{
2725		register PhotoMaster masterPtr = (PhotoMaster ) handle;
	2726	PhotoModel modelPtr = (PhotoModel ) handle;
2726	2727	Tk_PhotoImageBlock sourceBlock;
2727	2728	unsigned char *memToFree;
2728	2729	int xEnd, yEnd, greenOffset, blueOffset, alphaOffset;

2741	2742
2742	2743	compRule &= ~SOURCE_IS_SIMPLE_ALPHA_PHOTO;
2743	2744
2744		if ((masterPtr->userWidth != 0) && ((x + width) > masterPtr->userWidth)) {
2745		width = masterPtr->userWidth - x;
2746		}
2747		if ((masterPtr->userHeight != 0)
2748		&& ((y + height) > masterPtr->userHeight)) {
2749		height = masterPtr->userHeight - y;
	2745	if ((modelPtr->userWidth != 0) && ((x + width) > modelPtr->userWidth)) {
	2746	width = modelPtr->userWidth - x;
	2747	}
	2748	if ((modelPtr->userHeight != 0)
	2749	&& ((y + height) > modelPtr->userHeight)) {
	2750	height = modelPtr->userHeight - y;
2750	2751	}
2751	2752	if ((width <= 0) \|\| (height <= 0)) {
2752	2753	return TCL_OK;

2767	2768	*/
2768	2769	sourceBlock = *blockPtr;
2769	2770	memToFree = NULL;
2770		if (sourceBlock.pixelPtr >= masterPtr->pix32
2771		&& sourceBlock.pixelPtr <= masterPtr->pix32 + masterPtr->width
2772		* masterPtr->height * 4) {
2773		sourceBlock.pixelPtr = attemptckalloc(sourceBlock.height
2774		* sourceBlock.pitch);
	2771	if (sourceBlock.pixelPtr >= modelPtr->pix32
	2772	&& sourceBlock.pixelPtr <= modelPtr->pix32 + modelPtr->width
	2773	* modelPtr->height * 4) {
	2774	/*
	2775	* Fix 5c51be6411: avoid reading
	2776	*
	2777	* (sourceBlock.pitch - sourceBlock.width * sourceBlock.pixelSize)
	2778	*
	2779	* bytes past the end of modelPtr->pix32[] when
	2780	*
	2781	* blockPtr->pixelPtr > (modelPtr->pix32 +
	2782	* 4 * modelPtr->width * modelPtr->height -
	2783	* sourceBlock.height * sourceBlock.pitch)
	2784	*/
	2785	unsigned int cpyLen = (sourceBlock.height - 1) * sourceBlock.pitch +
	2786	sourceBlock.width * sourceBlock.pixelSize;
	2787
	2788	sourceBlock.pixelPtr = (unsigned char *)attemptckalloc(cpyLen);
2775	2789	if (sourceBlock.pixelPtr == NULL) {
2776	2790	if (interp != NULL) {
2777	2791	Tcl_SetObjResult(interp, Tcl_NewStringObj(

2781	2795	return TCL_ERROR;
2782	2796	}
2783	2797	memToFree = sourceBlock.pixelPtr;
2784		memcpy(sourceBlock.pixelPtr, blockPtr->pixelPtr, sourceBlock.height
2785		* sourceBlock.pitch);
	2798	memcpy(sourceBlock.pixelPtr, blockPtr->pixelPtr, cpyLen);
2786	2799	}
2787	2800
2788	2801
2789	2802	xEnd = x + width;
2790	2803	yEnd = y + height;
2791		if ((xEnd > masterPtr->width) \|\| (yEnd > masterPtr->height)) {
2792		if (ImgPhotoSetSize(masterPtr, MAX(xEnd, masterPtr->width),
2793		MAX(yEnd, masterPtr->height)) == TCL_ERROR) {
	2804	if ((xEnd > modelPtr->width) \|\| (yEnd > modelPtr->height)) {
	2805	if (ImgPhotoSetSize(modelPtr, MAX(xEnd, modelPtr->width),
	2806	MAX(yEnd, modelPtr->height)) == TCL_ERROR) {
2794	2807	if (interp != NULL) {
2795	2808	Tcl_SetObjResult(interp, Tcl_NewStringObj(
2796	2809	TK_PHOTO_ALLOC_FAILURE_MESSAGE, -1));

2800	2813	}
2801	2814	}
2802	2815
2803		if ((y < masterPtr->ditherY) \|\| ((y == masterPtr->ditherY)
2804		&& (x < masterPtr->ditherX))) {
	2816	if ((y < modelPtr->ditherY) \|\| ((y == modelPtr->ditherY)
	2817	&& (x < modelPtr->ditherX))) {
2805	2818	/*
2806	2819	* The dithering isn't correct past the start of this block.
2807	2820	*/
2808	2821
2809		masterPtr->ditherX = x;
2810		masterPtr->ditherY = y;
	2822	modelPtr->ditherX = x;
	2823	modelPtr->ditherY = y;
2811	2824	}
2812	2825
2813	2826	/*

2825	2838	alphaOffset -= sourceBlock.offset[0];
2826	2839	}
2827	2840	if ((greenOffset != 0) \|\| (blueOffset != 0)) {
2828		masterPtr->flags \|= COLOR_IMAGE;
	2841	modelPtr->flags \|= COLOR_IMAGE;
2829	2842	}
2830	2843
2831	2844	/*

2833	2846	* single memmove, we do.
2834	2847	*/
2835	2848
2836		destLinePtr = masterPtr->pix32 + (y * masterPtr->width + x) * 4;
2837		pitch = masterPtr->width * 4;
	2849	destLinePtr = modelPtr->pix32 + (y * modelPtr->width + x) * 4;
	2850	pitch = modelPtr->width * 4;
2838	2851
2839	2852	/*
2840	2853	* Test to see if we can do the whole write in a single copy. This test is

2845	2858	if ((sourceBlock.pixelSize == 4)
2846	2859	&& (greenOffset == 1) && (blueOffset == 2) && (alphaOffset == 3)
2847	2860	&& (width <= sourceBlock.width) && (height <= sourceBlock.height)
2848		&& ((height == 1) \|\| ((x == 0) && (width == masterPtr->width)
	2861	&& ((height == 1) \|\| ((x == 0) && (width == modelPtr->width)
2849	2862	&& (sourceBlock.pitch == pitch)))
2850	2863	&& (compRule == TK_PHOTO_COMPOSITE_SET)) {
2851	2864	memmove(destLinePtr, sourceBlock.pixelPtr + sourceBlock.offset[0],

3027	3040	rect.width = width;
3028	3041	rect.height = height;
3029	3042	TkUnionRectWithRegion(&rect, workRgn, workRgn);
3030		TkSubtractRegion(masterPtr->validRegion, workRgn,
3031		masterPtr->validRegion);
	3043	TkSubtractRegion(modelPtr->validRegion, workRgn,
	3044	modelPtr->validRegion);
3032	3045	TkDestroyRegion(workRgn);
3033	3046	}
3034	3047

3037	3050	* allow for more efficient per-platform implementations. [Bug 919066]
3038	3051	*/
3039	3052
3040		TkpBuildRegionFromAlphaData(masterPtr->validRegion, (unsigned) x,
	3053	TkpBuildRegionFromAlphaData(modelPtr->validRegion, (unsigned) x,
3041	3054	(unsigned) y, (unsigned) width, (unsigned) height,
3042		masterPtr->pix32 + (y * masterPtr->width + x) * 4 + 3,
3043		4, (unsigned) masterPtr->width * 4);
	3055	modelPtr->pix32 + (y * modelPtr->width + x) * 4 + 3,
	3056	4, (unsigned) modelPtr->width * 4);
3044	3057	} else {
3045	3058	rect.x = x;
3046	3059	rect.y = y;
3047	3060	rect.width = width;
3048	3061	rect.height = height;
3049		TkUnionRectWithRegion(&rect, masterPtr->validRegion,
3050		masterPtr->validRegion);
	3062	TkUnionRectWithRegion(&rect, modelPtr->validRegion,
	3063	modelPtr->validRegion);
3051	3064	}
3052	3065
3053	3066	/*

3062	3075	* [Patch 1539990]
3063	3076	*/
3064	3077
3065		if (!(masterPtr->flags & COMPLEX_ALPHA)) {
3066		register int x1;
	3078	if (!(modelPtr->flags & COMPLEX_ALPHA)) {
	3079	int x1;
3067	3080
3068	3081	for (x1=x ; x1<x+width ; x1++) {
3069		register unsigned char newAlpha;
3070
3071		destLinePtr = masterPtr->pix32 + (ymasterPtr->width + x1)4;
	3082	unsigned char newAlpha;
	3083
	3084	destLinePtr = modelPtr->pix32 + (ymodelPtr->width + x1)4;
3072	3085	newAlpha = destLinePtr[3];
3073	3086	if (newAlpha && newAlpha != 255) {
3074		masterPtr->flags \|= COMPLEX_ALPHA;
	3087	modelPtr->flags \|= COMPLEX_ALPHA;
3075	3088	break;
3076	3089	}
3077	3090	}
3078	3091	}
3079		} else if ((alphaOffset != 0) \|\| (masterPtr->flags & COMPLEX_ALPHA)) {
	3092	} else if ((alphaOffset != 0) \|\| (modelPtr->flags & COMPLEX_ALPHA)) {
3080	3093	/*
3081	3094	* Check for partial transparency if alpha pixels are specified, or
3082	3095	* rescan if we already knew such pixels existed. To restrict this

3084	3097	* the alpha pixels are.
3085	3098	*/
3086	3099
3087		ToggleComplexAlphaIfNeeded(masterPtr);
	3100	ToggleComplexAlphaIfNeeded(modelPtr);
3088	3101	}
3089	3102
3090	3103	/*
3091	3104	* Update each instance.
3092	3105	*/
3093	3106
3094		Tk_DitherPhoto((Tk_PhotoHandle)masterPtr, x, y, width, height);
	3107	Tk_DitherPhoto((Tk_PhotoHandle)modelPtr, x, y, width, height);
3095	3108
3096	3109	/*
3097	3110	* Tell the core image code that this image has changed.
3098	3111	*/
3099	3112
3100		Tk_ImageChanged(masterPtr->tkMaster, x, y, width, height,
3101		masterPtr->width, masterPtr->height);
	3113	Tk_ImageChanged(modelPtr->tkMaster, x, y, width, height,
	3114	modelPtr->width, modelPtr->height);
3102	3115
3103	3116	if (memToFree) ckfree(memToFree);
3104	3117

3148	3161	int compRule) /* Compositing rule to use when processing
3149	3162	* transparent pixels. */
3150	3163	{
3151		register PhotoMaster masterPtr = (PhotoMaster ) handle;
3152		register Tk_PhotoImageBlock sourceBlock;
	3164	PhotoModel modelPtr = (PhotoModel ) handle;
	3165	Tk_PhotoImageBlock sourceBlock;
3153	3166	unsigned char *memToFree;
3154	3167	int xEnd, yEnd, greenOffset, blueOffset, alphaOffset;
3155	3168	int wLeft, hLeft, wCopy, hCopy, blockWid, blockHt;

3176	3189	if (zoomX <= 0 \|\| zoomY <= 0) {
3177	3190	return TCL_OK;
3178	3191	}
3179		if ((masterPtr->userWidth != 0) && ((x + width) > masterPtr->userWidth)) {
3180		width = masterPtr->userWidth - x;
3181		}
3182		if ((masterPtr->userHeight != 0)
3183		&& ((y + height) > masterPtr->userHeight)) {
3184		height = masterPtr->userHeight - y;
	3192	if ((modelPtr->userWidth != 0) && ((x + width) > modelPtr->userWidth)) {
	3193	width = modelPtr->userWidth - x;
	3194	}
	3195	if ((modelPtr->userHeight != 0)
	3196	&& ((y + height) > modelPtr->userHeight)) {
	3197	height = modelPtr->userHeight - y;
3185	3198	}
3186	3199	if (width <= 0 \|\| height <= 0) {
3187	3200	return TCL_OK;

3201	3214	*/
3202	3215	sourceBlock = *blockPtr;
3203	3216	memToFree = NULL;
3204		if (sourceBlock.pixelPtr >= masterPtr->pix32
3205		&& sourceBlock.pixelPtr <= masterPtr->pix32 + masterPtr->width
3206		* masterPtr->height * 4) {
3207		sourceBlock.pixelPtr = attemptckalloc(sourceBlock.height
3208		* sourceBlock.pitch);
	3217	if (sourceBlock.pixelPtr >= modelPtr->pix32
	3218	&& sourceBlock.pixelPtr <= modelPtr->pix32 + modelPtr->width
	3219	* modelPtr->height * 4) {
	3220	/*
	3221	* Fix 5c51be6411: avoid reading
	3222	*
	3223	* (sourceBlock.pitch - sourceBlock.width * sourceBlock.pixelSize)
	3224	*
	3225	* bytes past the end of modelPtr->pix32[] when
	3226	*
	3227	* blockPtr->pixelPtr > (modelPtr->pix32 +
	3228	* 4 * modelPtr->width * modelPtr->height -
	3229	* sourceBlock.height * sourceBlock.pitch)
	3230	*/
	3231	unsigned int cpyLen = (sourceBlock.height - 1) * sourceBlock.pitch +
	3232	sourceBlock.width * sourceBlock.pixelSize;
	3233
	3234	sourceBlock.pixelPtr = (unsigned char *)attemptckalloc(cpyLen);
3209	3235	if (sourceBlock.pixelPtr == NULL) {
3210	3236	if (interp != NULL) {
3211	3237	Tcl_SetObjResult(interp, Tcl_NewStringObj(

3215	3241	return TCL_ERROR;
3216	3242	}
3217	3243	memToFree = sourceBlock.pixelPtr;
3218		memcpy(sourceBlock.pixelPtr, blockPtr->pixelPtr, sourceBlock.height
3219		* sourceBlock.pitch);
	3244	memcpy(sourceBlock.pixelPtr, blockPtr->pixelPtr, cpyLen);
3220	3245	}
3221	3246
3222	3247	xEnd = x + width;
3223	3248	yEnd = y + height;
3224		if ((xEnd > masterPtr->width) \|\| (yEnd > masterPtr->height)) {
3225		if (ImgPhotoSetSize(masterPtr, MAX(xEnd, masterPtr->width),
3226		MAX(yEnd, masterPtr->height)) == TCL_ERROR) {
	3249	if ((xEnd > modelPtr->width) \|\| (yEnd > modelPtr->height)) {
	3250	if (ImgPhotoSetSize(modelPtr, MAX(xEnd, modelPtr->width),
	3251	MAX(yEnd, modelPtr->height)) == TCL_ERROR) {
3227	3252	if (interp != NULL) {
3228	3253	Tcl_SetObjResult(interp, Tcl_NewStringObj(
3229	3254	TK_PHOTO_ALLOC_FAILURE_MESSAGE, -1));

3233	3258	}
3234	3259	}
3235	3260
3236		if ((y < masterPtr->ditherY) \|\| ((y == masterPtr->ditherY)
3237		&& (x < masterPtr->ditherX))) {
	3261	if ((y < modelPtr->ditherY) \|\| ((y == modelPtr->ditherY)
	3262	&& (x < modelPtr->ditherX))) {
3238	3263	/*
3239	3264	* The dithering isn't correct past the start of this block.
3240	3265	*/
3241	3266
3242		masterPtr->ditherX = x;
3243		masterPtr->ditherY = y;
	3267	modelPtr->ditherX = x;
	3268	modelPtr->ditherY = y;
3244	3269	}
3245	3270
3246	3271	/*

3258	3283	alphaOffset -= sourceBlock.offset[0];
3259	3284	}
3260	3285	if ((greenOffset != 0) \|\| (blueOffset != 0)) {
3261		masterPtr->flags \|= COLOR_IMAGE;
	3286	modelPtr->flags \|= COLOR_IMAGE;
3262	3287	}
3263	3288
3264	3289	/*

3287	3312	* Copy the data into our local 32-bit/pixel array.
3288	3313	*/
3289	3314
3290		destLinePtr = masterPtr->pix32 + (y * masterPtr->width + x) * 4;
	3315	destLinePtr = modelPtr->pix32 + (y * modelPtr->width + x) * 4;
3291	3316	srcOrigPtr = sourceBlock.pixelPtr + sourceBlock.offset[0];
3292	3317	if (subsampleX < 0) {
3293	3318	srcOrigPtr += (sourceBlock.width - 1) * sourceBlock.pixelSize;

3296	3321	srcOrigPtr += (sourceBlock.height - 1) * sourceBlock.pitch;
3297	3322	}
3298	3323
3299		pitch = masterPtr->width * 4;
	3324	pitch = modelPtr->width * 4;
3300	3325	for (hLeft = height; hLeft > 0; ) {
3301	3326	hCopy = MIN(hLeft, blockHt);
3302	3327	hLeft -= hCopy;

3383	3408	rect.width = width;
3384	3409	rect.height = 1;
3385	3410	TkUnionRectWithRegion(&rect, workRgn, workRgn);
3386		TkSubtractRegion(masterPtr->validRegion, workRgn,
3387		masterPtr->validRegion);
	3411	TkSubtractRegion(modelPtr->validRegion, workRgn,
	3412	modelPtr->validRegion);
3388	3413	TkDestroyRegion(workRgn);
3389	3414	}
3390	3415
3391		TkpBuildRegionFromAlphaData(masterPtr->validRegion,
	3416	TkpBuildRegionFromAlphaData(modelPtr->validRegion,
3392	3417	(unsigned)x, (unsigned)y, (unsigned)width, (unsigned)height,
3393		&masterPtr->pix32[(y * masterPtr->width + x) * 4 + 3], 4,
3394		(unsigned) masterPtr->width * 4);
	3418	&modelPtr->pix32[(y * modelPtr->width + x) * 4 + 3], 4,
	3419	(unsigned) modelPtr->width * 4);
3395	3420	} else {
3396	3421	rect.x = x;
3397	3422	rect.y = y;
3398	3423	rect.width = width;
3399	3424	rect.height = height;
3400		TkUnionRectWithRegion(&rect, masterPtr->validRegion,
3401		masterPtr->validRegion);
	3425	TkUnionRectWithRegion(&rect, modelPtr->validRegion,
	3426	modelPtr->validRegion);
3402	3427	}
3403	3428
3404	3429	/*

3411	3436	* builds up large simple-alpha images by single pixels. We don't
3412	3437	* negate COMPLEX_ALPHA in this case. [Bug 1409140]
3413	3438	*/
3414		if (!(masterPtr->flags & COMPLEX_ALPHA)) {
	3439	if (!(modelPtr->flags & COMPLEX_ALPHA)) {
3415	3440	unsigned char newAlpha;
3416	3441
3417		destLinePtr = masterPtr->pix32 + (y * masterPtr->width + x) * 4;
	3442	destLinePtr = modelPtr->pix32 + (y * modelPtr->width + x) * 4;
3418	3443	newAlpha = destLinePtr[3];
3419	3444
3420	3445	if (newAlpha && newAlpha != 255) {
3421		masterPtr->flags \|= COMPLEX_ALPHA;
3422		}
3423		}
3424		} else if ((alphaOffset != 0) \|\| (masterPtr->flags & COMPLEX_ALPHA)) {
	3446	modelPtr->flags \|= COMPLEX_ALPHA;
	3447	}
	3448	}
	3449	} else if ((alphaOffset != 0) \|\| (modelPtr->flags & COMPLEX_ALPHA)) {
3425	3450	/*
3426	3451	* Check for partial transparency if alpha pixels are specified, or
3427	3452	* rescan if we already knew such pixels existed. To restrict this
3428	3453	* Toggle to only checking the changed pixels requires knowing where
3429	3454	* the alpha pixels are.
3430	3455	*/
3431		ToggleComplexAlphaIfNeeded(masterPtr);
	3456	ToggleComplexAlphaIfNeeded(modelPtr);
3432	3457	}
3433	3458
3434	3459	/*
3435	3460	* Update each instance.
3436	3461	*/
3437	3462
3438		Tk_DitherPhoto((Tk_PhotoHandle) masterPtr, x, y, width, height);
	3463	Tk_DitherPhoto((Tk_PhotoHandle) modelPtr, x, y, width, height);
3439	3464
3440	3465	/*
3441	3466	* Tell the core image code that this image has changed.
3442	3467	*/
3443	3468
3444		Tk_ImageChanged(masterPtr->tkMaster, x, y, width, height, masterPtr->width,
3445		masterPtr->height);
	3469	Tk_ImageChanged(modelPtr->tkMaster, x, y, width, height, modelPtr->width,
	3470	modelPtr->height);
3446	3471
3447	3472	if (memToFree) ckfree(memToFree);
3448	3473

3460	3485	* Tk_DitherPhoto --
3461	3486	*
3462	3487	* This function is called to update an area of each instance's pixmap by
3463		* dithering the corresponding area of the image master.
	3488	* dithering the corresponding area of the image model.
3464	3489	*
3465	3490	* Results:
3466	3491	* None.
3467	3492	*
3468	3493	* Side effects:
3469	3494	* The pixmap of each instance of this image gets updated. The fields in
3470		* *masterPtr indicating which area of the image is correctly dithered
	3495	* *modelPtr indicating which area of the image is correctly dithered
3471	3496	* get updated.
3472	3497	*
3473	3498	*----------------------------------------------------------------------

3475	3500
3476	3501	void
3477	3502	Tk_DitherPhoto(
3478		Tk_PhotoHandle photo, /* Image master whose instances are to be
	3503	Tk_PhotoHandle photo, /* Image model whose instances are to be
3479	3504	* updated. */
3480	3505	int x, int y, /* Coordinates of the top-left pixel in the
3481	3506	* area to be dithered. */
3482	3507	int width, int height) /* Dimensions of the area to be dithered. */
3483	3508	{
3484		PhotoMaster masterPtr = (PhotoMaster ) photo;
	3509	PhotoModel modelPtr = (PhotoModel ) photo;
3485	3510	PhotoInstance *instancePtr;
3486	3511
3487	3512	if ((width <= 0) \|\| (height <= 0)) {
3488	3513	return;
3489	3514	}
3490	3515
3491		for (instancePtr = masterPtr->instancePtr; instancePtr != NULL;
	3516	for (instancePtr = modelPtr->instancePtr; instancePtr != NULL;
3492	3517	instancePtr = instancePtr->nextPtr) {
3493	3518	TkImgDitherInstance(instancePtr, x, y, width, height);
3494	3519	}

3498	3523	* will extend the correctly dithered region.
3499	3524	*/
3500	3525
3501		if (((y < masterPtr->ditherY)
3502		\|\| ((y == masterPtr->ditherY) && (x <= masterPtr->ditherX)))
3503		&& ((y + height) > (masterPtr->ditherY))) {
	3526	if (((y < modelPtr->ditherY)
	3527	\|\| ((y == modelPtr->ditherY) && (x <= modelPtr->ditherX)))
	3528	&& ((y + height) > (modelPtr->ditherY))) {
3504	3529	/*
3505	3530	* This block starts inside (or immediately after) the correctly
3506	3531	* dithered region, so the first scan line at least will be right.
3507		* Furthermore this block extends into scanline masterPtr->ditherY.
3508		*/
3509
3510		if ((x == 0) && (width == masterPtr->width)) {
	3532	* Furthermore this block extends into scanline modelPtr->ditherY.
	3533	*/
	3534
	3535	if ((x == 0) && (width == modelPtr->width)) {
3511	3536	/*
3512	3537	* We are doing the full width, therefore the dithering will be
3513	3538	* correct to the end.
3514	3539	*/
3515	3540
3516		masterPtr->ditherX = 0;
3517		masterPtr->ditherY = y + height;
	3541	modelPtr->ditherX = 0;
	3542	modelPtr->ditherY = y + height;
3518	3543	} else {
3519	3544	/*
3520	3545	* We are doing partial scanlines, therefore the

3522	3547	* line.
3523	3548	*/
3524	3549
3525		if (x <= masterPtr->ditherX) {
3526		masterPtr->ditherX = x + width;
3527		if (masterPtr->ditherX >= masterPtr->width) {
3528		masterPtr->ditherX = 0;
3529		masterPtr->ditherY++;
	3550	if (x <= modelPtr->ditherX) {
	3551	modelPtr->ditherX = x + width;
	3552	if (modelPtr->ditherX >= modelPtr->width) {
	3553	modelPtr->ditherX = 0;
	3554	modelPtr->ditherY++;
3530	3555	}
3531	3556	}
3532	3557	}

3554	3579	Tk_PhotoBlank(
3555	3580	Tk_PhotoHandle handle) /* Handle for the image to be blanked. */
3556	3581	{
3557		PhotoMaster masterPtr = (PhotoMaster ) handle;
	3582	PhotoModel modelPtr = (PhotoModel ) handle;
3558	3583	PhotoInstance *instancePtr;
3559	3584
3560		masterPtr->ditherX = masterPtr->ditherY = 0;
3561		masterPtr->flags = 0;
	3585	modelPtr->ditherX = modelPtr->ditherY = 0;
	3586	modelPtr->flags = 0;
3562	3587
3563	3588	/*
3564	3589	* The image has valid data nowhere.
3565	3590	*/
3566	3591
3567		if (masterPtr->validRegion != NULL) {
3568		TkDestroyRegion(masterPtr->validRegion);
3569		}
3570		masterPtr->validRegion = TkCreateRegion();
	3592	if (modelPtr->validRegion != NULL) {
	3593	TkDestroyRegion(modelPtr->validRegion);
	3594	}
	3595	modelPtr->validRegion = TkCreateRegion();
3571	3596
3572	3597	/*
3573	3598	* Clear out the 32-bit pixel storage array. Clear out the dithering error
3574	3599	* arrays for each instance.
3575	3600	*/
3576	3601
3577		memset(masterPtr->pix32, 0,
3578		((size_t)masterPtr->width * masterPtr->height * 4));
3579		for (instancePtr = masterPtr->instancePtr; instancePtr != NULL;
	3602	memset(modelPtr->pix32, 0,
	3603	((size_t)modelPtr->width * modelPtr->height * 4));
	3604	for (instancePtr = modelPtr->instancePtr; instancePtr != NULL;
3580	3605	instancePtr = instancePtr->nextPtr) {
3581	3606	TkImgResetDither(instancePtr);
3582	3607	}

3585	3610	* Tell the core image code that this image has changed.
3586	3611	*/
3587	3612
3588		Tk_ImageChanged(masterPtr->tkMaster, 0, 0, masterPtr->width,
3589		masterPtr->height, masterPtr->width, masterPtr->height);
	3613	Tk_ImageChanged(modelPtr->tkMaster, 0, 0, modelPtr->width,
	3614	modelPtr->height, modelPtr->width, modelPtr->height);
3590	3615	}
3591	3616
3592	3617	/*

3616	3641	Tk_PhotoHandle handle, /* Handle for the image to be expanded. */
3617	3642	int width, int height) /* Desired minimum dimensions of the image. */
3618	3643	{
3619		PhotoMaster masterPtr = (PhotoMaster ) handle;
3620
3621		if (width <= masterPtr->width) {
3622		width = masterPtr->width;
3623		}
3624		if (height <= masterPtr->height) {
3625		height = masterPtr->height;
3626		}
3627		if ((width != masterPtr->width) \|\| (height != masterPtr->height)) {
3628		if (ImgPhotoSetSize(masterPtr, MAX(width, masterPtr->width),
3629		MAX(height, masterPtr->height)) == TCL_ERROR) {
	3644	PhotoModel modelPtr = (PhotoModel ) handle;
	3645
	3646	if (width <= modelPtr->width) {
	3647	width = modelPtr->width;
	3648	}
	3649	if (height <= modelPtr->height) {
	3650	height = modelPtr->height;
	3651	}
	3652	if ((width != modelPtr->width) \|\| (height != modelPtr->height)) {
	3653	if (ImgPhotoSetSize(modelPtr, MAX(width, modelPtr->width),
	3654	MAX(height, modelPtr->height)) == TCL_ERROR) {
3630	3655	if (interp != NULL) {
3631	3656	Tcl_SetObjResult(interp, Tcl_NewStringObj(
3632	3657	TK_PHOTO_ALLOC_FAILURE_MESSAGE, -1));

3634	3659	}
3635	3660	return TCL_ERROR;
3636	3661	}
3637		Tk_ImageChanged(masterPtr->tkMaster, 0, 0, 0, 0, masterPtr->width,
3638		masterPtr->height);
	3662	Tk_ImageChanged(modelPtr->tkMaster, 0, 0, 0, 0, modelPtr->width,
	3663	modelPtr->height);
3639	3664	}
3640	3665	return TCL_OK;
3641	3666	}

3664	3689	/* The dimensions of the image are returned
3665	3690	* here. */
3666	3691	{
3667		PhotoMaster masterPtr = (PhotoMaster ) handle;
3668
3669		*widthPtr = masterPtr->width;
3670		*heightPtr = masterPtr->height;
	3692	PhotoModel modelPtr = (PhotoModel ) handle;
	3693
	3694	*widthPtr = modelPtr->width;
	3695	*heightPtr = modelPtr->height;
3671	3696	}
3672	3697
3673	3698	/*

3696	3721	* set. */
3697	3722	int width, int height) /* New dimensions for the image. */
3698	3723	{
3699		PhotoMaster masterPtr = (PhotoMaster ) handle;
3700
3701		masterPtr->userWidth = width;
3702		masterPtr->userHeight = height;
3703		if (ImgPhotoSetSize(masterPtr, ((width > 0) ? width: masterPtr->width),
3704		((height > 0) ? height: masterPtr->height)) == TCL_ERROR) {
	3724	PhotoModel modelPtr = (PhotoModel ) handle;
	3725
	3726	modelPtr->userWidth = width;
	3727	modelPtr->userHeight = height;
	3728	if (ImgPhotoSetSize(modelPtr, ((width > 0) ? width: modelPtr->width),
	3729	((height > 0) ? height: modelPtr->height)) == TCL_ERROR) {
3705	3730	if (interp != NULL) {
3706	3731	Tcl_SetObjResult(interp, Tcl_NewStringObj(
3707	3732	TK_PHOTO_ALLOC_FAILURE_MESSAGE, -1));

3709	3734	}
3710	3735	return TCL_ERROR;
3711	3736	}
3712		Tk_ImageChanged(masterPtr->tkMaster, 0, 0, 0, 0,
3713		masterPtr->width, masterPtr->height);
	3737	Tk_ImageChanged(modelPtr->tkMaster, 0, 0, 0, 0,
	3738	modelPtr->width, modelPtr->height);
3714	3739	return TCL_OK;
3715	3740	}
3716	3741

3739	3764	Tk_PhotoHandle handle) /* Handle for the image whose valid region is
3740	3765	* to obtained. */
3741	3766	{
3742		PhotoMaster masterPtr = (PhotoMaster ) handle;
3743
3744		return masterPtr->validRegion;
	3767	PhotoModel modelPtr = (PhotoModel ) handle;
	3768
	3769	return modelPtr->validRegion;
3745	3770	}
3746	3771
3747	3772	/*

3767	3792
3768	3793	static char *
3769	3794	ImgGetPhoto(
3770		PhotoMaster masterPtr, / Handle for the photo image from which image
	3795	PhotoModel modelPtr, / Handle for the photo image from which image
3771	3796	* data is desired. */
3772	3797	Tk_PhotoImageBlock *blockPtr,
3773	3798	/* Information about the address and layout of

3777	3802	unsigned char *pixelPtr;
3778	3803	int x, y, greenOffset, blueOffset, alphaOffset;
3779	3804
3780		Tk_PhotoGetImage((Tk_PhotoHandle) masterPtr, blockPtr);
	3805	Tk_PhotoGetImage((Tk_PhotoHandle) modelPtr, blockPtr);
3781	3806	blockPtr->pixelPtr += optPtr->fromY * blockPtr->pitch
3782	3807	+ optPtr->fromX * blockPtr->pixelSize;
3783	3808	blockPtr->width = optPtr->fromX2 - optPtr->fromX;
3784	3809	blockPtr->height = optPtr->fromY2 - optPtr->fromY;
3785	3810
3786		if (!(masterPtr->flags & COLOR_IMAGE) &&
	3811	if (!(modelPtr->flags & COLOR_IMAGE) &&
3787	3812	(!(optPtr->options & OPT_BACKGROUND)
3788	3813	\|\| ((optPtr->background->red == optPtr->background->green)
3789	3814	&& (optPtr->background->red == optPtr->background->blue)))) {

3811	3836	blueOffset = blockPtr->offset[2] - blockPtr->offset[0];
3812	3837	if (((optPtr->options & OPT_BACKGROUND) && alphaOffset) \|\|
3813	3838	((optPtr->options & OPT_GRAYSCALE) && (greenOffset\|\|blueOffset))) {
3814		int newPixelSize,x,y;
	3839	int newPixelSize;
3815	3840	unsigned char srcPtr, destPtr;
3816	3841	char *data;
3817	3842

3824	3849	if (blockPtr->height > (int)((UINT_MAX/newPixelSize)/blockPtr->width)) {
3825	3850	return NULL;
3826	3851	}
3827		data = attemptckalloc(newPixelSizeblockPtr->widthblockPtr->height);
	3852	data = (char )attemptckalloc(newPixelSizeblockPtr->width*blockPtr->height);
3828	3853	if (data == NULL) {
3829	3854	return NULL;
3830	3855	}

4015	4040	/* Information about the address and layout of
4016	4041	* the image data is returned here. */
4017	4042	{
4018		PhotoMaster masterPtr = (PhotoMaster ) handle;
4019
4020		blockPtr->pixelPtr = masterPtr->pix32;
4021		blockPtr->width = masterPtr->width;
4022		blockPtr->height = masterPtr->height;
4023		blockPtr->pitch = masterPtr->width * 4;
	4043	PhotoModel modelPtr = (PhotoModel ) handle;
	4044
	4045	blockPtr->pixelPtr = modelPtr->pix32;
	4046	blockPtr->width = modelPtr->width;
	4047	blockPtr->height = modelPtr->height;
	4048	blockPtr->pitch = modelPtr->width * 4;
4024	4049	blockPtr->pixelSize = 4;
4025	4050	blockPtr->offset[0] = 0;
4026	4051	blockPtr->offset[1] = 1;

4032	4057	/*
4033	4058	*--------------------------------------------------------------
4034	4059	*
4035		* TkPostscriptPhoto --
	4060	* ImgPostscriptPhoto --
4036	4061	*
4037	4062	* This function is called to output the contents of a photo image in
4038	4063	* Postscript by calling the Tk_PostscriptPhoto function.

4050	4075	ImgPhotoPostscript(
4051	4076	ClientData clientData, /* Handle for the photo image. */
4052	4077	Tcl_Interp interp, / Interpreter. */
4053		Tk_Window tkwin, /* (unused) */
	4078	TCL_UNUSED(Tk_Window), /* (unused) */
4054	4079	Tk_PostscriptInfo psInfo, /* Postscript info. */
4055	4080	int x, int y, /* First pixel to output. */
4056	4081	int width, int height, /* Width and height of area. */
4057		int prepass) /* (unused) */
	4082	TCL_UNUSED(int)) /* (unused) */
4058	4083	{
4059	4084	Tk_PhotoImageBlock block;
4060	4085

4069	4094	*
4070	4095	* Tk_PhotoPutBlock_NoComposite, Tk_PhotoPutZoomedBlock_NoComposite --
4071	4096	*
4072		* These backward-compatability functions just exist to fill slots in stubs
	4097	* These backward-compatibility functions just exist to fill slots in stubs
4073	4098	* table. For the behaviour of *_NoComposite, refer to the corresponding
4074	4099	* function without the extra suffix, except that the compositing rule is
4075	4100	* always "overlay" and the function always panics on memory-allocation

4110	4135	* Tk_PhotoExpand_Panic, Tk_PhotoPutBlock_Panic,
4111	4136	* Tk_PhotoPutZoomedBlock_Panic, Tk_PhotoSetSize_Panic
4112	4137	*
4113		* Backward compatability functions for preserving the old behaviour (i.e.
	4138	* Backward compatibility functions for preserving the old behaviour (i.e.
4114	4139	* panic on memory allocation failure) so that extensions do not need to be
4115	4140	* significantly updated to take account of TIP #116. These call the new
4116	4141	* interface (i.e. the interface without the extra suffix), but panic if an

4169	4194	* mode: c
4170	4195	* c-basic-offset: 4
4171	4196	* fill-column: 78
	4197	* tab-width: 8
4172	4198	* End:
4173	4199	*/

+7

-6

generic/tkImgPhoto.h less more

26	26	* Forward declarations of the structures we define.
27	27	*/
28	28
	29	#define PhotoModel PhotoMaster
29	30	typedef struct ColorTableId ColorTableId;
30	31	typedef struct ColorTable ColorTable;
31	32	typedef struct PhotoInstance PhotoInstance;

136	137	#define MAP_COLORS 8
137	138
138	139	/*
139		* Definition of the data associated with each photo image master.
	140	* Definition of the data associated with each photo image model.
140	141	*/
141	142
142	143	struct PhotoMaster {
143		Tk_ImageMaster tkMaster; /* Tk's token for image master. NULL means the
	144	Tk_ImageMaster tkMaster; /* Tk's token for image model. NULL means the
144	145	* image is being deleted. */
145	146	Tcl_Interp interp; / Interpreter associated with the application
146	147	* using this image. */

163	164	TkRegion validRegion; /* Tk region indicating which parts of the
164	165	* image have valid image data. */
165	166	PhotoInstance instancePtr; / First in the list of instances associated
166		* with this master. */
	167	* with this model. */
167	168	};
168	169
169	170	/*

194	195	*/
195	196
196	197	struct PhotoInstance {
197		PhotoMaster masterPtr; / Pointer to master for image. */
	198	PhotoMaster masterPtr; / Pointer to model for image. */
198	199	Display display; / Display for windows using this instance. */
199	200	Colormap colormap; /* The image may only be used in windows with
200	201	* this particular colormap. */
201	202	PhotoInstance nextPtr; / Pointer to the next instance in the list of
202		* instances associated with this master. */
	203	* instances associated with this model. */
203	204	int refCount; /* Number of instances using this structure. */
204	205	Tk_Uid palette; /* Palette for these particular instances. */
205	206	double gamma; /* Gamma value for these instances. */
206	207	Tk_Uid defaultPalette; /* Default palette to use if a palette is not
207		* specified for the master. */
	208	* specified for the model. */
208	209	ColorTable colorTablePtr; / Pointer to information about colors
209	210	* allocated for image display in windows like
210	211	* this one. */

+81

-46

generic/tkInt.decls less more

633	633	Tk_Font tkfont, const char *source, int numBytes, double x,
634	634	double y, double angle)
635	635	}
	636
	637	# Support for aqua's inability to draw outside [NSView drawRect:]
	638	declare 185 macosx {
	639	void TkpRedrawWidget(Tk_Window tkwin)
	640	}
	641	declare 186 macosx {
	642	int TkpWillDrawWidget(Tk_Window tkwin)
	643	}
	644
636	645
637	646	##############################################################################
638	647

647	656	declare 0 x11 {
648	657	void TkCreateXEventSource(void)
649	658	}
650		#
651		# Slot 1 unused (WAS: TkFreeWindowId)
652		# Slot 2 unused (WAS: TkInitXId)
653		#
	659	declare 2 x11 {
	660	void TkGenerateActivateEvents(TkWindow *winPtr, int active)
	661	}
654	662	declare 3 x11 {
655	663	int TkpCmapStressed(Tk_Window tkwin, Colormap colormap)
656	664	}

675	683	declare 10 x11 {
676	684	void TkSendCleanup(TkDisplay *dispPtr)
677	685	}
678		#
679		# Slot 11 unused (WAS: TkFreeXId)
680		#
681	686	declare 12 x11 {
682	687	int TkpWmSetState(TkWindow *winPtr, int state)
683	688	}

686	691	int TkpTestsendCmd(ClientData clientData, Tcl_Interp *interp, int objc,
687	692	Tcl_Obj *const objv[])
688	693	}
	694	declare 38 x11 {
	695	int TkpCmapStressed_(Tk_Window tkwin, Colormap colormap)
	696	}
	697	declare 39 x11 {
	698	void TkpSync_(Display *display)
	699	}
	700	declare 40 x11 {
	701	Window TkUnixContainerId_(TkWindow *winPtr)
	702	}
	703	declare 41 x11 {
	704	int TkUnixDoOneXEvent_(Tcl_Time *timePtr)
	705	}
	706	declare 42 x11 {
	707	void TkUnixSetMenubar_(Tk_Window tkwin, Tk_Window menubar)
	708	}
	709	declare 43 x11 {
	710	void TkWmCleanup_(TkDisplay *dispPtr)
	711	}
	712	declare 44 x11 {
	713	void TkSendCleanup_(TkDisplay *dispPtr)
	714	}
	715	# only needed by tktest:
	716	declare 45 x11 {
	717	int TkpTestsendCmd_(ClientData clientData, Tcl_Interp *interp, int objc,
	718	Tcl_Obj *const objv[])
	719	}
689	720
690	721	################################
691	722	# Windows specific functions

853	884	declare 0 aqua {
854	885	void TkGenerateActivateEvents(TkWindow *winPtr, int active)
855	886	}
856
857		# removed duplicates from tkInt table
858		#declare 1 aqua {
859		# Pixmap TkpCreateNativeBitmap(Display display, const void source)
860		#}
861		#
862		#declare 2 aqua {
863		# void TkpDefineNativeBitmaps(void)
864		#}
865
	887	declare 2 aqua {
	888	void TkGenerateActivateEvents_(TkWindow *winPtr, int active)
	889	}
866	890	declare 3 aqua {
867	891	void TkPointerDeadWindow(TkWindow *winPtr)
868	892	}

893	917	declare 12 aqua {
894	918	void TkMacOSXHandleTearoffMenu(void)
895	919	}
896
897		# removed duplicate from tkPlat table(tk.decls)
898		#declare 13 aqua {
899		# void TkMacOSXInvalClipRgns(TkWindow *winPtr)
900		#}
901
902	920	declare 14 aqua {
903	921	int TkMacOSXDoHLEvent(void *theEvent)
904	922	}
905
906		# removed duplicate from tkPlat table(tk.decls)
907		#declare 15 aqua {
908		# void *TkMacOSXGetDrawablePort(Drawable drawable)
909		#}
910
911	923	declare 16 aqua {
912	924	Window TkMacOSXGetXWindow(void *macWinPtr)
913	925	}

943	955	declare 25 aqua {
944	956	void TkMacOSXMenuClick(void)
945	957	}
946		declare 26 aqua {
947		void TkMacOSXRegisterOffScreenWindow(Window window, void *portPtr)
948		}
	958	# The corresponding Unregister was not a stub, and this should be static.
	959	#declare 26 aqua {
	960	# void TkMacOSXRegisterOffScreenWindow(Window window, void *portPtr)
	961	#}
949	962	declare 27 aqua {
950	963	int TkMacOSXResizable(TkWindow *winPtr)
951	964	}

964	977	declare 32 aqua {
965	978	void TkMacOSXUpdateClipRgn(TkWindow *winPtr)
966	979	}
967		declare 33 aqua {
968		void TkMacOSXUnregisterMacWindow(void *portPtr)
969		}
	980	# This was not implemented. Perhaps meant to be OffScreen ?
	981	#declare 33 aqua {
	982	# void TkMacOSXUnregisterMacWindow(void *portPtr)
	983	#}
970	984	declare 34 aqua {
971	985	int TkMacOSXUseMenuID(short macID)
972	986	}

985	999	declare 39 aqua {
986	1000	void TkSetWMName(TkWindow *winPtr, Tk_Uid titleUid)
987	1001	}
988		#
989		# Slot 40 unused (WAS: TkSuspendClipboard)
990		#
991	1002	declare 41 aqua {
992	1003	int TkMacOSXZoomToplevel(void *whichWindow, short zoomPart)
993	1004	}

1022	1033	declare 52 aqua {
1023	1034	void TkMacOSXSetDrawingEnabled(TkWindow *winPtr, int flag)
1024	1035	}
1025
1026		# removed duplicate from tkPlat table (tk.decls)
1027		#declare 52 aqua {
1028		# void TkGenWMConfigureEvent(Tk_Window tkwin, int x, int y,
1029		# int width, int height, int flags)
1030		#}
1031
1032	1036	declare 53 aqua {
1033	1037	unsigned long TkpGetMS(void)
1034	1038	}
1035
1036	1039	# For Canvas3d, requested by Sean Woods
1037	1040	declare 54 aqua {
1038	1041	void *TkMacOSXDrawable(Drawable drawable)

1495	1498	int sx, int sy, int dx, int dy,
1496	1499	unsigned int w, unsigned int h)
1497	1500	}
	1501	declare 158 win {
	1502	void TkUnusedStubEntry(void)
	1503	}
1498	1504
1499	1505	################################
1500	1506	# X functions for Aqua

1818	1824	declare 91 aqua {
1819	1825	int XSync(Display *display, Bool discard)
1820	1826	}
	1827	declare 106 aqua {
	1828	int XSetClipRectangles(Display *display, GC gc, int clip_x_origin,
	1829	int clip_y_origin, XRectangle rectangles[], int n, int ordering)
	1830	}
	1831
1821	1832	declare 107 aqua {
1822	1833	int XFlush(Display *display)
1823	1834	}

1838	1849	}
1839	1850	declare 114 aqua {
1840	1851	VisualID XVisualIDFromVisual(Visual *visual)
	1852	}
	1853	declare 120 aqua {
	1854	int XOffsetRegion(void *rgn, int dx, int dy)
	1855	}
	1856	declare 129 aqua {
	1857	int XLowerWindow(Display *d, Window w)
1841	1858	}
1842	1859	declare 137 aqua {
1843	1860	int XPutImage(Display d, Drawable dr, GC gc, XImage im,
1844	1861	int sx, int sy, int dx, int dy,
1845	1862	unsigned int w, unsigned int h)
1846	1863	}
	1864	declare 144 aqua {
	1865	void XDestroyIC(XIC xic)
	1866	}
	1867	declare 145 aqua {
	1868	Cursor XCreatePixmapCursor(Display *d, Pixmap p1, Pixmap p2,
	1869	XColor x1, XColor x2, unsigned int ui1, unsigned int ui2)
	1870	}
	1871	declare 146 aqua {
	1872	Cursor XCreateGlyphCursor(Display *d, Font f1, Font f2,
	1873	unsigned int ui1, unsigned int ui2, XColor _Xconst *x1,
	1874	XColor _Xconst *x2)
	1875	}
	1876	declare 157 aqua {
	1877	KeySym XkbKeycodeToKeysym(Display *d, unsigned int k, int g, int i)
	1878	}
	1879	declare 158 aqua {
	1880	void TkUnusedStubEntry(void)
	1881	}
1847	1882
1848	1883	# Local Variables:
1849	1884	# mode: tcl

+73

-14

generic/tkInt.h less more

56	56	# else
57	57	# define MODULE_SCOPE extern
58	58	# endif
	59	#endif
	60
	61	#ifndef JOIN
	62	# define JOIN(a,b) JOIN1(a,b)
	63	# define JOIN1(a,b) a##b
	64	#endif
	65
	66	#ifndef TCL_UNUSED
	67	# if defined(__cplusplus)
	68	# define TCL_UNUSED(T) T
	69	# elif defined(__GNUC__) && (__GNUC__ > 2)
	70	# define TCL_UNUSED(T) T JOIN(dummy, __LINE__) __attribute__((unused))
	71	# else
	72	# define TCL_UNUSED(T) T JOIN(dummy, __LINE__)
	73	# endif
	74	#endif
	75
	76	#if defined(_WIN32) && (TCL_MAJOR_VERSION < 9) && (TCL_MINOR_VERSION < 7)
	77	# if TCL_UTF_MAX > 3
	78	# define Tcl_WCharToUtfDString(a,b,c) Tcl_WinTCharToUtf((TCHAR )(a),(b)sizeof(WCHAR),c)
	79	# define Tcl_UtfToWCharDString(a,b,c) (WCHAR *)Tcl_WinUtfToTChar(a,b,c)
	80	# else
	81	# define Tcl_WCharToUtfDString ((char * ()(const WCHAR , int len, Tcl_DString *))Tcl_UniCharToUtfDString)
	82	# define Tcl_UtfToWCharDString ((WCHAR * ()(const char , int len, Tcl_DString *))Tcl_UtfToUniCharDString)
	83	# endif
	84	#endif
	85
	86	#if defined(__GNUC__) && (__GNUC__ > 2)
	87	# define TKFLEXARRAY 0
	88	#else
	89	# define TKFLEXARRAY 1
	90	#endif
	91
	92	#ifndef Tcl_GetParent
	93	# define Tcl_GetParent Tcl_GetMaster
59	94	#endif
60	95
61	96	/*

327	362	*/
328	363
329	364	Tcl_HashTable maintainHashTable;
330		/* Hash table that maps from a master's
331		* Tk_Window token to a list of slaves managed
332		* by that master. */
	365	/* Hash table that maps from a container's
	366	* Tk_Window token to a list of windows managed
	367	* by that container. */
333	368	int geomInit;
334	369
335		#define TkGetGeomMaster(tkwin) (((TkWindow *)tkwin)->maintainerPtr != NULL ? \
	370	#define TkGetContainer(tkwin) (((TkWindow *)tkwin)->maintainerPtr != NULL ? \
336	371	((TkWindow )tkwin)->maintainerPtr : ((TkWindow )tkwin)->parentPtr)
337	372
338	373	/*

634	669	/* Top level of option hierarchy for this main
635	670	* window. NULL means uninitialized. Managed
636	671	* by tkOption.c. */
637		Tcl_HashTable imageTable; /* Maps from image names to Tk_ImageMaster
	672	Tcl_HashTable imageTable; /* Maps from image names to Tk_ImageModel
638	673	* structures. Managed by tkImage.c. */
639	674	int strictMotif; /* This is linked to the tk_strictMotif global
640	675	* variable. */

681	716	Visual visual; / Visual to use for window. If not default,
682	717	* MUST be set before X window is created. */
683	718	int depth; /* Number of bits/pixel. */
684		Window window; /* X's id for window. NULL means window hasn't
	719	Window window; /* X's id for window. None means window hasn't
685	720	* actually been created yet, or it's been
686	721	* deleted. */
687	722	struct TkWindow childList; / First in list of child windows, or NULL if

829	864	#endif /* TK_USE_INPUT_METHODS */
830	865	char geomMgrName; / Records the name of the geometry manager. */
831	866	struct TkWindow *maintainerPtr;
832		/* The geometry master for this window. The
833		* value is NULL if the window has no master or
834		* if its master is its parent. */
	867	/* The geometry container for this window. The
	868	* value is NULL if the window has no container or
	869	* if its container is its parent. */
835	870	} TkWindow;
836	871
837	872	/*

841	876
842	877	typedef struct {
843	878	XKeyEvent keyEvent; /* The real event from X11. */
	879	#ifdef _WIN32
	880	char trans_chars[XMaxTransChars];
	881	/* translated characters */
	882	unsigned char nbytes;
	883	#elif !defined(MAC_OSX_TK)
844	884	char charValuePtr; / A pointer to a string that holds the key's
845	885	* %A substitution text (before backslash
846	886	* adding), or NULL if that has not been

850	890	* is non-NULL. */
851	891	KeySym keysym; /* Key symbol computed after input methods
852	892	* have been invoked */
	893	#endif
853	894	} TkKeyEvent;
854	895
855	896	/*

949	990	(Button1Mask\|Button2Mask\|Button3Mask\|Button4Mask\|Button5Mask)
950	991
951	992
952		MODULE_SCOPE unsigned long TkGetButtonMask(unsigned int);
	993	MODULE_SCOPE unsigned TkGetButtonMask(unsigned);
953	994
954	995	/*
955	996	* Object types not declared in tkObj.c need to be mentioned here so they can

1024	1065
1025	1066	#include "tkIntDecls.h"
1026	1067
	1068	#ifdef __cplusplus
	1069	extern "C" {
	1070	#endif
	1071
1027	1072	/*
1028	1073	* Themed widget set init function:
1029	1074	*/

1179	1224	MODULE_SCOPE int Tk_GetDoublePixelsFromObj(Tcl_Interp *interp,
1180	1225	Tk_Window tkwin, Tcl_Obj *objPtr,
1181	1226	double *doublePtr);
1182		MODULE_SCOPE int TkSetGeometryMaster(Tcl_Interp *interp,
1183		Tk_Window tkwin, const char *master);
1184		MODULE_SCOPE void TkFreeGeometryMaster(Tk_Window tkwin,
1185		const char *master);
	1227	#define TkSetGeometryContainer TkSetGeometryMaster
	1228	MODULE_SCOPE int TkSetGeometryContainer(Tcl_Interp *interp,
	1229	Tk_Window tkwin, const char *name);
	1230	#define TkFreeGeometryContainer TkFreeGeometryMaster
	1231	MODULE_SCOPE void TkFreeGeometryContainer(Tk_Window tkwin,
	1232	const char *name);
1186	1233
1187	1234	MODULE_SCOPE void TkEventInit(void);
1188	1235	MODULE_SCOPE void TkRegisterObjTypes(void);

1220	1267	Drawable drawable, GC gc, Tk_Font tkfont,
1221	1268	const char *source, int numBytes, int rangeStart,
1222	1269	int rangeLength, int x, int y);
	1270	MODULE_SCOPE void TkpDrawAngledCharsInContext(Display * display,
	1271	Drawable drawable, GC gc, Tk_Font tkfont,
	1272	const char *source, int numBytes, int rangeStart,
	1273	int rangeLength, double x, double y, double angle);
1223	1274	MODULE_SCOPE int TkpMeasureCharsInContext(Tk_Font tkfont,
1224	1275	const char *source, int numBytes, int rangeStart,
1225	1276	int rangeLength, int maxLength, int flags,

1273	1324	#if TCL_UTF_MAX > 4
1274	1325	# define TkUtfToUniChar Tcl_UtfToUniChar
1275	1326	# define TkUniCharToUtf Tcl_UniCharToUtf
	1327	# define TkUtfPrev Tcl_UtfPrev
	1328	# define TkUtfAtIndex Tcl_UtfAtIndex
1276	1329	#else
1277	1330	MODULE_SCOPE int TkUtfToUniChar(const char , int );
1278	1331	MODULE_SCOPE int TkUniCharToUtf(int, char *);
	1332	MODULE_SCOPE const char TkUtfPrev(const char , const char *);
	1333	MODULE_SCOPE const char TkUtfAtIndex(const char src, int index);
1279	1334	#endif
1280	1335
1281	1336	/*

1299	1354	MODULE_SCOPE int TkplatformtestInit(Tcl_Interp *interp);
1300	1355	#endif
1301	1356
	1357	#ifdef __cplusplus
	1358	}
	1359	#endif
	1360
1302	1361	#endif /* _TKINT */
1303	1362
1304	1363	/*

+49

-0

generic/tkIntDecls.h less more

549	549	Drawable drawable, GC gc, Tk_Font tkfont,
550	550	const char *source, int numBytes, double x,
551	551	double y, double angle);
	552	#ifdef MAC_OSX_TCL /* MACOSX */
	553	/* 185 */
	554	EXTERN void TkpRedrawWidget(Tk_Window tkwin);
	555	#endif /* MACOSX */
	556	#ifdef MAC_OSX_TCL /* MACOSX */
	557	/* 186 */
	558	EXTERN int TkpWillDrawWidget(Tk_Window tkwin);
	559	#endif /* MACOSX */
552	560
553	561	typedef struct TkIntStubs {
554	562	int magic;

766	774	void (tkUnderlineAngledTextLayout) (Display display, Drawable drawable, GC gc, Tk_TextLayout layout, int x, int y, double angle, int underline); /* 182 */
767	775	int (tkIntersectAngledTextLayout) (Tk_TextLayout layout, int x, int y, int width, int height, double angle); / 183 */
768	776	void (tkDrawAngledChars) (Display display, Drawable drawable, GC gc, Tk_Font tkfont, const char source, int numBytes, double x, double y, double angle); / 184 */
	777	#if !defined(_WIN32) && !defined(MAC_OSX_TCL) /* UNIX */
	778	void (*reserved185)(void);
	779	#endif /* UNIX */
	780	#if defined(_WIN32) /* WIN */
	781	void (*reserved185)(void);
	782	#endif /* WIN */
	783	#ifdef MAC_OSX_TCL /* MACOSX */
	784	void (tkpRedrawWidget) (Tk_Window tkwin); / 185 */
	785	#endif /* MACOSX */
	786	#if !defined(_WIN32) && !defined(MAC_OSX_TCL) /* UNIX */
	787	void (*reserved186)(void);
	788	#endif /* UNIX */
	789	#if defined(_WIN32) /* WIN */
	790	void (*reserved186)(void);
	791	#endif /* WIN */
	792	#ifdef MAC_OSX_TCL /* MACOSX */
	793	int (tkpWillDrawWidget) (Tk_Window tkwin); / 186 */
	794	#endif /* MACOSX */
769	795	} TkIntStubs;
770	796
771	797	extern const TkIntStubs *tkIntStubsPtr;

1138	1164	(tkIntStubsPtr->tkIntersectAngledTextLayout) /* 183 */
1139	1165	#define TkDrawAngledChars \
1140	1166	(tkIntStubsPtr->tkDrawAngledChars) /* 184 */
	1167	#ifdef MAC_OSX_TCL /* MACOSX */
	1168	#define TkpRedrawWidget \
	1169	(tkIntStubsPtr->tkpRedrawWidget) /* 185 */
	1170	#endif /* MACOSX */
	1171	#ifdef MAC_OSX_TCL /* MACOSX */
	1172	#define TkpWillDrawWidget \
	1173	(tkIntStubsPtr->tkpWillDrawWidget) /* 186 */
	1174	#endif /* MACOSX */
1141	1175
1142	1176	#endif /* defined(USE_TK_STUBS) */
1143	1177

1159	1193	#undef TkSetRegion
1160	1194	#undef TkSubtractRegion
1161	1195	#undef TkUnionRectWithRegion
	1196	#undef TkpCmapStressed_
	1197	#undef TkpSync_
	1198	#undef TkUnixContainerId_
	1199	#undef TkUnixDoOneXEvent_
	1200	#undef TkUnixSetMenubar_
	1201	#undef TkWmCleanup_
	1202	#undef TkSendCleanup_
	1203	#undef TkpTestsendCmd_
1162	1204
1163	1205	#define TkClipBox(rgn, rect) XClipBox((Region) rgn, rect)
1164	1206	#define TkCreateRegion() (TkRegion) XCreateRegion()

1174	1216
1175	1217	#endif /* UNIX */
1176	1218
	1219	#if !defined(MAC_OSX_TK)
	1220	# undef TkpWillDrawWidget
	1221	# undef TkpRedrawWidget
	1222	# define TkpWillDrawWidget(w) 0
	1223	# define TkpRedrawWidget(w)
	1224	#endif
	1225
1177	1226	#endif /* _TKINTDECLS */
1178	1227

+144

-17

generic/tkIntPlatDecls.h less more

150	150	EXTERN void TkGenerateActivateEvents(TkWindow *winPtr,
151	151	int active);
152	152	/* Slot 1 is reserved */
153		/* Slot 2 is reserved */
	153	/* 2 */
	154	EXTERN void TkGenerateActivateEvents_(TkWindow *winPtr,
	155	int active);
154	156	/* 3 */
155	157	EXTERN void TkPointerDeadWindow(TkWindow *winPtr);
156	158	/* 4 */

196	198	EXTERN void * TkMacOSXMakeStippleMap(Drawable d1, Drawable d2);
197	199	/* 25 */
198	200	EXTERN void TkMacOSXMenuClick(void);
199		/* 26 */
200		EXTERN void TkMacOSXRegisterOffScreenWindow(Window window,
201		void *portPtr);
	201	/* Slot 26 is reserved */
202	202	/* 27 */
203	203	EXTERN int TkMacOSXResizable(TkWindow *winPtr);
204	204	/* 28 */

211	211	EXTERN void TkMacOSXSetUpGraphicsPort(GC gc, void *destPort);
212	212	/* 32 */
213	213	EXTERN void TkMacOSXUpdateClipRgn(TkWindow *winPtr);
214		/* 33 */
215		EXTERN void TkMacOSXUnregisterMacWindow(void *portPtr);
	214	/* Slot 33 is reserved */
216	215	/* 34 */
217	216	EXTERN int TkMacOSXUseMenuID(short macID);
218	217	/* 35 */

265	264	/* 0 */
266	265	EXTERN void TkCreateXEventSource(void);
267	266	/* Slot 1 is reserved */
268		/* Slot 2 is reserved */
	267	/* 2 */
	268	EXTERN void TkGenerateActivateEvents(TkWindow *winPtr,
	269	int active);
269	270	/* 3 */
270	271	EXTERN int TkpCmapStressed(Tk_Window tkwin, Colormap colormap);
271	272	/* 4 */

288	289	EXTERN int TkpWmSetState(TkWindow *winPtr, int state);
289	290	/* 13 */
290	291	EXTERN int TkpTestsendCmd(ClientData clientData,
	292	Tcl_Interp *interp, int objc,
	293	Tcl_Obj *const objv[]);
	294	/* Slot 14 is reserved */
	295	/* Slot 15 is reserved */
	296	/* Slot 16 is reserved */
	297	/* Slot 17 is reserved */
	298	/* Slot 18 is reserved */
	299	/* Slot 19 is reserved */
	300	/* Slot 20 is reserved */
	301	/* Slot 21 is reserved */
	302	/* Slot 22 is reserved */
	303	/* Slot 23 is reserved */
	304	/* Slot 24 is reserved */
	305	/* Slot 25 is reserved */
	306	/* Slot 26 is reserved */
	307	/* Slot 27 is reserved */
	308	/* Slot 28 is reserved */
	309	/* Slot 29 is reserved */
	310	/* Slot 30 is reserved */
	311	/* Slot 31 is reserved */
	312	/* Slot 32 is reserved */
	313	/* Slot 33 is reserved */
	314	/* Slot 34 is reserved */
	315	/* Slot 35 is reserved */
	316	/* Slot 36 is reserved */
	317	/* Slot 37 is reserved */
	318	/* 38 */
	319	EXTERN int TkpCmapStressed_(Tk_Window tkwin, Colormap colormap);
	320	/* 39 */
	321	EXTERN void TkpSync_(Display *display);
	322	/* 40 */
	323	EXTERN Window TkUnixContainerId_(TkWindow *winPtr);
	324	/* 41 */
	325	EXTERN int TkUnixDoOneXEvent_(Tcl_Time *timePtr);
	326	/* 42 */
	327	EXTERN void TkUnixSetMenubar_(Tk_Window tkwin, Tk_Window menubar);
	328	/* 43 */
	329	EXTERN void TkWmCleanup_(TkDisplay *dispPtr);
	330	/* 44 */
	331	EXTERN void TkSendCleanup_(TkDisplay *dispPtr);
	332	/* 45 */
	333	EXTERN int TkpTestsendCmd_(ClientData clientData,
291	334	Tcl_Interp *interp, int objc,
292	335	Tcl_Obj *const objv[]);
293	336	#endif /* X11 */

349	392	#ifdef MAC_OSX_TK /* AQUA */
350	393	void (tkGenerateActivateEvents) (TkWindow winPtr, int active); /* 0 */
351	394	void (*reserved1)(void);
352		void (*reserved2)(void);
	395	void (tkGenerateActivateEvents_) (TkWindow winPtr, int active); /* 2 */
353	396	void (tkPointerDeadWindow) (TkWindow winPtr); /* 3 */
354	397	void (tkpSetCapture) (TkWindow winPtr); /* 4 */
355	398	void (tkpSetCursor) (TkpCursor cursor); / 5 */

373	416	void (tkMacOSXMakeRealWindowExist) (TkWindow winPtr); /* 23 */
374	417	void * (tkMacOSXMakeStippleMap) (Drawable d1, Drawable d2); / 24 */
375	418	void (tkMacOSXMenuClick) (void); / 25 */
376		void (tkMacOSXRegisterOffScreenWindow) (Window window, void portPtr); /* 26 */
	419	void (*reserved26)(void);
377	420	int (tkMacOSXResizable) (TkWindow winPtr); /* 27 */
378	421	void (tkMacOSXSetHelpMenuItemCount) (void); / 28 */
379	422	void (tkMacOSXSetScrollbarGrow) (TkWindow winPtr, int flag); /* 29 */
380	423	void (tkMacOSXSetUpClippingRgn) (Drawable drawable); / 30 */
381	424	void (tkMacOSXSetUpGraphicsPort) (GC gc, void destPort); /* 31 */
382	425	void (tkMacOSXUpdateClipRgn) (TkWindow winPtr); /* 32 */
383		void (tkMacOSXUnregisterMacWindow) (void portPtr); /* 33 */
	426	void (*reserved33)(void);
384	427	int (tkMacOSXUseMenuID) (short macID); / 34 */
385	428	TkRegion (tkMacOSXVisableClipRgn) (TkWindow winPtr); /* 35 */
386	429	void (tkMacOSXWinBounds) (TkWindow winPtr, void geometry); / 36 */

407	450	#if !(defined(_WIN32) \|\| defined(__CYGWIN__) \|\| defined(MAC_OSX_TK)) /* X11 */
408	451	void (tkCreateXEventSource) (void); / 0 */
409	452	void (*reserved1)(void);
410		void (*reserved2)(void);
	453	void (tkGenerateActivateEvents) (TkWindow winPtr, int active); /* 2 */
411	454	int (tkpCmapStressed) (Tk_Window tkwin, Colormap colormap); / 3 */
412	455	void (tkpSync) (Display display); /* 4 */
413	456	Window (tkUnixContainerId) (TkWindow winPtr); /* 5 */

419	462	void (*reserved11)(void);
420	463	int (tkpWmSetState) (TkWindow winPtr, int state); /* 12 */
421	464	int (tkpTestsendCmd) (ClientData clientData, Tcl_Interp interp, int objc, Tcl_Obj const objv[]); / 13 */
	465	void (*reserved14)(void);
	466	void (*reserved15)(void);
	467	void (*reserved16)(void);
	468	void (*reserved17)(void);
	469	void (*reserved18)(void);
	470	void (*reserved19)(void);
	471	void (*reserved20)(void);
	472	void (*reserved21)(void);
	473	void (*reserved22)(void);
	474	void (*reserved23)(void);
	475	void (*reserved24)(void);
	476	void (*reserved25)(void);
	477	void (*reserved26)(void);
	478	void (*reserved27)(void);
	479	void (*reserved28)(void);
	480	void (*reserved29)(void);
	481	void (*reserved30)(void);
	482	void (*reserved31)(void);
	483	void (*reserved32)(void);
	484	void (*reserved33)(void);
	485	void (*reserved34)(void);
	486	void (*reserved35)(void);
	487	void (*reserved36)(void);
	488	void (*reserved37)(void);
	489	int (tkpCmapStressed_) (Tk_Window tkwin, Colormap colormap); / 38 */
	490	void (tkpSync_) (Display display); /* 39 */
	491	Window (tkUnixContainerId_) (TkWindow winPtr); /* 40 */
	492	int (tkUnixDoOneXEvent_) (Tcl_Time timePtr); /* 41 */
	493	void (tkUnixSetMenubar_) (Tk_Window tkwin, Tk_Window menubar); / 42 */
	494	void (tkWmCleanup_) (TkDisplay dispPtr); /* 43 */
	495	void (tkSendCleanup_) (TkDisplay dispPtr); /* 44 */
	496	int (tkpTestsendCmd_) (ClientData clientData, Tcl_Interp interp, int objc, Tcl_Obj const objv[]); / 45 */
422	497	#endif /* X11 */
423	498	} TkIntPlatStubs;
424	499

534	609	#define TkGenerateActivateEvents \
535	610	(tkIntPlatStubsPtr->tkGenerateActivateEvents) /* 0 */
536	611	/* Slot 1 is reserved */
537		/* Slot 2 is reserved */
	612	#define TkGenerateActivateEvents_ \
	613	(tkIntPlatStubsPtr->tkGenerateActivateEvents_) /* 2 */
538	614	#define TkPointerDeadWindow \
539	615	(tkIntPlatStubsPtr->tkPointerDeadWindow) /* 3 */
540	616	#define TkpSetCapture \

577	653	(tkIntPlatStubsPtr->tkMacOSXMakeStippleMap) /* 24 */
578	654	#define TkMacOSXMenuClick \
579	655	(tkIntPlatStubsPtr->tkMacOSXMenuClick) /* 25 */
580		#define TkMacOSXRegisterOffScreenWindow \
581		(tkIntPlatStubsPtr->tkMacOSXRegisterOffScreenWindow) /* 26 */
	656	/* Slot 26 is reserved */
582	657	#define TkMacOSXResizable \
583	658	(tkIntPlatStubsPtr->tkMacOSXResizable) /* 27 */
584	659	#define TkMacOSXSetHelpMenuItemCount \

591	666	(tkIntPlatStubsPtr->tkMacOSXSetUpGraphicsPort) /* 31 */
592	667	#define TkMacOSXUpdateClipRgn \
593	668	(tkIntPlatStubsPtr->tkMacOSXUpdateClipRgn) /* 32 */
594		#define TkMacOSXUnregisterMacWindow \
595		(tkIntPlatStubsPtr->tkMacOSXUnregisterMacWindow) /* 33 */
	669	/* Slot 33 is reserved */
596	670	#define TkMacOSXUseMenuID \
597	671	(tkIntPlatStubsPtr->tkMacOSXUseMenuID) /* 34 */
598	672	#define TkMacOSXVisableClipRgn \

640	714	#define TkCreateXEventSource \
641	715	(tkIntPlatStubsPtr->tkCreateXEventSource) /* 0 */
642	716	/* Slot 1 is reserved */
643		/* Slot 2 is reserved */
	717	#define TkGenerateActivateEvents \
	718	(tkIntPlatStubsPtr->tkGenerateActivateEvents) /* 2 */
644	719	#define TkpCmapStressed \
645	720	(tkIntPlatStubsPtr->tkpCmapStressed) /* 3 */
646	721	#define TkpSync \

662	737	(tkIntPlatStubsPtr->tkpWmSetState) /* 12 */
663	738	#define TkpTestsendCmd \
664	739	(tkIntPlatStubsPtr->tkpTestsendCmd) /* 13 */
	740	/* Slot 14 is reserved */
	741	/* Slot 15 is reserved */
	742	/* Slot 16 is reserved */
	743	/* Slot 17 is reserved */
	744	/* Slot 18 is reserved */
	745	/* Slot 19 is reserved */
	746	/* Slot 20 is reserved */
	747	/* Slot 21 is reserved */
	748	/* Slot 22 is reserved */
	749	/* Slot 23 is reserved */
	750	/* Slot 24 is reserved */
	751	/* Slot 25 is reserved */
	752	/* Slot 26 is reserved */
	753	/* Slot 27 is reserved */
	754	/* Slot 28 is reserved */
	755	/* Slot 29 is reserved */
	756	/* Slot 30 is reserved */
	757	/* Slot 31 is reserved */
	758	/* Slot 32 is reserved */
	759	/* Slot 33 is reserved */
	760	/* Slot 34 is reserved */
	761	/* Slot 35 is reserved */
	762	/* Slot 36 is reserved */
	763	/* Slot 37 is reserved */
	764	#define TkpCmapStressed_ \
	765	(tkIntPlatStubsPtr->tkpCmapStressed_) /* 38 */
	766	#define TkpSync_ \
	767	(tkIntPlatStubsPtr->tkpSync_) /* 39 */
	768	#define TkUnixContainerId_ \
	769	(tkIntPlatStubsPtr->tkUnixContainerId_) /* 40 */
	770	#define TkUnixDoOneXEvent_ \
	771	(tkIntPlatStubsPtr->tkUnixDoOneXEvent_) /* 41 */
	772	#define TkUnixSetMenubar_ \
	773	(tkIntPlatStubsPtr->tkUnixSetMenubar_) /* 42 */
	774	#define TkWmCleanup_ \
	775	(tkIntPlatStubsPtr->tkWmCleanup_) /* 43 */
	776	#define TkSendCleanup_ \
	777	(tkIntPlatStubsPtr->tkSendCleanup_) /* 44 */
	778	#define TkpTestsendCmd_ \
	779	(tkIntPlatStubsPtr->tkpTestsendCmd_) /* 45 */
665	780	#endif /* X11 */
666	781
667	782	#endif /* defined(USE_TK_STUBS) */
668	783
669	784	/* !END!: Do not edit above this line. */
	785
	786	#undef TkpCmapStressed_
	787	#undef TkpSync_
	788	#undef TkUnixContainerId_
	789	#undef TkUnixDoOneXEvent_
	790	#undef TkUnixSetMenubar_
	791	#undef TkWmCleanup_
	792	#undef TkSendCleanup_
	793	#undef TkpTestsendCmd_
	794	#undef TkGenerateActivateEvents_
	795
	796	#define TkMacOSXGetContainer TkGetTransientMaster
670	797
671	798	#undef TCL_STORAGE_CLASS
672	799	#define TCL_STORAGE_CLASS DLLIMPORT

+162

-9

generic/tkIntXlibDecls.h less more

412	412	EXTERN int XPutImage(Display d, Drawable dr, GC gc, XImage im,
413	413	int sx, int sy, int dx, int dy,
414	414	unsigned int w, unsigned int h);
	415	/* Slot 138 is reserved */
	416	/* Slot 139 is reserved */
	417	/* Slot 140 is reserved */
	418	/* Slot 141 is reserved */
	419	/* Slot 142 is reserved */
	420	/* Slot 143 is reserved */
	421	/* Slot 144 is reserved */
	422	/* Slot 145 is reserved */
	423	/* Slot 146 is reserved */
	424	/* Slot 147 is reserved */
	425	/* Slot 148 is reserved */
	426	/* Slot 149 is reserved */
	427	/* Slot 150 is reserved */
	428	/* Slot 151 is reserved */
	429	/* Slot 152 is reserved */
	430	/* Slot 153 is reserved */
	431	/* Slot 154 is reserved */
	432	/* Slot 155 is reserved */
	433	/* Slot 156 is reserved */
	434	/* Slot 157 is reserved */
	435	/* 158 */
	436	EXTERN void TkUnusedStubEntry(void);
415	437	#endif /* WIN */
416	438	#ifdef MAC_OSX_TK /* AQUA */
417	439	/* 0 */

690	712	/* Slot 103 is reserved */
691	713	/* Slot 104 is reserved */
692	714	/* Slot 105 is reserved */
693		/* Slot 106 is reserved */
	715	/* 106 */
	716	EXTERN int XSetClipRectangles(Display *display, GC gc,
	717	int clip_x_origin, int clip_y_origin,
	718	XRectangle rectangles[], int n, int ordering);
694	719	/* 107 */
695	720	EXTERN int XFlush(Display *display);
696	721	/* 108 */

711	736	/* Slot 117 is reserved */
712	737	/* Slot 118 is reserved */
713	738	/* Slot 119 is reserved */
714		/* Slot 120 is reserved */
	739	/* 120 */
	740	EXTERN int XOffsetRegion(void *rgn, int dx, int dy);
715	741	/* Slot 121 is reserved */
716	742	/* Slot 122 is reserved */
717	743	/* Slot 123 is reserved */

720	746	/* Slot 126 is reserved */
721	747	/* Slot 127 is reserved */
722	748	/* Slot 128 is reserved */
723		/* Slot 129 is reserved */
	749	/* 129 */
	750	EXTERN int XLowerWindow(Display *d, Window w);
724	751	/* Slot 130 is reserved */
725	752	/* Slot 131 is reserved */
726	753	/* Slot 132 is reserved */

732	759	EXTERN int XPutImage(Display d, Drawable dr, GC gc, XImage im,
733	760	int sx, int sy, int dx, int dy,
734	761	unsigned int w, unsigned int h);
	762	/* Slot 138 is reserved */
	763	/* Slot 139 is reserved */
	764	/* Slot 140 is reserved */
	765	/* Slot 141 is reserved */
	766	/* Slot 142 is reserved */
	767	/* Slot 143 is reserved */
	768	/* 144 */
	769	EXTERN void XDestroyIC(XIC xic);
	770	/* 145 */
	771	EXTERN Cursor XCreatePixmapCursor(Display *d, Pixmap p1, Pixmap p2,
	772	XColor x1, XColor x2, unsigned int ui1,
	773	unsigned int ui2);
	774	/* 146 */
	775	EXTERN Cursor XCreateGlyphCursor(Display *d, Font f1, Font f2,
	776	unsigned int ui1, unsigned int ui2,
	777	XColor _Xconst x1, XColor _Xconst x2);
	778	/* Slot 147 is reserved */
	779	/* Slot 148 is reserved */
	780	/* Slot 149 is reserved */
	781	/* Slot 150 is reserved */
	782	/* Slot 151 is reserved */
	783	/* Slot 152 is reserved */
	784	/* Slot 153 is reserved */
	785	/* Slot 154 is reserved */
	786	/* Slot 155 is reserved */
	787	/* Slot 156 is reserved */
	788	/* 157 */
	789	EXTERN KeySym XkbKeycodeToKeysym(Display *d, unsigned int k, int g,
	790	int i);
	791	/* 158 */
	792	EXTERN void TkUnusedStubEntry(void);
735	793	#endif /* AQUA */
736	794
737	795	typedef struct TkIntXlibStubs {

877	935	int (xDrawPoints) (Display d, Drawable dr, GC gc, XPoint p, int n, int m); / 135 */
878	936	int (xReparentWindow) (Display d, Window w, Window p, int x, int y); /* 136 */
879	937	int (xPutImage) (Display d, Drawable dr, GC gc, XImage im, int sx, int sy, int dx, int dy, unsigned int w, unsigned int h); / 137 */
	938	void (*reserved138)(void);
	939	void (*reserved139)(void);
	940	void (*reserved140)(void);
	941	void (*reserved141)(void);
	942	void (*reserved142)(void);
	943	void (*reserved143)(void);
	944	void (*reserved144)(void);
	945	void (*reserved145)(void);
	946	void (*reserved146)(void);
	947	void (*reserved147)(void);
	948	void (*reserved148)(void);
	949	void (*reserved149)(void);
	950	void (*reserved150)(void);
	951	void (*reserved151)(void);
	952	void (*reserved152)(void);
	953	void (*reserved153)(void);
	954	void (*reserved154)(void);
	955	void (*reserved155)(void);
	956	void (*reserved156)(void);
	957	void (*reserved157)(void);
	958	void (tkUnusedStubEntry) (void); / 158 */
880	959	#endif /* WIN */
881	960	#ifdef MAC_OSX_TK /* AQUA */
882	961	int (xSetDashes) (Display display, GC gc, int dash_offset, _Xconst char dash_list, int n); / 0 */

985	1064	void (*reserved103)(void);
986	1065	void (*reserved104)(void);
987	1066	void (*reserved105)(void);
988		void (*reserved106)(void);
	1067	int (xSetClipRectangles) (Display display, GC gc, int clip_x_origin, int clip_y_origin, XRectangle rectangles[], int n, int ordering); /* 106 */
989	1068	int (xFlush) (Display display); /* 107 */
990	1069	int (xGrabServer) (Display display); /* 108 */
991	1070	int (xUngrabServer) (Display display); /* 109 */

999	1078	void (*reserved117)(void);
1000	1079	void (*reserved118)(void);
1001	1080	void (*reserved119)(void);
1002		void (*reserved120)(void);
	1081	int (xOffsetRegion) (void rgn, int dx, int dy); /* 120 */
1003	1082	void (*reserved121)(void);
1004	1083	void (*reserved122)(void);
1005	1084	void (*reserved123)(void);

1008	1087	void (*reserved126)(void);
1009	1088	void (*reserved127)(void);
1010	1089	void (*reserved128)(void);
1011		void (*reserved129)(void);
	1090	int (xLowerWindow) (Display d, Window w); /* 129 */
1012	1091	void (*reserved130)(void);
1013	1092	void (*reserved131)(void);
1014	1093	void (*reserved132)(void);

1017	1096	void (*reserved135)(void);
1018	1097	void (*reserved136)(void);
1019	1098	int (xPutImage) (Display d, Drawable dr, GC gc, XImage im, int sx, int sy, int dx, int dy, unsigned int w, unsigned int h); / 137 */
	1099	void (*reserved138)(void);
	1100	void (*reserved139)(void);
	1101	void (*reserved140)(void);
	1102	void (*reserved141)(void);
	1103	void (*reserved142)(void);
	1104	void (*reserved143)(void);
	1105	void (xDestroyIC) (XIC xic); / 144 */
	1106	Cursor (xCreatePixmapCursor) (Display d, Pixmap p1, Pixmap p2, XColor x1, XColor x2, unsigned int ui1, unsigned int ui2); /* 145 */
	1107	Cursor (xCreateGlyphCursor) (Display d, Font f1, Font f2, unsigned int ui1, unsigned int ui2, XColor _Xconst x1, XColor _Xconst x2); /* 146 */
	1108	void (*reserved147)(void);
	1109	void (*reserved148)(void);
	1110	void (*reserved149)(void);
	1111	void (*reserved150)(void);
	1112	void (*reserved151)(void);
	1113	void (*reserved152)(void);
	1114	void (*reserved153)(void);
	1115	void (*reserved154)(void);
	1116	void (*reserved155)(void);
	1117	void (*reserved156)(void);
	1118	KeySym (xkbKeycodeToKeysym) (Display d, unsigned int k, int g, int i); /* 157 */
	1119	void (tkUnusedStubEntry) (void); / 158 */
1020	1120	#endif /* AQUA */
1021	1121	} TkIntXlibStubs;
1022	1122

1297	1397	(tkIntXlibStubsPtr->xReparentWindow) /* 136 */
1298	1398	#define XPutImage \
1299	1399	(tkIntXlibStubsPtr->xPutImage) /* 137 */
	1400	/* Slot 138 is reserved */
	1401	/* Slot 139 is reserved */
	1402	/* Slot 140 is reserved */
	1403	/* Slot 141 is reserved */
	1404	/* Slot 142 is reserved */
	1405	/* Slot 143 is reserved */
	1406	/* Slot 144 is reserved */
	1407	/* Slot 145 is reserved */
	1408	/* Slot 146 is reserved */
	1409	/* Slot 147 is reserved */
	1410	/* Slot 148 is reserved */
	1411	/* Slot 149 is reserved */
	1412	/* Slot 150 is reserved */
	1413	/* Slot 151 is reserved */
	1414	/* Slot 152 is reserved */
	1415	/* Slot 153 is reserved */
	1416	/* Slot 154 is reserved */
	1417	/* Slot 155 is reserved */
	1418	/* Slot 156 is reserved */
	1419	/* Slot 157 is reserved */
	1420	#define TkUnusedStubEntry \
	1421	(tkIntXlibStubsPtr->tkUnusedStubEntry) /* 158 */
1300	1422	#endif /* WIN */
1301	1423	#ifdef MAC_OSX_TK /* AQUA */
1302	1424	#define XSetDashes \

1497	1619	/* Slot 103 is reserved */
1498	1620	/* Slot 104 is reserved */
1499	1621	/* Slot 105 is reserved */
1500		/* Slot 106 is reserved */
	1622	#define XSetClipRectangles \
	1623	(tkIntXlibStubsPtr->xSetClipRectangles) /* 106 */
1501	1624	#define XFlush \
1502	1625	(tkIntXlibStubsPtr->xFlush) /* 107 */
1503	1626	#define XGrabServer \

1518	1641	/* Slot 117 is reserved */
1519	1642	/* Slot 118 is reserved */
1520	1643	/* Slot 119 is reserved */
1521		/* Slot 120 is reserved */
	1644	#define XOffsetRegion \
	1645	(tkIntXlibStubsPtr->xOffsetRegion) /* 120 */
1522	1646	/* Slot 121 is reserved */
1523	1647	/* Slot 122 is reserved */
1524	1648	/* Slot 123 is reserved */

1527	1651	/* Slot 126 is reserved */
1528	1652	/* Slot 127 is reserved */
1529	1653	/* Slot 128 is reserved */
1530		/* Slot 129 is reserved */
	1654	#define XLowerWindow \
	1655	(tkIntXlibStubsPtr->xLowerWindow) /* 129 */
1531	1656	/* Slot 130 is reserved */
1532	1657	/* Slot 131 is reserved */
1533	1658	/* Slot 132 is reserved */

1537	1662	/* Slot 136 is reserved */
1538	1663	#define XPutImage \
1539	1664	(tkIntXlibStubsPtr->xPutImage) /* 137 */
	1665	/* Slot 138 is reserved */
	1666	/* Slot 139 is reserved */
	1667	/* Slot 140 is reserved */
	1668	/* Slot 141 is reserved */
	1669	/* Slot 142 is reserved */
	1670	/* Slot 143 is reserved */
	1671	#define XDestroyIC \
	1672	(tkIntXlibStubsPtr->xDestroyIC) /* 144 */
	1673	#define XCreatePixmapCursor \
	1674	(tkIntXlibStubsPtr->xCreatePixmapCursor) /* 145 */
	1675	#define XCreateGlyphCursor \
	1676	(tkIntXlibStubsPtr->xCreateGlyphCursor) /* 146 */
	1677	/* Slot 147 is reserved */
	1678	/* Slot 148 is reserved */
	1679	/* Slot 149 is reserved */
	1680	/* Slot 150 is reserved */
	1681	/* Slot 151 is reserved */
	1682	/* Slot 152 is reserved */
	1683	/* Slot 153 is reserved */
	1684	/* Slot 154 is reserved */
	1685	/* Slot 155 is reserved */
	1686	/* Slot 156 is reserved */
	1687	#define XkbKeycodeToKeysym \
	1688	(tkIntXlibStubsPtr->xkbKeycodeToKeysym) /* 157 */
	1689	#define TkUnusedStubEntry \
	1690	(tkIntXlibStubsPtr->tkUnusedStubEntry) /* 158 */
1540	1691	#endif /* AQUA */
1541	1692
1542	1693	#endif /* defined(USE_TK_STUBS) */

1546	1697	#undef TCL_STORAGE_CLASS
1547	1698	#define TCL_STORAGE_CLASS DLLIMPORT
1548	1699
	1700	#undef TkUnusedStubEntry
	1701
1549	1702	#endif /* _TKINTXLIBDECLS */

+4

-4

generic/tkListbox.c less more

3317	3317
3318	3318	/*
3319	3319	* We must hold onto the interpreter from the listPtr because the data at
3320		* listPtr might be freed as a result of the Tcl_VarEval.
	3320	* listPtr might be freed as a result of the Tcl_EvalEx.
3321	3321	*/
3322	3322
3323	3323	interp = listPtr->interp;

3328	3328	Tcl_DStringAppend(&buf, firstStr, -1);
3329	3329	Tcl_DStringAppend(&buf, " ", -1);
3330	3330	Tcl_DStringAppend(&buf, lastStr, -1);
3331		result = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), -1, 0);
	3331	result = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), -1, TCL_EVAL_GLOBAL);
3332	3332	Tcl_DStringFree(&buf);
3333	3333	if (result != TCL_OK) {
3334	3334	Tcl_AddErrorInfo(interp,

3389	3389
3390	3390	/*
3391	3391	* We must hold onto the interpreter because the data referred to at
3392		* listPtr might be freed as a result of the call to Tcl_VarEval.
	3392	* listPtr might be freed as a result of the call to Tcl_EvalEx.
3393	3393	*/
3394	3394
3395	3395	interp = listPtr->interp;

3400	3400	Tcl_DStringAppend(&buf, firstStr, -1);
3401	3401	Tcl_DStringAppend(&buf, " ", -1);
3402	3402	Tcl_DStringAppend(&buf, lastStr, -1);
3403		result = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), -1, 0);
	3403	result = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), -1, TCL_EVAL_GLOBAL);
3404	3404	Tcl_DStringFree(&buf);
3405	3405	if (result != TCL_OK) {
3406	3406	Tcl_AddErrorInfo(interp,

+14

-35

generic/tkMain.c less more

13	13	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
14	14	*/
15	15
16		/**
17		* On Windows, this file needs to be compiled twice, once with
18		* TK_ASCII_MAIN defined. This way both Tk_MainEx and Tk_MainExW
19		* can be implemented, sharing the same source code.
20		*/
21		#if defined(TK_ASCII_MAIN)
22		# ifdef UNICODE
23		# undef UNICODE
24		# undef _UNICODE
25		# else
26		# define UNICODE
27		# define _UNICODE
28		# endif
29		#endif
30
31	16	#include "tkInt.h"
32		#include <ctype.h>
33		#include <stdio.h>
34		#include <string.h>
35		#ifdef NO_STDLIB_H
36		# include "../compat/stdlib.h"
37		#else
38		# include <stdlib.h>
39		#endif
40	17
41	18	extern int TkCygwinMainEx(int, char *, Tcl_AppInitProc , Tcl_Interp *);
42	19

54	31	* to strcmp here.
55	32	*/
56	33	#ifdef _WIN32
	34	#ifdef __cplusplus
	35	extern "C" {
	36	#endif
57	37	/* Little hack to eliminate the need for "tclInt.h" here:
58	38	Just copy a small portion of TclIntPlatStubs, just
59	39	enough to make it work. See [600b72bfbc] */

64	44	int (tclpIsAtty) (int fd); / 16 */
65	45	} TclIntPlatStubs;
66	46	extern const TclIntPlatStubs *tclIntPlatStubsPtr;
	47	#ifdef __cplusplus
	48	}
	49	#endif
67	50	# include "tkWinInt.h"
68	51	#else
69	52	# define TCHAR char

77	60	#include "tkMacOSXInt.h"
78	61	#endif
79	62
80		/*
81		* Further on, in UNICODE mode we just use Tcl_NewUnicodeObj, otherwise
82		* NewNativeObj is needed (which provides proper conversion from native
83		* encoding to UTF-8).
84		*/
85
86	63	static inline Tcl_Obj *
87	64	NewNativeObj(
88	65	TCHAR *string)

90	67	Tcl_Obj *obj;
91	68	Tcl_DString ds;
92	69
93		#ifdef UNICODE
94		Tcl_WinTCharToUtf(string, -1, &ds);
	70	#if defined(_WIN32) && defined(UNICODE)
	71	Tcl_DStringInit(&ds);
	72	Tcl_WCharToUtfDString(string, wcslen(string), &ds);
95	73	#else
96	74	Tcl_ExternalToUtfDString(NULL, (char *) string, -1, &ds);
97	75	#endif

421	399	*----------------------------------------------------------------------
422	400	*/
423	401
424		/* ARGSUSED */
425	402	static void
426	403	StdinProc(
427	404	ClientData clientData, /* The state of interactive cmd line */
428	405	int mask) /* Not used. */
429	406	{
430	407	char *cmd;
431		int code, count;
432		InteractiveState *isPtr = clientData;
	408	int code;
	409	int count;
	410	InteractiveState isPtr = (InteractiveState )clientData;
433	411	Tcl_Channel chan = isPtr->input;
434	412	Tcl_Interp *interp = isPtr->interp;
	413	(void)mask;
435	414
436	415	count = Tcl_Gets(chan, &isPtr->line);
437	416
438		if (count == -1 && !isPtr->gotPartial) {
	417	if ((count == -1) && !isPtr->gotPartial) {
439	418	if (isPtr->tty) {
440	419	Tcl_Exit(0);
441	420	} else {

+23

-25

generic/tkMenu.c less more

38	38	* right; they have a Tk window and pathname associated with them; they have a
39	39	* TkMenu structure and array of entries. However, they are linked with the
40	40	* original menu that they were cloned from. The reflect the attributes of the
41		* original, or "master", menu. So if an item is added to a menu, and that
	41	* original, or "main", menu. So if an item is added to a menu, and that
42	42	* menu has clones, then the item must be added to all of its clones also.
43	43	* Menus are cloned when a menu is torn-off or when a menu is assigned as a
44	44	* menubar using the "-menu" option of the toplevel's pathname configure
45	45	* subcommand. When a clone is destroyed, only the clone is destroyed, but
46		* when the master menu is destroyed, all clones are also destroyed. This
	46	* when the main menu is destroyed, all clones are also destroyed. This
47	47	* allows the developer to just deal with one set of menus when creating and
48	48	* destroying.
49	49	*

512	512	nextCascadePtr = cascadeListPtr->nextCascadePtr;
513	513
514	514	/*
515		* If we have a new master menu, and an existing cloned menu
	515	* If we have a new main menu, and an existing cloned menu
516	516	* points to this menu in a cascade entry, we have to clone the
517	517	* new menu and point the entry to the clone instead of the menu
518	518	* we are creating. Otherwise, ConfigureMenuEntry will hook up the

1018	1018	Tcl_DStringInit(&ds);
1019	1019	Tcl_DStringAppend(&ds, "tk::TearOffMenu ", -1);
1020	1020	Tcl_DStringAppend(&ds, Tk_PathName(menuPtr->tkwin), -1);
1021		result = Tcl_EvalEx(interp, Tcl_DStringValue(&ds), -1, 0);
	1021	result = Tcl_EvalEx(interp, Tcl_DStringValue(&ds), -1, TCL_EVAL_GLOBAL);
1022	1022	Tcl_DStringFree(&ds);
1023	1023	} else if ((mePtr->type == CHECK_BUTTON_ENTRY)
1024	1024	&& (mePtr->namePtr != NULL)) {

1099	1099	TkMenu *menuInstancePtr;
1100	1100	TkMenuEntry cascadePtr, nextCascadePtr;
1101	1101	Tcl_Obj *newObjv[2];
1102		TkMenu *parentMasterMenuPtr;
1103		TkMenuEntry *parentMasterEntryPtr;
	1102	TkMenu *parentMainMenuPtr;
	1103	TkMenuEntry *parentMainEntryPtr;
1104	1104	ThreadSpecificData *tsdPtr =
1105	1105	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
1106	1106

1109	1109	* entries need to be told that the menu is going away. We need to clear
1110	1110	* the menu ptr field in the menu reference at this point in the code so
1111	1111	* that everything else can forget about this menu properly. We also need
1112		* to reset -menu field of all entries that are not master menus back to
1113		* this entry name if this is a master menu pointed to by another master
	1112	* to reset -menu field of all entries that are not main menus back to
	1113	* this entry name if this is a main menu pointed to by another main
1114	1114	* menu. If there is a clone menu that points to this menu, then this menu
1115	1115	* is itself a clone, so when this menu goes away, the -menu field of the
1116		* pointing entry must be set back to this menu's master menu name so that
	1116	* pointing entry must be set back to this menu's main menu name so that
1117	1117	* later if another menu is created the cascade hierarchy can be
1118	1118	* maintained.
1119	1119	*/

1134	1134	if (menuPtr->masterMenuPtr != menuPtr) {
1135	1135	Tcl_Obj *menuNamePtr = Tcl_NewStringObj("-menu", -1);
1136	1136
1137		parentMasterMenuPtr = cascadePtr->menuPtr->masterMenuPtr;
1138		parentMasterEntryPtr =
1139		parentMasterMenuPtr->entries[cascadePtr->index];
	1137	parentMainMenuPtr = cascadePtr->menuPtr->masterMenuPtr;
	1138	parentMainEntryPtr =
	1139	parentMainMenuPtr->entries[cascadePtr->index];
1140	1140	newObjv[0] = menuNamePtr;
1141		newObjv[1] = parentMasterEntryPtr->namePtr;
	1141	newObjv[1] = parentMainEntryPtr->namePtr;
1142	1142
1143	1143	/*
1144	1144	* It is possible that the menu info is out of sync, and these

1168	1168	}
1169	1169	}
1170	1170	} else if (menuPtr->nextInstancePtr != NULL) {
1171		Tcl_Panic("Attempting to delete master menu when there are still clones");
	1171	Tcl_Panic("Attempting to delete main menu when there are still clones");
1172	1172	}
1173	1173
1174	1174	/*

1208	1208	*
1209	1209	* This function is invoked by Tcl_EventuallyFree or Tcl_Release to clean
1210	1210	* up the internal structure of a menu at a safe time (when no-one is
1211		* using it anymore). If called on a master instance, destroys all of the
1212		* slave instances. If called on a non-master instance, just destroys
	1211	* using it anymore). If called on a main instance, destroys all of the
	1212	* instances. If called on a non-main instance, just destroys
1213	1213	* that instance.
1214	1214	*
1215	1215	* Results:

1570	1570	* menuTypeName field to tell that this is a menu bar.
1571	1571	*/
1572	1572
1573		if (menuListPtr->menuType == MASTER_MENU) {
	1573	if (menuListPtr->menuType == MAIN_MENU) {
1574	1574	int typeFlag = TK_MAKE_MENU_POPUP;
1575	1575	Tk_Window tkwin = menuPtr->tkwin;
1576	1576

1622	1622	}
1623	1623	} else if ((menuListPtr->numEntries > 0)
1624	1624	&& (menuListPtr->entries[0]->type == TEAROFF_ENTRY)) {
1625		int i;
1626	1625
1627	1626	Tcl_EventuallyFree(menuListPtr->entries[0], (Tcl_FreeProc *) DestroyMenuEntry);
1628	1627

1818	1817	if ((mePtr->type == CHECK_BUTTON_ENTRY)
1819	1818	\|\| (mePtr->type == RADIO_BUTTON_ENTRY)) {
1820	1819	Tcl_Obj *valuePtr;
1821		const char *name;
1822	1820
1823	1821	if (mePtr->namePtr == NULL) {
1824	1822	if (mePtr->labelPtr == NULL) {

1981	1979
1982	1980	/*
1983	1981	* Cascades are kind of tricky here. This is special case #3 in the
1984		* comment at the top of this file. Basically, if a menu is the master
	1982	* comment at the top of this file. Basically, if a menu is the main
1985	1983	* menu of a clone chain, and has an entry with a cascade menu, the clones
1986	1984	* of the menu will point to clones of the cascade menu. We have to
1987	1985	* destroy the clones of the cascades, clone the new cascade menu, and

2143	2141	}
2144	2142
2145	2143	if (isdigit(UCHAR(string[0]))) {
2146		if (Tcl_GetInt(interp, string, &i) == TCL_OK) {
	2144	if (Tcl_GetIntFromObj(interp, objPtr, &i) == TCL_OK) {
2147	2145	if (i >= menuPtr->numEntries) {
2148	2146	if (lastOK) {
2149	2147	i = menuPtr->numEntries;

2415	2413	* If a menu has cascades, then every instance of the menu has to have
2416	2414	* its own parallel cascade structure. So adding an entry to a menu
2417	2415	* with clones means that the menu that the entry points to has to be
2418		* cloned for every clone the master menu has. This is special case #2
	2416	* cloned for every clone the main menu has. This is special case #2
2419	2417	* in the comment at the top of this file.
2420	2418	*/
2421	2419

2696	2694	Tcl_Obj *menuDupCommandArray[4];
2697	2695
2698	2696	if (newMenuTypePtr == NULL) {
2699		menuType = MASTER_MENU;
	2697	menuType = MAIN_MENU;
2700	2698	} else {
2701	2699	if (Tcl_GetIndexFromObjStruct(menuPtr->interp, newMenuTypePtr,
2702	2700	menuTypeStrings, sizeof(char *), "menu type", 0, &menuType) != TCL_OK) {

2731	2729	&& (menuPtr->numEntries == menuRefPtr->menuPtr->numEntries)) {
2732	2730	TkMenu *newMenuPtr = menuRefPtr->menuPtr;
2733	2731	Tcl_Obj *newObjv[3];
2734		int i, numElements;
	2732	int numElements;
2735	2733
2736	2734	/*
2737	2735	* Now put this newly created menu into the parent menu's instance

2751	2749	}
2752	2750
2753	2751	/*
2754		* Add the master menu's window to the bind tags for this window after
	2752	* Add the main menu's window to the bind tags for this window after
2755	2753	* this window's tag. This is so the user can bind to either this
2756	2754	* clone (which may not be easy to do) or the entire menu clone
2757	2755	* structure.

+7

-10

generic/tkMenu.h less more

11	11
12	12	#ifndef _TKMENU
13	13	#define _TKMENU
14
15		#ifndef _TK
16		#include "tk.h"
17		#endif
18	14
19	15	#ifndef _TKINT
20	16	#include "tkInt.h"

188	184	* the menu. */
189	185
190	186	/*
191		* Bookeeping for master menus and cascade menus.
	187	* Bookeeping for main menus and cascade menus.
192	188	*/
193	189
194	190	struct TkMenuReferences *childMenuRefPtr;

269	265	int numEntries; /* Number of elements in entries. */
270	266	int active; /* Index of active entry. -1 means nothing
271	267	* active. */
272		int menuType; /* MASTER_MENU, TEAROFF_MENU, or MENUBAR. See
	268	int menuType; /* MAIN_MENU, TEAROFF_MENU, or MENUBAR. See
273	269	* below for definitions. */
274	270	Tcl_Obj menuTypePtr; / Used to control whether created tkwin is a
275	271	* toplevel or not. "normal", "menubar", or

357	353	struct TkMenu *masterMenuPtr;
358	354	/* A pointer to the original menu for this
359	355	* clone chain. Points back to this structure
360		* if this menu is a master menu. */
	356	* if this menu is a main menu. */
361	357	void reserved1; / not used any more. */
362	358	Tk_Window parentTopLevelPtr;/* If this menu is a menubar, this is the
363	359	* toplevel that owns the menu. Only

436	432	* MENU_DELETION_PENDING Non-zero means that we are currently
437	433	* destroying this menu's internal structures.
438	434	* This is useful when we are in the middle of
439		* cleaning this master menu's chain of menus up
	435	* cleaning this main menu's chain of menus up
440	436	* when TkDestroyMenu was called again on this
441	437	* menu (via a destroy binding or somesuch).
442	438	* MENU_WIN_DESTRUCTION_PENDING Non-zero means we are in the middle of

454	450	#define MENU_PLATFORM_FLAG3 (1 << 28)
455	451
456	452	/*
457		* Each menu created by the user is a MASTER_MENU. When a menu is torn off, a
	453	* Each menu created by the user is a MAIN_MENU. When a menu is torn off, a
458	454	* TEAROFF_MENU instance is created. When a menu is assigned to a toplevel as
459	455	* a menu bar, a MENUBAR instance is created. All instances have the same
460		* configuration information. If the master instance is deleted, all instances
	456	* configuration information. If the main instance is deleted, all instances
461	457	* are deleted. If one of the other instances is deleted, only that instance
462	458	* is deleted.
463	459	*/
464	460
465	461	#define UNKNOWN_TYPE -1
	462	#define MAIN_MENU 0
466	463	#define MASTER_MENU 0
467	464	#define TEAROFF_MENU 1
468	465	#define MENUBAR 2

+30

-0

generic/tkMenuDraw.c less more

667	667	TkpDrawMenuEntry(mePtr, Tk_WindowId(menuPtr->tkwin), tkfont,
668	668	&menuMetrics, mePtr->x, mePtr->y, mePtr->width,
669	669	mePtr->height, strictMotif, 1);
	670
	671	if (mePtr->entryFlags & ENTRY_LAST_COLUMN) {
	672
	673	/*
	674	* Paint the area at the right of an entry in the last column.
	675	* This has zero width except after menu resizing.
	676	*/
	677
	678	Tk_Fill3DRectangle(tkwin, Tk_WindowId(tkwin), border,
	679	mePtr->x + mePtr->width, mePtr->y,
	680	Tk_Width(tkwin) - mePtr->x - mePtr->width - borderWidth,
	681	mePtr->height, 0, TK_RELIEF_FLAT);
	682	}
	683
670	684	if ((index > 0) && (menuPtr->menuType != MENUBAR)
671	685	&& mePtr->columnBreak) {
	686
	687	/*
	688	* Paint the area under the last entry in a column.
	689	*/
	690
672	691	mePtr = menuPtr->entries[index - 1];
673	692	Tk_Fill3DRectangle(tkwin, Tk_WindowId(tkwin), border,
674	693	mePtr->x, mePtr->y + mePtr->height, mePtr->width,

686	705	height = Tk_Height(tkwin) - 2 * borderWidth;
687	706	} else {
688	707	mePtr = menuPtr->entries[menuPtr->numEntries - 1];
	708
	709	/*
	710	* Paint the area under the last entry of the menu.
	711	*/
	712
689	713	Tk_Fill3DRectangle(tkwin, Tk_WindowId(tkwin),
690	714	border, mePtr->x, mePtr->y + mePtr->height, mePtr->width,
691	715	Tk_Height(tkwin) - mePtr->y - mePtr->height - borderWidth,

695	719	width = Tk_Width(tkwin) - x - borderWidth;
696	720	height = Tk_Height(tkwin) - y - borderWidth;
697	721	}
	722
	723	/*
	724	* Paint the area at the bottom right of the last entry.
	725	* This has zero width except after menu resizing.
	726	*/
	727
698	728	Tk_Fill3DRectangle(tkwin, Tk_WindowId(tkwin), border, x, y,
699	729	width, height, 0, TK_RELIEF_FLAT);
700	730	}

+20

-20

generic/tkObj.c less more

148	148	static ThreadSpecificData *
149	149	GetTypeCache(void)
150	150	{
151		ThreadSpecificData *tsdPtr =
	151	ThreadSpecificData tsdPtr = (ThreadSpecificData )
152	152	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
153	153
154	154	if (tsdPtr->doubleTypePtr == NULL) {

407	407
408	408	static void
409	409	DupPixelInternalRep(
410		register Tcl_Obj srcPtr, / Object with internal rep to copy. */
411		register Tcl_Obj copyPtr) / Object with internal rep to set. */
	410	Tcl_Obj srcPtr, / Object with internal rep to copy. */
	411	Tcl_Obj copyPtr) / Object with internal rep to set. */
412	412	{
413	413	copyPtr->typePtr = srcPtr->typePtr;
414	414

418	418	PixelRep oldPtr, newPtr;
419	419
420	420	oldPtr = GET_COMPLEXPIXEL(srcPtr);
421		newPtr = ckalloc(sizeof(PixelRep));
	421	newPtr = (PixelRep *)ckalloc(sizeof(PixelRep));
422	422	newPtr->value = oldPtr->value;
423	423	newPtr->units = oldPtr->units;
424	424	newPtr->tkwin = oldPtr->tkwin;

502	502	if ((units < 0) && (i == d)) {
503	503	SET_SIMPLEPIXEL(objPtr, i);
504	504	} else {
505		PixelRep *pixelPtr = ckalloc(sizeof(PixelRep));
	505	PixelRep pixelPtr = (PixelRep )ckalloc(sizeof(PixelRep));
506	506
507	507	pixelPtr->value = d;
508	508	pixelPtr->units = units;

563	563	}
564	564	}
565	565
566		mmPtr = objPtr->internalRep.twoPtrValue.ptr1;
	566	mmPtr = (MMRep *)objPtr->internalRep.twoPtrValue.ptr1;
567	567	if (mmPtr->tkwin != tkwin) {
568	568	d = mmPtr->value;
569	569	if (mmPtr->units == -1) {

627	627
628	628	static void
629	629	DupMMInternalRep(
630		register Tcl_Obj srcPtr, / Object with internal rep to copy. */
631		register Tcl_Obj copyPtr) / Object with internal rep to set. */
	630	Tcl_Obj srcPtr, / Object with internal rep to copy. */
	631	Tcl_Obj copyPtr) / Object with internal rep to set. */
632	632	{
633	633	MMRep oldPtr, newPtr;
634	634
635	635	copyPtr->typePtr = srcPtr->typePtr;
636		oldPtr = srcPtr->internalRep.twoPtrValue.ptr1;
637		newPtr = ckalloc(sizeof(MMRep));
	636	oldPtr = (MMRep *)srcPtr->internalRep.twoPtrValue.ptr1;
	637	newPtr = (MMRep *)ckalloc(sizeof(MMRep));
638	638	newPtr->value = oldPtr->value;
639	639	newPtr->units = oldPtr->units;
640	640	newPtr->tkwin = oldPtr->tkwin;

663	663
664	664	static void
665	665	UpdateStringOfMM(
666		register Tcl_Obj objPtr) / pixel obj with string rep to update. */
	666	Tcl_Obj objPtr) / pixel obj with string rep to update. */
667	667	{
668	668	MMRep *mmPtr;
669	669	char buffer[TCL_DOUBLE_SPACE];
670	670	size_t len;
671	671
672		mmPtr = objPtr->internalRep.twoPtrValue.ptr1;
	672	mmPtr = (MMRep *)objPtr->internalRep.twoPtrValue.ptr1;
673	673	/* assert( mmPtr->units == -1 && objPtr->bytes == NULL ); */
674	674	if ((mmPtr->units != -1) \|\| (objPtr->bytes != NULL)) {
675	675	Tcl_Panic("UpdateStringOfMM: false precondition");

678	678	Tcl_PrintDouble(NULL, mmPtr->value, buffer);
679	679	len = strlen(buffer);
680	680
681		objPtr->bytes = ckalloc(len + 1);
	681	objPtr->bytes = (char *)ckalloc(len + 1);
682	682	strcpy(objPtr->bytes, buffer);
683	683	objPtr->length = len;
684	684	}

786	786
787	787	objPtr->typePtr = &mmObjType;
788	788
789		mmPtr = ckalloc(sizeof(MMRep));
	789	mmPtr = (MMRep *)ckalloc(sizeof(MMRep));
790	790	mmPtr->value = d;
791	791	mmPtr->units = units;
792	792	mmPtr->tkwin = NULL;

826	826	Tk_Window windowPtr) / Place to store resulting window. */
827	827	{
828	828	TkMainInfo mainPtr = ((TkWindow ) tkwin)->mainPtr;
829		register WindowRep *winPtr;
	829	WindowRep *winPtr;
830	830
831	831	if (objPtr->typePtr != &windowObjType) {
832	832	int result = SetWindowFromAny(interp, objPtr);

835	835	}
836	836	}
837	837
838		winPtr = objPtr->internalRep.twoPtrValue.ptr1;
	838	winPtr = (WindowRep *)objPtr->internalRep.twoPtrValue.ptr1;
839	839	if (winPtr->tkwin == NULL
840	840	\|\| winPtr->mainPtr == NULL
841	841	\|\| winPtr->mainPtr != mainPtr

881	881
882	882	static int
883	883	SetWindowFromAny(
884		Tcl_Interp interp, / Used for error reporting if not NULL. */
885		register Tcl_Obj objPtr) / The object to convert. */
	884	TCL_UNUSED(Tcl_Interp *),
	885	Tcl_Obj objPtr) / The object to convert. */
886	886	{
887	887	const Tcl_ObjType *typePtr;
888	888	WindowRep *winPtr;

897	897	typePtr->freeIntRepProc(objPtr);
898	898	}
899	899
900		winPtr = ckalloc(sizeof(WindowRep));
	900	winPtr = (WindowRep *)ckalloc(sizeof(WindowRep));
901	901	winPtr->tkwin = NULL;
902	902	winPtr->mainPtr = NULL;
903	903	winPtr->epoch = 0;

992	992	{
993	993	Tcl_Obj *objPtr = Tcl_NewStringObj(Tk_PathName(tkwin), -1);
994	994	TkMainInfo mainPtr = ((TkWindow ) tkwin)->mainPtr;
995		register WindowRep *winPtr;
	995	WindowRep *winPtr;
996	996
997	997	SetWindowFromAny(NULL, objPtr);
998	998

+15

-18

generic/tkOldConfig.c less more

81	81	* considered. Also, may have
82	82	* TK_CONFIG_ARGV_ONLY set. */
83	83	{
84		register Tk_ConfigSpec specPtr, staticSpecs;
	84	Tk_ConfigSpec specPtr, staticSpecs;
85	85	Tk_Uid value; /* Value of option from database. */
86	86	int needFlags; /* Specs must contain this set of flags or
87	87	* else they are not considered. */

244	244	int hateFlags) /* Flags that must NOT be present in matching
245	245	* entry. */
246	246	{
247		register Tk_ConfigSpec *specPtr;
248		register char c; /* First character of current argument. */
	247	Tk_ConfigSpec *specPtr;
	248	char c; /* First character of current argument. */
249	249	Tk_ConfigSpec matchPtr; / Matching spec, or NULL. */
250	250	size_t length;
251	251

375	375	if (nullValue) {
376	376	newStr = NULL;
377	377	} else {
378		newStr = ckalloc(strlen(value) + 1);
	378	newStr = (char *)ckalloc(strlen(value) + 1);
379	379	strcpy(newStr, value);
380	380	}
381	381	oldStr = ((char *) ptr);

602	602	* be present in config specs for them to be
603	603	* considered. */
604	604	{
605		register Tk_ConfigSpec specPtr, staticSpecs;
	605	Tk_ConfigSpec specPtr, staticSpecs;
606	606	int needFlags, hateFlags;
607	607	char *list;
608	608	const char *leader = "{";

685	685	Tcl_Interp interp, / Interpreter to use for things like
686	686	* floating-point precision. */
687	687	Tk_Window tkwin, /* Window corresponding to widget. */
688		register const Tk_ConfigSpec *specPtr,
	688	const Tk_ConfigSpec *specPtr,
689	689	/* Pointer to information describing
690	690	* option. */
691	691	char widgRec) / Pointer to record holding current values of

862	862	result = buffer;
863	863	break;
864	864	case TK_CONFIG_WINDOW: {
865		Tk_Window tkwin;
866
867	865	tkwin = ((Tk_Window ) ptr);
868	866	if (tkwin != NULL) {
869	867	result = Tk_PathName(tkwin);

970	968	*----------------------------------------------------------------------
971	969	*/
972	970
973		/* ARGSUSED */
974	971	void
975	972	Tk_FreeOptions(
976	973	const Tk_ConfigSpec specs, / Describes legal options. */

982	979	* be present in config specs for them to be
983	980	* considered. */
984	981	{
985		register const Tk_ConfigSpec *specPtr;
	982	const Tk_ConfigSpec *specPtr;
986	983	char *ptr;
987	984
988	985	for (specPtr = specs; specPtr->type != TK_CONFIG_END; specPtr++) {

1070	1067	* self-initializing code.
1071	1068	*/
1072	1069
1073		specCacheTablePtr =
	1070	specCacheTablePtr = (Tcl_HashTable *)
1074	1071	Tcl_GetAssocData(interp, "tkConfigSpec.threadTable", NULL);
1075	1072	if (specCacheTablePtr == NULL) {
1076		specCacheTablePtr = ckalloc(sizeof(Tcl_HashTable));
	1073	specCacheTablePtr = (Tcl_HashTable *)ckalloc(sizeof(Tcl_HashTable));
1077	1074	Tcl_InitHashTable(specCacheTablePtr, TCL_ONE_WORD_KEYS);
1078	1075	Tcl_SetAssocData(interp, "tkConfigSpec.threadTable",
1079	1076	DeleteSpecCacheTable, specCacheTablePtr);

1087	1084	entryPtr = Tcl_CreateHashEntry(specCacheTablePtr, (char *) staticSpecs,
1088	1085	&isNew);
1089	1086	if (isNew) {
1090		unsigned int entrySpace = sizeof(Tk_ConfigSpec);
	1087	size_t entrySpace = sizeof(Tk_ConfigSpec);
1091	1088	const Tk_ConfigSpec *staticSpecPtr;
1092	1089	Tk_ConfigSpec *specPtr;
1093	1090

1103	1100
1104	1101	/*
1105	1102	* Now allocate our working copy's space and copy over the contents
1106		* from the master copy.
	1103	* from the origin.
1107	1104	*/
1108	1105
1109		cachedSpecs = ckalloc(entrySpace);
	1106	cachedSpecs = (Tk_ConfigSpec *)ckalloc(entrySpace);
1110	1107	memcpy(cachedSpecs, staticSpecs, entrySpace);
1111	1108	Tcl_SetHashValue(entryPtr, cachedSpecs);
1112	1109

1130	1127	}
1131	1128	}
1132	1129	} else {
1133		cachedSpecs = Tcl_GetHashValue(entryPtr);
	1130	cachedSpecs = (Tk_ConfigSpec *)Tcl_GetHashValue(entryPtr);
1134	1131	}
1135	1132
1136	1133	return cachedSpecs;

1156	1153	static void
1157	1154	DeleteSpecCacheTable(
1158	1155	ClientData clientData,
1159		Tcl_Interp *interp)
	1156	TCL_UNUSED(Tcl_Interp *))
1160	1157	{
1161		Tcl_HashTable *tablePtr = clientData;
	1158	Tcl_HashTable tablePtr = (Tcl_HashTable )clientData;
1162	1159	Tcl_HashEntry *entryPtr;
1163	1160	Tcl_HashSearch search;
1164	1161

+30

-30

generic/tkOldTest.c less more

24	24	#include "tkInt.h"
25	25
26	26	/*
27		* The following data structure represents the master for a test image:
28		*/
29
30		typedef struct TImageMaster {
31		Tk_ImageMaster master; /* Tk's token for image master. */
	27	* The following data structure represents the model for a test image:
	28	*/
	29
	30	typedef struct TImageModel {
	31	Tk_ImageModel model; /* Tk's token for image model. */
32	32	Tcl_Interp interp; / Interpreter for application. */
33	33	int width, height; /* Dimensions of image. */
34	34	char imageName; / Name of image (malloc-ed). */
35	35	char varName; / Name of variable in which to log events for
36	36	* image (malloc-ed). */
37		} TImageMaster;
	37	} TImageModel;
38	38
39	39	/*
40	40	* The following data structure represents a particular use of a particular

42	42	*/
43	43
44	44	typedef struct TImageInstance {
45		TImageMaster masterPtr; / Pointer to master for image. */
	45	TImageModel modelPtr; / Pointer to model for image. */
46	46	XColor fg; / Foreground color for drawing in image. */
47	47	GC gc; /* Graphics context for drawing in image. */
48	48	} TImageInstance;

53	53
54	54	static int ImageCreate(Tcl_Interp *interp,
55	55	char name, int argc, char *argv,
56		Tk_ImageType *typePtr, Tk_ImageMaster master,
	56	Tk_ImageType *typePtr, Tk_ImageModel model,
57	57	ClientData *clientDataPtr);
58	58	static ClientData ImageGet(Tk_Window tkwin, ClientData clientData);
59	59	static void ImageDisplay(ClientData clientData,

142	142	char *argv, / Argument strings for options (doesn't
143	143	* include image name or type). */
144	144	Tk_ImageType typePtr, / Pointer to our type record (not used). */
145		Tk_ImageMaster master, /* Token for image, to be used by us in later
	145	Tk_ImageModel model, /* Token for image, to be used by us in later
146	146	* callbacks. */
147	147	ClientData clientDataPtr) / Store manager's token for image here; it
148	148	* will be returned in later callbacks. */
149	149	{
150		TImageMaster *timPtr;
	150	TImageModel *timPtr;
151	151	const char *varName;
152	152	int i;
153	153

166	166	varName = argv[i+1];
167	167	}
168	168
169		timPtr = ckalloc(sizeof(TImageMaster));
170		timPtr->master = master;
	169	timPtr = ckalloc(sizeof(TImageModel));
	170	timPtr->model = model;
171	171	timPtr->interp = interp;
172	172	timPtr->width = 30;
173	173	timPtr->height = 15;

177	177	strcpy(timPtr->varName, varName);
178	178	Tcl_CreateObjCommand(interp, name, ImageObjCmd, timPtr, NULL);
179	179	*clientDataPtr = timPtr;
180		Tk_ImageChanged(master, 0, 0, 30, 15, 30, 15);
	180	Tk_ImageChanged(model, 0, 0, 30, 15, 30, 15);
181	181	return TCL_OK;
182	182	}
183	183

206	206	int objc, /* Number of arguments. */
207	207	Tcl_Obj const objv[]) / Argument strings. */
208	208	{
209		TImageMaster *timPtr = clientData;
	209	TImageModel *timPtr = clientData;
210	210	int x, y, width, height;
211	211
212	212	if (objc < 2) {

227	227	\|\| (Tcl_GetIntFromObj(interp, objv[7], &timPtr->height) != TCL_OK)) {
228	228	return TCL_ERROR;
229	229	}
230		Tk_ImageChanged(timPtr->master, x, y, width, height, timPtr->width,
	230	Tk_ImageChanged(timPtr->model, x, y, width, height, timPtr->width,
231	231	timPtr->height);
232	232	} else {
233	233	Tcl_AppendResult(interp, "bad option \"", Tcl_GetString(objv[1]),

259	259	ImageGet(
260	260	Tk_Window tkwin, /* Token for window in which image will be
261	261	* used. */
262		ClientData clientData) /* Pointer to TImageMaster for image. */
263		{
264		TImageMaster *timPtr = clientData;
	262	ClientData clientData) /* Pointer to TImageModel for image. */
	263	{
	264	TImageModel *timPtr = clientData;
265	265	TImageInstance *instPtr;
266	266	char buffer[100];
267	267	XGCValues gcValues;

271	271	TCL_GLOBAL_ONLY\|TCL_APPEND_VALUE\|TCL_LIST_ELEMENT);
272	272
273	273	instPtr = ckalloc(sizeof(TImageInstance));
274		instPtr->masterPtr = timPtr;
	274	instPtr->modelPtr = timPtr;
275	275	instPtr->fg = Tk_GetColor(timPtr->interp, tkwin, "#ff0000");
276	276	gcValues.foreground = instPtr->fg->pixel;
277	277	instPtr->gc = Tk_GetGC(tkwin, GCForeground, &gcValues);

312	312	char buffer[200 + TCL_INTEGER_SPACE * 6];
313	313
314	314	sprintf(buffer, "%s display %d %d %d %d %d %d",
315		instPtr->masterPtr->imageName, imageX, imageY, width, height,
	315	instPtr->modelPtr->imageName, imageX, imageY, width, height,
316	316	drawableX, drawableY);
317		Tcl_SetVar2(instPtr->masterPtr->interp, instPtr->masterPtr->varName, NULL,
	317	Tcl_SetVar2(instPtr->modelPtr->interp, instPtr->modelPtr->varName, NULL,
318	318	buffer, TCL_GLOBAL_ONLY\|TCL_APPEND_VALUE\|TCL_LIST_ELEMENT);
319		if (width > (instPtr->masterPtr->width - imageX)) {
320		width = instPtr->masterPtr->width - imageX;
321		}
322		if (height > (instPtr->masterPtr->height - imageY)) {
323		height = instPtr->masterPtr->height - imageY;
	319	if (width > (instPtr->modelPtr->width - imageX)) {
	320	width = instPtr->modelPtr->width - imageX;
	321	}
	322	if (height > (instPtr->modelPtr->height - imageY)) {
	323	height = instPtr->modelPtr->height - imageY;
324	324	}
325	325	XDrawRectangle(display, drawable, instPtr->gc, drawableX, drawableY,
326	326	(unsigned) (width-1), (unsigned) (height-1));

356	356	TImageInstance *instPtr = clientData;
357	357	char buffer[200];
358	358
359		sprintf(buffer, "%s free", instPtr->masterPtr->imageName);
360		Tcl_SetVar2(instPtr->masterPtr->interp, instPtr->masterPtr->varName, NULL,
	359	sprintf(buffer, "%s free", instPtr->modelPtr->imageName);
	360	Tcl_SetVar2(instPtr->modelPtr->interp, instPtr->modelPtr->varName, NULL,
361	361	buffer, TCL_GLOBAL_ONLY\|TCL_APPEND_VALUE\|TCL_LIST_ELEMENT);
362	362	Tk_FreeColor(instPtr->fg);
363	363	Tk_FreeGC(display, instPtr->gc);

383	383
384	384	static void
385	385	ImageDelete(
386		ClientData clientData) /* Pointer to TImageMaster for image. When
	386	ClientData clientData) /* Pointer to TImageModel for image. When
387	387	* this function is called, no more instances
388	388	* exist. */
389	389	{
390		TImageMaster *timPtr = clientData;
	390	TImageModel *timPtr = clientData;
391	391	char buffer[100];
392	392
393	393	sprintf(buffer, "%s delete", timPtr->imageName);

+41

-41

generic/tkOption.c less more

253	253	* TK_MAX_PRIO. */
254	254	{
255	255	TkWindow winPtr = ((TkWindow ) tkwin)->mainPtr->winPtr;
256		register ElArray **arrayPtrPtr;
257		register Element *elPtr;
	256	ElArray **arrayPtrPtr;
	257	Element *elPtr;
258	258	Element newEl;
259		register const char *p;
	259	const char *p;
260	260	const char *field;
261	261	int count, firstField;
262		ptrdiff_t length;
	262	size_t length;
263	263	#define TMP_SIZE 100
264	264	char tmp[TMP_SIZE+1];
265		ThreadSpecificData *tsdPtr =
	265	ThreadSpecificData tsdPtr = (ThreadSpecificData )
266	266	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
267	267
268	268	if (winPtr->mainPtr->optionRootPtr == NULL) {

310	310	if (length > TMP_SIZE) {
311	311	length = TMP_SIZE;
312	312	}
313		strncpy(tmp, field, (size_t) length);
	313	strncpy(tmp, field, length);
314	314	tmp[length] = 0;
315	315	newEl.nameUid = Tk_GetUid(tmp);
316	316	if (isupper(UCHAR(*field))) {

405	405	* name. */
406	406	{
407	407	Tk_Uid nameId, classId = NULL;
408		char *masqName;
409		register Element elPtr, bestPtr;
410		register int count;
	408	const char *masqName;
	409	Element elPtr, bestPtr;
	410	int count;
411	411	StackLevel *levelPtr;
412	412	int stackDepth[NUM_STACKS];
413		ThreadSpecificData *tsdPtr =
	413	ThreadSpecificData tsdPtr = (ThreadSpecificData )
414	414	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
415	415
416	416	/*

520	520	if (masqName != NULL) {
521	521	char *masqClass;
522	522	Tk_Uid nodeId, winClassId, winNameId;
523		unsigned int classNameLength;
524		register Element nodePtr, leafPtr;
	523	size_t classNameLength;
	524	Element nodePtr, leafPtr;
525	525	static const int searchOrder[] = {
526	526	EXACT_NODE_NAME, WILDCARD_NODE_NAME, EXACT_NODE_CLASS,
527	527	WILDCARD_NODE_CLASS, -1

533	533	* Extract the masquerade class name from the name field.
534	534	*/
535	535
536		classNameLength = (unsigned) (masqName - name);
537		masqClass = ckalloc(classNameLength + 1);
	536	classNameLength = (size_t) (masqName - name);
	537	masqClass = (char *)ckalloc(classNameLength + 1);
538	538	strncpy(masqClass, name, classNameLength);
539	539	masqClass[classNameLength] = '\0';
540	540

614	614	int objc, /* Number of Tcl_Obj arguments. */
615	615	Tcl_Obj const objv[]) / Tcl_Obj arguments. */
616	616	{
617		Tk_Window tkwin = clientData;
	617	Tk_Window tkwin = (Tk_Window)clientData;
618	618	int index, result;
619		ThreadSpecificData *tsdPtr =
	619	ThreadSpecificData tsdPtr = (ThreadSpecificData )
620	620	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
621	621	static const char *const optionCmds[] = {
622	622	"add", "clear", "get", "readfile", NULL

737	737
738	738	void
739	739	TkOptionDeadWindow(
740		register TkWindow winPtr) / Window to be cleaned up. */
	740	TkWindow winPtr) / Window to be cleaned up. */
741	741	{
742		ThreadSpecificData *tsdPtr =
	742	ThreadSpecificData tsdPtr = (ThreadSpecificData )
743	743	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
744	744
745	745	/*

795	795	{
796	796	int i, j, *basePtr;
797	797	ElArray *arrayPtr;
798		ThreadSpecificData *tsdPtr =
	798	ThreadSpecificData tsdPtr = (ThreadSpecificData )
799	799	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
800	800
801	801	if (winPtr->optionLevel == -1) {

921	921	* TK_INTERACTIVE_PRIO. Must be between 0 and
922	922	* TK_MAX_PRIO. */
923	923	{
924		register char src, dst;
	924	char src, dst;
925	925	char name, value;
926	926	int lineNum;
927	927

1114	1114	Tcl_IncrRefCount(buffer);
1115	1115	Tcl_SetChannelOption(NULL, chan, "-encoding", "utf-8");
1116	1116	bufferSize = Tcl_ReadChars(chan, buffer, -1, 0);
1117		if (bufferSize < 0) {
	1117	if (bufferSize == -1) {
1118	1118	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
1119	1119	"error reading file \"%s\": %s",
1120	1120	fileName, Tcl_PosixError(interp)));

1148	1148	NewArray(
1149	1149	int numEls) /* How many elements of space to allocate. */
1150	1150	{
1151		register ElArray *arrayPtr = ckalloc(EL_ARRAY_SIZE(numEls));
	1151	ElArray arrayPtr = (ElArray )ckalloc(EL_ARRAY_SIZE(numEls));
1152	1152
1153	1153	arrayPtr->arraySize = numEls;
1154	1154	arrayPtr->numUsed = 0;

1175	1175
1176	1176	static ElArray *
1177	1177	ExtendArray(
1178		register ElArray arrayPtr, / Array to be extended. */
1179		register Element elPtr) / Element to be copied into array. */
	1178	ElArray arrayPtr, / Array to be extended. */
	1179	Element elPtr) / Element to be copied into array. */
1180	1180	{
1181	1181	/*
1182	1182	* If the current array has filled up, make it bigger.
1183	1183	*/
1184	1184
1185	1185	if (arrayPtr->numUsed >= arrayPtr->arraySize) {
1186		register int newSize = 2*arrayPtr->arraySize;
1187
1188		arrayPtr = ckrealloc(arrayPtr, EL_ARRAY_SIZE(newSize));
	1186	int newSize = 2*arrayPtr->arraySize;
	1187
	1188	arrayPtr = (ElArray *)ckrealloc(arrayPtr, EL_ARRAY_SIZE(newSize));
1189	1189	arrayPtr->arraySize = newSize;
1190	1190	arrayPtr->nextToUse = &arrayPtr->els[arrayPtr->numUsed];
1191	1191	}

1224	1224	{
1225	1225	int level, i;
1226	1226	const int *iPtr;
1227		register StackLevel *levelPtr;
1228		register ElArray *arrayPtr;
1229		ThreadSpecificData *tsdPtr =
	1227	StackLevel *levelPtr;
	1228	ElArray *arrayPtr;
	1229	ThreadSpecificData tsdPtr = (ThreadSpecificData )
1230	1230	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
1231	1231
1232	1232	/*

1303	1303	*/
1304	1304
1305	1305	if (tsdPtr->curLevel >= tsdPtr->numLevels) {
1306		StackLevel *newLevels =
	1306	StackLevel newLevels = (StackLevel )
1307	1307	ckalloc(tsdPtr->numLevels * 2 * sizeof(StackLevel));
1308	1308
1309	1309	memcpy(newLevels, tsdPtr->levels,

1330	1330	*/
1331	1331
1332	1332	for (iPtr = searchOrder; *iPtr != -1; iPtr++) {
1333		register Element *elPtr;
	1333	Element *elPtr;
1334	1334	int count;
1335	1335	Tk_Uid id;
1336	1336

1385	1385	int leaf) /* If zero, then don't copy exact leaf
1386	1386	* elements. */
1387	1387	{
1388		register int count;
1389		register Element *elPtr;
1390		ThreadSpecificData *tsdPtr =
	1388	int count;
	1389	Element *elPtr;
	1390	ThreadSpecificData tsdPtr = (ThreadSpecificData )
1391	1391	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
1392	1392
1393	1393	for (elPtr = arrayPtr->els, count = arrayPtr->numUsed;

1418	1418
1419	1419	static void
1420	1420	OptionThreadExitProc(
1421		ClientData clientData) /* not used */
	1421	TCL_UNUSED(void *))
1422	1422	{
1423		ThreadSpecificData *tsdPtr =
	1423	ThreadSpecificData tsdPtr = (ThreadSpecificData )
1424	1424	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
1425	1425
1426	1426	if (tsdPtr->initialized) {

1452	1452
1453	1453	static void
1454	1454	OptionInit(
1455		register TkMainInfo *mainPtr)
	1455	TkMainInfo *mainPtr)
1456	1456	/* Top-level information about window that
1457	1457	* isn't initialized yet. */
1458	1458	{
1459	1459	int i;
1460	1460	Tcl_Interp *interp;
1461		ThreadSpecificData *tsdPtr =
	1461	ThreadSpecificData tsdPtr = (ThreadSpecificData )
1462	1462	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
1463	1463	Element *defaultMatchPtr = &tsdPtr->defaultMatch;
1464	1464

1473	1473	tsdPtr->curLevel = -1;
1474	1474	tsdPtr->serial = 0;
1475	1475
1476		tsdPtr->levels = ckalloc(5 * sizeof(StackLevel));
	1476	tsdPtr->levels = (StackLevel )ckalloc(5 sizeof(StackLevel));
1477	1477	for (i = 0; i < NUM_STACKS; i++) {
1478	1478	tsdPtr->stacks[i] = NewArray(10);
1479	1479	tsdPtr->levels[0].bases[i] = 0;

1520	1520	ElArray arrayPtr) / Array of options; delete everything
1521	1521	* referred to recursively by this. */
1522	1522	{
1523		register Element *elPtr;
	1523	Element *elPtr;
1524	1524	int count;
1525	1525
1526	1526	for (count = arrayPtr->numUsed, elPtr = arrayPtr->els; count > 0;

+429

-429

generic/tkPack.c less more

19	19
20	20	/*
21	21	* For each window that the packer cares about (either because the window is
22		* managed by the packer or because the window has slaves that are managed by
	22	* managed by the packer or because the window has content managed by
23	23	* the packer), there is a structure of the following type:
24	24	*/
25	25

28	28	* window has been deleted, but the packet
29	29	* hasn't had a chance to clean up yet because
30	30	* the structure is still in use. */
31		struct Packer masterPtr; / Master window within which this window is
	31	struct Packer containerPtr; / Container window within which this window is
32	32	* packed (NULL means this window isn't
33	33	* managed by the packer). */
34		struct Packer nextPtr; / Next window packed within same master. List
	34	struct Packer nextPtr; / Next window packed within same container. List
35	35	* is priority-ordered: first on list gets
36	36	* packed first. */
37		struct Packer slavePtr; / First in list of slaves packed inside this
38		* window (NULL means no packed slaves). */
39		Side side; /* Side of master against which this window is
	37	struct Packer contentPtr; / First in list of content packed inside this
	38	* window (NULL means no packed content). */
	39	Side side; /* Side of container against which this window is
40	40	* packed. */
41	41	Tk_Anchor anchor; /* If frame allocated for window is larger
42	42	* than window needs, this indicates how where

54	54	* each side). */
55	55	int doubleBw; /* Twice the window's last known border width.
56	56	* If this changes, the window must be
57		* repacked within its master. */
	57	* repacked within its container. */
58	58	int abortPtr; / If non-NULL, it means that there is a
59	59	* nested call to ArrangePacking already
60	60	* working on this window. *abortPtr may be
61	61	* set to 1 to abort that nested call. This
62	62	* happens, for example, if tkwin or any of
63		* its slaves is deleted. */
	63	* its content is deleted. */
64	64	int flags; /* Miscellaneous flags; see below for
65	65	* definitions. */
66	66	} Packer;

69	69	* Flag values for Packer structures:
70	70	*
71	71	* REQUESTED_REPACK: 1 means a Tcl_DoWhenIdle request has already
72		* been made to repack all the slaves of this
	72	* been made to repack all the content of this
73	73	* window.
74	74	* FILLX: 1 means if frame allocated for window is wider
75	75	* than window needs, expand window to fill

77	77	* than needed.
78	78	* FILLY: Same as FILLX, except for height.
79	79	* EXPAND: 1 means this window's frame will absorb any
80		* extra space in the master window.
	80	* extra space in the container window.
81	81	* OLD_STYLE: 1 means this window is being managed with the
82	82	* old-style packer algorithms (before Tk version
83	83	* 3.3). The main difference is that padding and
84	84	* filling are done differently.
85	85	* DONT_PROPAGATE: 1 means don't set this window's requested
86		* size. 0 means if this window is a master then
	86	* size. 0 means if this window is a container then
87	87	* Tk will set its requested size to fit the
88		* needs of its slaves.
89		* ALLOCED_MASTER 1 means that Pack has allocated itself as
90		* geometry master for this window.
	88	* needs of its content.
	89	* ALLOCED_CONTAINER 1 means that Pack has allocated itself as
	90	* geometry container for this window.
91	91	*/
92	92
93	93	#define REQUESTED_REPACK 1

96	96	#define EXPAND 8
97	97	#define OLD_STYLE 16
98	98	#define DONT_PROPAGATE 32
99		#define ALLOCED_MASTER 64
	99	#define ALLOCED_CONTAINER 64
100	100
101	101	/*
102	102	* The following structure is the official type record for the packer:
103	103	*/
104	104
105	105	static void PackReqProc(ClientData clientData, Tk_Window tkwin);
106		static void PackLostSlaveProc(ClientData clientData,
	106	static void PackLostContentProc(ClientData clientData,
107	107	Tk_Window tkwin);
108	108
109	109	static const Tk_GeomMgr packerType = {
110	110	"pack", /* name */
111	111	PackReqProc, /* requestProc */
112		PackLostSlaveProc, /* lostSlaveProc */
	112	PackLostContentProc, /* lostContentProc */
113	113	};
114	114
115	115	/*

117	117	*/
118	118
119	119	static void ArrangePacking(ClientData clientData);
120		static int ConfigureSlaves(Tcl_Interp *interp, Tk_Window tkwin,
	120	static int ConfigureContent(Tcl_Interp *interp, Tk_Window tkwin,
121	121	int objc, Tcl_Obj *const objv[]);
122	122	static void DestroyPacker(void *memPtr);
123	123	static Packer * GetPacker(Tk_Window tkwin);
124	124	static int PackAfter(Tcl_Interp interp, Packer prevPtr,
125		Packer masterPtr, int objc,Tcl_Obj const objv[]);
	125	Packer containerPtr, int objc,Tcl_Obj const objv[]);
126	126	static void PackStructureProc(ClientData clientData,
127	127	XEvent *eventPtr);
128	128	static void Unlink(Packer *packPtr);
129		static int XExpansion(Packer *slavePtr, int cavityWidth);
130		static int YExpansion(Packer *slavePtr, int cavityHeight);
	129	static int XExpansion(Packer *contentPtr, int cavityWidth);
	130	static int YExpansion(Packer *contentPtr, int cavityHeight);
131	131
132	132	/*
133	133	*------------------------------------------------------------------------

193	193	int objc, /* Number of arguments. */
194	194	Tcl_Obj const objv[]) / Argument objects. */
195	195	{
196		Tk_Window tkwin = clientData;
	196	Tk_Window tkwin = (Tk_Window)clientData;
197	197	const char *argv2;
198	198	static const char *const optionStrings[] = {
199	199	/* after, append, before and unpack are deprecated */
200		"after", "append", "before", "unpack",
201		"configure", "forget", "info", "propagate", "slaves", NULL };
	200	"after", "append", "before", "unpack", "configure",
	201	"content", "forget", "info", "propagate", "slaves", NULL };
202	202	enum options {
203		PACK_AFTER, PACK_APPEND, PACK_BEFORE, PACK_UNPACK,
204		PACK_CONFIGURE, PACK_FORGET, PACK_INFO, PACK_PROPAGATE, PACK_SLAVES };
	203	PACK_AFTER, PACK_APPEND, PACK_BEFORE, PACK_UNPACK, PACK_CONFIGURE,
	204	PACK_CONTENT, PACK_FORGET, PACK_INFO, PACK_PROPAGATE, PACK_SLAVES };
205	205	int index;
206	206
207	207	if (objc >= 2) {
208	208	const char *string = Tcl_GetString(objv[1]);
209	209
210	210	if (string[0] == '.') {
211		return ConfigureSlaves(interp, tkwin, objc-1, objv+1);
	211	return ConfigureContent(interp, tkwin, objc-1, objv+1);
212	212	}
213	213	}
214	214	if (objc < 3) {

240	240	return TCL_ERROR;
241	241	}
242	242	prevPtr = GetPacker(tkwin2);
243		if (prevPtr->masterPtr == NULL) {
	243	if (prevPtr->containerPtr == NULL) {
244	244	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
245	245	"window \"%s\" isn't packed", argv2));
246	246	Tcl_SetErrorCode(interp, "TK", "PACK", "NOT_PACKED", NULL);
247	247	return TCL_ERROR;
248	248	}
249		return PackAfter(interp, prevPtr, prevPtr->masterPtr, objc-3, objv+3);
	249	return PackAfter(interp, prevPtr, prevPtr->containerPtr, objc-3, objv+3);
250	250	}
251	251	case PACK_APPEND: {
252		Packer *masterPtr;
253		register Packer *prevPtr;
	252	Packer *containerPtr;
	253	Packer *prevPtr;
254	254	Tk_Window tkwin2;
255	255
256	256	if (TkGetWindowFromObj(interp, tkwin, objv[2], &tkwin2) != TCL_OK) {
257	257	return TCL_ERROR;
258	258	}
259		masterPtr = GetPacker(tkwin2);
260		prevPtr = masterPtr->slavePtr;
	259	containerPtr = GetPacker(tkwin2);
	260	prevPtr = containerPtr->contentPtr;
261	261	if (prevPtr != NULL) {
262	262	while (prevPtr->nextPtr != NULL) {
263	263	prevPtr = prevPtr->nextPtr;
264	264	}
265	265	}
266		return PackAfter(interp, prevPtr, masterPtr, objc-3, objv+3);
	266	return PackAfter(interp, prevPtr, containerPtr, objc-3, objv+3);
267	267	}
268	268	case PACK_BEFORE: {
269		Packer packPtr, masterPtr;
270		register Packer *prevPtr;
	269	Packer packPtr, containerPtr;
	270	Packer *prevPtr;
271	271	Tk_Window tkwin2;
272	272
273	273	if (TkGetWindowFromObj(interp, tkwin, objv[2], &tkwin2) != TCL_OK) {
274	274	return TCL_ERROR;
275	275	}
276	276	packPtr = GetPacker(tkwin2);
277		if (packPtr->masterPtr == NULL) {
	277	if (packPtr->containerPtr == NULL) {
278	278	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
279	279	"window \"%s\" isn't packed", argv2));
280	280	Tcl_SetErrorCode(interp, "TK", "PACK", "NOT_PACKED", NULL);
281	281	return TCL_ERROR;
282	282	}
283		masterPtr = packPtr->masterPtr;
284		prevPtr = masterPtr->slavePtr;
	283	containerPtr = packPtr->containerPtr;
	284	prevPtr = containerPtr->contentPtr;
285	285	if (prevPtr == packPtr) {
286	286	prevPtr = NULL;
287	287	} else {

294	294	}
295	295	}
296	296	}
297		return PackAfter(interp, prevPtr, masterPtr, objc-3, objv+3);
	297	return PackAfter(interp, prevPtr, containerPtr, objc-3, objv+3);
298	298	}
299	299	case PACK_CONFIGURE:
300	300	if (argv2[0] != '.') {

303	303	Tcl_SetErrorCode(interp, "TK", "VALUE", "WINDOW_PATH", NULL);
304	304	return TCL_ERROR;
305	305	}
306		return ConfigureSlaves(interp, tkwin, objc-2, objv+2);
	306	return ConfigureContent(interp, tkwin, objc-2, objv+2);
307	307	case PACK_FORGET: {
308		Tk_Window slave;
309		Packer *slavePtr;
	308	Tk_Window content;
	309	Packer *contentPtr;
310	310	int i;
311	311
312	312	for (i = 2; i < objc; i++) {
313		if (TkGetWindowFromObj(interp, tkwin, objv[i], &slave) != TCL_OK) {
	313	if (TkGetWindowFromObj(interp, tkwin, objv[i], &content) != TCL_OK) {
314	314	continue;
315	315	}
316		slavePtr = GetPacker(slave);
317		if ((slavePtr != NULL) && (slavePtr->masterPtr != NULL)) {
318		Tk_ManageGeometry(slave, NULL, NULL);
319		if (slavePtr->masterPtr->tkwin != Tk_Parent(slavePtr->tkwin)) {
320		Tk_UnmaintainGeometry(slavePtr->tkwin,
321		slavePtr->masterPtr->tkwin);
322		}
323		Unlink(slavePtr);
324		Tk_UnmapWindow(slavePtr->tkwin);
	316	contentPtr = GetPacker(content);
	317	if ((contentPtr != NULL) && (contentPtr->containerPtr != NULL)) {
	318	Tk_ManageGeometry(content, NULL, NULL);
	319	if (contentPtr->containerPtr->tkwin != Tk_Parent(contentPtr->tkwin)) {
	320	Tk_UnmaintainGeometry(contentPtr->tkwin,
	321	contentPtr->containerPtr->tkwin);
	322	}
	323	Unlink(contentPtr);
	324	Tk_UnmapWindow(contentPtr->tkwin);
325	325	}
326	326	}
327	327	break;
328	328	}
329	329	case PACK_INFO: {
330		register Packer *slavePtr;
331		Tk_Window slave;
	330	Packer *contentPtr;
	331	Tk_Window content;
332	332	Tcl_Obj *infoObj;
333	333
334	334	if (objc != 3) {
335	335	Tcl_WrongNumArgs(interp, 2, objv, "window");
336	336	return TCL_ERROR;
337	337	}
338		if (TkGetWindowFromObj(interp, tkwin, objv[2], &slave) != TCL_OK) {
339		return TCL_ERROR;
340		}
341		slavePtr = GetPacker(slave);
342		if (slavePtr->masterPtr == NULL) {
	338	if (TkGetWindowFromObj(interp, tkwin, objv[2], &content) != TCL_OK) {
	339	return TCL_ERROR;
	340	}
	341	contentPtr = GetPacker(content);
	342	if (contentPtr->containerPtr == NULL) {
343	343	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
344	344	"window \"%s\" isn't packed", argv2));
345	345	Tcl_SetErrorCode(interp, "TK", "PACK", "NOT_PACKED", NULL);

348	348
349	349	infoObj = Tcl_NewObj();
350	350	Tcl_DictObjPut(NULL, infoObj, Tcl_NewStringObj("-in", -1),
351		TkNewWindowObj(slavePtr->masterPtr->tkwin));
	351	TkNewWindowObj(contentPtr->containerPtr->tkwin));
352	352	Tcl_DictObjPut(NULL, infoObj, Tcl_NewStringObj("-anchor", -1),
353		Tcl_NewStringObj(Tk_NameOfAnchor(slavePtr->anchor), -1));
	353	Tcl_NewStringObj(Tk_NameOfAnchor(contentPtr->anchor), -1));
354	354	Tcl_DictObjPut(NULL, infoObj, Tcl_NewStringObj("-expand", -1),
355		Tcl_NewBooleanObj(slavePtr->flags & EXPAND));
356		switch (slavePtr->flags & (FILLX\|FILLY)) {
	355	Tcl_NewBooleanObj(contentPtr->flags & EXPAND));
	356	switch (contentPtr->flags & (FILLX\|FILLY)) {
357	357	case 0:
358	358	Tcl_DictObjPut(NULL, infoObj, Tcl_NewStringObj("-fill", -1),
359	359	Tcl_NewStringObj("none", -1));

371	371	Tcl_NewStringObj("both", -1));
372	372	break;
373	373	}
374		TkAppendPadAmount(infoObj, "-ipadx", slavePtr->iPadX/2, slavePtr->iPadX);
375		TkAppendPadAmount(infoObj, "-ipady", slavePtr->iPadY/2, slavePtr->iPadY);
376		TkAppendPadAmount(infoObj, "-padx", slavePtr->padLeft,slavePtr->padX);
377		TkAppendPadAmount(infoObj, "-pady", slavePtr->padTop, slavePtr->padY);
	374	TkAppendPadAmount(infoObj, "-ipadx", contentPtr->iPadX/2, contentPtr->iPadX);
	375	TkAppendPadAmount(infoObj, "-ipady", contentPtr->iPadY/2, contentPtr->iPadY);
	376	TkAppendPadAmount(infoObj, "-padx", contentPtr->padLeft,contentPtr->padX);
	377	TkAppendPadAmount(infoObj, "-pady", contentPtr->padTop, contentPtr->padY);
378	378	Tcl_DictObjPut(NULL, infoObj, Tcl_NewStringObj("-side", -1),
379		Tcl_NewStringObj(sideNames[slavePtr->side], -1));
	379	Tcl_NewStringObj(sideNames[contentPtr->side], -1));
380	380	Tcl_SetObjResult(interp, infoObj);
381	381	break;
382	382	}
383	383	case PACK_PROPAGATE: {
384		Tk_Window master;
385		Packer *masterPtr;
	384	Tk_Window container;
	385	Packer *containerPtr;
386	386	int propagate;
387	387
388	388	if (objc > 4) {
389	389	Tcl_WrongNumArgs(interp, 2, objv, "window ?boolean?");
390	390	return TCL_ERROR;
391	391	}
392		if (TkGetWindowFromObj(interp, tkwin, objv[2], &master) != TCL_OK) {
393		return TCL_ERROR;
394		}
395		masterPtr = GetPacker(master);
	392	if (TkGetWindowFromObj(interp, tkwin, objv[2], &container) != TCL_OK) {
	393	return TCL_ERROR;
	394	}
	395	containerPtr = GetPacker(container);
396	396	if (objc == 3) {
397	397	Tcl_SetObjResult(interp,
398		Tcl_NewBooleanObj(!(masterPtr->flags & DONT_PROPAGATE)));
	398	Tcl_NewBooleanObj(!(containerPtr->flags & DONT_PROPAGATE)));
399	399	return TCL_OK;
400	400	}
401	401	if (Tcl_GetBooleanFromObj(interp, objv[3], &propagate) != TCL_OK) {

403	403	}
404	404	if (propagate) {
405	405	/*
406		* If we have slaves, we need to register as geometry master.
	406	* If we have content windows, we need to register as geometry container.
407	407	*/
408	408
409		if (masterPtr->slavePtr != NULL) {
410		if (TkSetGeometryMaster(interp, master, "pack") != TCL_OK) {
	409	if (containerPtr->contentPtr != NULL) {
	410	if (TkSetGeometryContainer(interp, container, "pack") != TCL_OK) {
411	411	return TCL_ERROR;
412	412	}
413		masterPtr->flags \|= ALLOCED_MASTER;
414		}
415		masterPtr->flags &= ~DONT_PROPAGATE;
	413	containerPtr->flags \|= ALLOCED_CONTAINER;
	414	}
	415	containerPtr->flags &= ~DONT_PROPAGATE;
416	416
417	417	/*
418		* Repack the master to allow new geometry information to
419		* propagate upwards to the master's master.
	418	* Repack the container to allow new geometry information to
	419	* propagate upwards to the container's container.
420	420	*/
421	421
422		if (masterPtr->abortPtr != NULL) {
423		*masterPtr->abortPtr = 1;
424		}
425		if (!(masterPtr->flags & REQUESTED_REPACK)) {
426		masterPtr->flags \|= REQUESTED_REPACK;
427		Tcl_DoWhenIdle(ArrangePacking, masterPtr);
	422	if (containerPtr->abortPtr != NULL) {
	423	*containerPtr->abortPtr = 1;
	424	}
	425	if (!(containerPtr->flags & REQUESTED_REPACK)) {
	426	containerPtr->flags \|= REQUESTED_REPACK;
	427	Tcl_DoWhenIdle(ArrangePacking, containerPtr);
428	428	}
429	429	} else {
430		if (masterPtr->flags & ALLOCED_MASTER) {
431		TkFreeGeometryMaster(master, "pack");
432		masterPtr->flags &= ~ALLOCED_MASTER;
433		}
434		masterPtr->flags \|= DONT_PROPAGATE;
	430	if (containerPtr->flags & ALLOCED_CONTAINER) {
	431	TkFreeGeometryContainer(container, "pack");
	432	containerPtr->flags &= ~ALLOCED_CONTAINER;
	433	}
	434	containerPtr->flags \|= DONT_PROPAGATE;
435	435	}
436	436	break;
437	437	}
	438	case PACK_CONTENT:
438	439	case PACK_SLAVES: {
439		Tk_Window master;
440		Packer masterPtr, slavePtr;
	440	Tk_Window container;
	441	Packer containerPtr, contentPtr;
441	442	Tcl_Obj *resultObj;
442	443
443	444	if (objc != 3) {
444	445	Tcl_WrongNumArgs(interp, 2, objv, "window");
445	446	return TCL_ERROR;
446	447	}
447		if (TkGetWindowFromObj(interp, tkwin, objv[2], &master) != TCL_OK) {
	448	if (TkGetWindowFromObj(interp, tkwin, objv[2], &container) != TCL_OK) {
448	449	return TCL_ERROR;
449	450	}
450	451	resultObj = Tcl_NewObj();
451		masterPtr = GetPacker(master);
452		for (slavePtr = masterPtr->slavePtr; slavePtr != NULL;
453		slavePtr = slavePtr->nextPtr) {
	452	containerPtr = GetPacker(container);
	453	for (contentPtr = containerPtr->contentPtr; contentPtr != NULL;
	454	contentPtr = contentPtr->nextPtr) {
454	455	Tcl_ListObjAppendElement(NULL, resultObj,
455		TkNewWindowObj(slavePtr->tkwin));
	456	TkNewWindowObj(contentPtr->tkwin));
456	457	}
457	458	Tcl_SetObjResult(interp, resultObj);
458	459	break;

469	470	return TCL_ERROR;
470	471	}
471	472	packPtr = GetPacker(tkwin2);
472		if ((packPtr != NULL) && (packPtr->masterPtr != NULL)) {
	473	if ((packPtr != NULL) && (packPtr->containerPtr != NULL)) {
473	474	Tk_ManageGeometry(tkwin2, NULL, NULL);
474		if (packPtr->masterPtr->tkwin != Tk_Parent(packPtr->tkwin)) {
	475	if (packPtr->containerPtr->tkwin != Tk_Parent(packPtr->tkwin)) {
475	476	Tk_UnmaintainGeometry(packPtr->tkwin,
476		packPtr->masterPtr->tkwin);
	477	packPtr->containerPtr->tkwin);
477	478	}
478	479	Unlink(packPtr);
479	480	Tk_UnmapWindow(packPtr->tkwin);

503	504	*------------------------------------------------------------------------
504	505	*/
505	506
506		/* ARGSUSED */
507	507	static void
508	508	PackReqProc(
509	509	ClientData clientData, /* Packer's information about window that got
510	510	* new preferred geometry. */
511		Tk_Window tkwin) /* Other Tk-related information about the
	511	TCL_UNUSED(Tk_Window)) /* Other Tk-related information about the
512	512	* window. */
513	513	{
514		register Packer *packPtr = clientData;
515
516		packPtr = packPtr->masterPtr;
	514	Packer packPtr = (Packer )clientData;
	515
	516	packPtr = packPtr->containerPtr;
517	517	if (!(packPtr->flags & REQUESTED_REPACK)) {
518	518	packPtr->flags \|= REQUESTED_REPACK;
519	519	Tcl_DoWhenIdle(ArrangePacking, packPtr);

523	523	/*
524	524	*------------------------------------------------------------------------
525	525	*
526		* PackLostSlaveProc --
	526	* PackLostContentProc --
527	527	*
528	528	* This function is invoked by Tk whenever some other geometry claims
529		* control over a slave that used to be managed by us.
	529	* control over a content window that used to be managed by us.
530	530	*
531	531	* Results:
532	532	* None.
533	533	*
534	534	* Side effects:
535		* Forgets all packer-related information about the slave.
	535	* Forgets all packer-related information about the content.
536	536	*
537	537	*------------------------------------------------------------------------
538	538	*/
539	539
540		/* ARGSUSED */
541	540	static void
542		PackLostSlaveProc(
543		ClientData clientData, /* Packer structure for slave window that was
	541	PackLostContentProc(
	542	void clientData, / Packer structure for content window that was
544	543	* stolen away. */
545		Tk_Window tkwin) /* Tk's handle for the slave window. */
	544	TCL_UNUSED(Tk_Window)) /* Tk's handle for the content window. */
546	545	{
547		register Packer *slavePtr = clientData;
548
549		if (slavePtr->masterPtr->tkwin != Tk_Parent(slavePtr->tkwin)) {
550		Tk_UnmaintainGeometry(slavePtr->tkwin, slavePtr->masterPtr->tkwin);
551		}
552		Unlink(slavePtr);
553		Tk_UnmapWindow(slavePtr->tkwin);
	546	Packer contentPtr = (Packer )clientData;
	547
	548	if (contentPtr->containerPtr->tkwin != Tk_Parent(contentPtr->tkwin)) {
	549	Tk_UnmaintainGeometry(contentPtr->tkwin, contentPtr->containerPtr->tkwin);
	550	}
	551	Unlink(contentPtr);
	552	Tk_UnmapWindow(contentPtr->tkwin);
554	553	}
555	554
556	555	/*

567	566	* None.
568	567	*
569	568	* Side effects:
570		* The packed slaves of masterPtr may get resized or moved.
	569	* The packed content of containerPtr may get resized or moved.
571	570	*
572	571	*------------------------------------------------------------------------
573	572	*/
574	573
575	574	static void
576	575	ArrangePacking(
577		ClientData clientData) /* Structure describing master whose slaves
	576	ClientData clientData) /* Structure describing container whose content
578	577	* are to be re-layed out. */
579	578	{
580		register Packer *masterPtr = clientData;
581		register Packer *slavePtr;
	579	Packer containerPtr = (Packer )clientData;
	580	Packer *contentPtr;
582	581	int cavityX, cavityY, cavityWidth, cavityHeight;
583	582	/* These variables keep track of the
584	583	* as-yet-unallocated space remaining in the
585		* middle of the master window. */
	584	* middle of the container window. */
586	585	int frameX, frameY, frameWidth, frameHeight;
587	586	/* These variables keep track of the frame
588	587	* allocated to the current window. */

595	594	int borderLeft, borderRight;
596	595	int maxWidth, maxHeight, tmp;
597	596
598		masterPtr->flags &= ~REQUESTED_REPACK;
	597	containerPtr->flags &= ~REQUESTED_REPACK;
599	598
600	599	/*
601		* If the master has no slaves anymore, then don't do anything at all:
602		* just leave the master's size as-is.
	600	* If the container has no content anymore, then leave the container size as-is.
	601	* Otherwise there is no way to "relinquish" control over the container
	602	* so another geometry manager can take over.
603	603	*/
604	604
605		if (masterPtr->slavePtr == NULL) {
	605	if (containerPtr->contentPtr == NULL) {
606	606	return;
607	607	}
608	608

612	612	* necessary.
613	613	*/
614	614
615		if (masterPtr->abortPtr != NULL) {
616		*masterPtr->abortPtr = 1;
617		}
618		masterPtr->abortPtr = &abort;
	615	if (containerPtr->abortPtr != NULL) {
	616	*containerPtr->abortPtr = 1;
	617	}
	618	containerPtr->abortPtr = &abort;
619	619	abort = 0;
620		Tcl_Preserve(masterPtr);
	620	Tcl_Preserve(containerPtr);
621	621
622	622	/*
623		* Pass #1: scan all the slaves to figure out the total amount of space
	623	* Pass #1: scan all the content to figure out the total amount of space
624	624	* needed. Two separate width and height values are computed:
625	625	*
626	626	* width - Holds the sum of the widths (plus padding) of all the
627		* slaves seen so far that were packed LEFT or RIGHT.
	627	* content seen so far that were packed LEFT or RIGHT.
628	628	* height - Holds the sum of the heights (plus padding) of all the
629		* slaves seen so far that were packed TOP or BOTTOM.
	629	* content seen so far that were packed TOP or BOTTOM.
630	630	*
631		* maxWidth - Gradually builds up the width needed by the master to
632		* just barely satisfy all the slave's needs. For each
633		* slave, the code computes the width needed for all the
634		* slaves so far and updates maxWidth if the new value is
	631	* maxWidth - Gradually builds up the width needed by the container to
	632	* just barely satisfy all the content's needs. For each
	633	* content, the code computes the width needed for all the
	634	* content so far and updates maxWidth if the new value is
635	635	* greater.
636	636	* maxHeight - Same as maxWidth, except keeps height info.
637	637	*/
638	638
639		width = maxWidth = Tk_InternalBorderLeft(masterPtr->tkwin) +
640		Tk_InternalBorderRight(masterPtr->tkwin);
641		height = maxHeight = Tk_InternalBorderTop(masterPtr->tkwin) +
642		Tk_InternalBorderBottom(masterPtr->tkwin);
643		for (slavePtr = masterPtr->slavePtr; slavePtr != NULL;
644		slavePtr = slavePtr->nextPtr) {
645		if ((slavePtr->side == TOP) \|\| (slavePtr->side == BOTTOM)) {
646		tmp = Tk_ReqWidth(slavePtr->tkwin) + slavePtr->doubleBw
647		+ slavePtr->padX + slavePtr->iPadX + width;
	639	width = maxWidth = Tk_InternalBorderLeft(containerPtr->tkwin) +
	640	Tk_InternalBorderRight(containerPtr->tkwin);
	641	height = maxHeight = Tk_InternalBorderTop(containerPtr->tkwin) +
	642	Tk_InternalBorderBottom(containerPtr->tkwin);
	643	for (contentPtr = containerPtr->contentPtr; contentPtr != NULL;
	644	contentPtr = contentPtr->nextPtr) {
	645	if ((contentPtr->side == TOP) \|\| (contentPtr->side == BOTTOM)) {
	646	tmp = Tk_ReqWidth(contentPtr->tkwin) + contentPtr->doubleBw
	647	+ contentPtr->padX + contentPtr->iPadX + width;
648	648	if (tmp > maxWidth) {
649	649	maxWidth = tmp;
650	650	}
651		height += Tk_ReqHeight(slavePtr->tkwin) + slavePtr->doubleBw
652		+ slavePtr->padY + slavePtr->iPadY;
	651	height += Tk_ReqHeight(contentPtr->tkwin) + contentPtr->doubleBw
	652	+ contentPtr->padY + contentPtr->iPadY;
653	653	} else {
654		tmp = Tk_ReqHeight(slavePtr->tkwin) + slavePtr->doubleBw
655		+ slavePtr->padY + slavePtr->iPadY + height;
	654	tmp = Tk_ReqHeight(contentPtr->tkwin) + contentPtr->doubleBw
	655	+ contentPtr->padY + contentPtr->iPadY + height;
656	656	if (tmp > maxHeight) {
657	657	maxHeight = tmp;
658	658	}
659		width += Tk_ReqWidth(slavePtr->tkwin) + slavePtr->doubleBw
660		+ slavePtr->padX + slavePtr->iPadX;
	659	width += Tk_ReqWidth(contentPtr->tkwin) + contentPtr->doubleBw
	660	+ contentPtr->padX + contentPtr->iPadX;
661	661	}
662	662	}
663	663	if (width > maxWidth) {

667	667	maxHeight = height;
668	668	}
669	669
670		if (maxWidth < Tk_MinReqWidth(masterPtr->tkwin)) {
671		maxWidth = Tk_MinReqWidth(masterPtr->tkwin);
672		}
673		if (maxHeight < Tk_MinReqHeight(masterPtr->tkwin)) {
674		maxHeight = Tk_MinReqHeight(masterPtr->tkwin);
	670	if (maxWidth < Tk_MinReqWidth(containerPtr->tkwin)) {
	671	maxWidth = Tk_MinReqWidth(containerPtr->tkwin);
	672	}
	673	if (maxHeight < Tk_MinReqHeight(containerPtr->tkwin)) {
	674	maxHeight = Tk_MinReqHeight(containerPtr->tkwin);
675	675	}
676	676
677	677	/*
678		* If the total amount of space needed in the master window has changed,
	678	* If the total amount of space needed in the container window has changed,
679	679	* and if we're propagating geometry information, then notify the next
680	680	* geometry manager up and requeue ourselves to start again after the
681		* master has had a chance to resize us.
	681	* container has had a chance to resize us.
682	682	*/
683	683
684		if (((maxWidth != Tk_ReqWidth(masterPtr->tkwin))
685		\|\| (maxHeight != Tk_ReqHeight(masterPtr->tkwin)))
686		&& !(masterPtr->flags & DONT_PROPAGATE)) {
687		Tk_GeometryRequest(masterPtr->tkwin, maxWidth, maxHeight);
688		masterPtr->flags \|= REQUESTED_REPACK;
689		Tcl_DoWhenIdle(ArrangePacking, masterPtr);
	684	if (((maxWidth != Tk_ReqWidth(containerPtr->tkwin))
	685	\|\| (maxHeight != Tk_ReqHeight(containerPtr->tkwin)))
	686	&& !(containerPtr->flags & DONT_PROPAGATE)) {
	687	Tk_GeometryRequest(containerPtr->tkwin, maxWidth, maxHeight);
	688	containerPtr->flags \|= REQUESTED_REPACK;
	689	Tcl_DoWhenIdle(ArrangePacking, containerPtr);
690	690	goto done;
691	691	}
692	692
693	693	/*
694		* Pass #2: scan the slaves a second time assigning new sizes. The
	694	* Pass #2: scan the content a second time assigning new sizes. The
695	695	* "cavity" variables keep track of the unclaimed space in the cavity of
696	696	* the window; this shrinks inward as we allocate windows around the
697	697	* edges. The "frame" variables keep track of the space allocated to the

699	699	* somewhere inside the frame, depending on anchor.
700	700	*/
701	701
702		cavityX = x = Tk_InternalBorderLeft(masterPtr->tkwin);
703		cavityY = y = Tk_InternalBorderTop(masterPtr->tkwin);
704		cavityWidth = Tk_Width(masterPtr->tkwin) -
705		Tk_InternalBorderLeft(masterPtr->tkwin) -
706		Tk_InternalBorderRight(masterPtr->tkwin);
707		cavityHeight = Tk_Height(masterPtr->tkwin) -
708		Tk_InternalBorderTop(masterPtr->tkwin) -
709		Tk_InternalBorderBottom(masterPtr->tkwin);
710		for (slavePtr = masterPtr->slavePtr; slavePtr != NULL;
711		slavePtr = slavePtr->nextPtr) {
712		if ((slavePtr->side == TOP) \|\| (slavePtr->side == BOTTOM)) {
	702	cavityX = x = Tk_InternalBorderLeft(containerPtr->tkwin);
	703	cavityY = y = Tk_InternalBorderTop(containerPtr->tkwin);
	704	cavityWidth = Tk_Width(containerPtr->tkwin) -
	705	Tk_InternalBorderLeft(containerPtr->tkwin) -
	706	Tk_InternalBorderRight(containerPtr->tkwin);
	707	cavityHeight = Tk_Height(containerPtr->tkwin) -
	708	Tk_InternalBorderTop(containerPtr->tkwin) -
	709	Tk_InternalBorderBottom(containerPtr->tkwin);
	710	for (contentPtr = containerPtr->contentPtr; contentPtr != NULL;
	711	contentPtr = contentPtr->nextPtr) {
	712	if ((contentPtr->side == TOP) \|\| (contentPtr->side == BOTTOM)) {
713	713	frameWidth = cavityWidth;
714		frameHeight = Tk_ReqHeight(slavePtr->tkwin) + slavePtr->doubleBw
715		+ slavePtr->padY + slavePtr->iPadY;
716		if (slavePtr->flags & EXPAND) {
717		frameHeight += YExpansion(slavePtr, cavityHeight);
	714	frameHeight = Tk_ReqHeight(contentPtr->tkwin) + contentPtr->doubleBw
	715	+ contentPtr->padY + contentPtr->iPadY;
	716	if (contentPtr->flags & EXPAND) {
	717	frameHeight += YExpansion(contentPtr, cavityHeight);
718	718	}
719	719	cavityHeight -= frameHeight;
720	720	if (cavityHeight < 0) {

722	722	cavityHeight = 0;
723	723	}
724	724	frameX = cavityX;
725		if (slavePtr->side == TOP) {
	725	if (contentPtr->side == TOP) {
726	726	frameY = cavityY;
727	727	cavityY += frameHeight;
728	728	} else {

730	730	}
731	731	} else {
732	732	frameHeight = cavityHeight;
733		frameWidth = Tk_ReqWidth(slavePtr->tkwin) + slavePtr->doubleBw
734		+ slavePtr->padX + slavePtr->iPadX;
735		if (slavePtr->flags & EXPAND) {
736		frameWidth += XExpansion(slavePtr, cavityWidth);
	733	frameWidth = Tk_ReqWidth(contentPtr->tkwin) + contentPtr->doubleBw
	734	+ contentPtr->padX + contentPtr->iPadX;
	735	if (contentPtr->flags & EXPAND) {
	736	frameWidth += XExpansion(contentPtr, cavityWidth);
737	737	}
738	738	cavityWidth -= frameWidth;
739	739	if (cavityWidth < 0) {

741	741	cavityWidth = 0;
742	742	}
743	743	frameY = cavityY;
744		if (slavePtr->side == LEFT) {
	744	if (contentPtr->side == LEFT) {
745	745	frameX = cavityX;
746	746	cavityX += frameWidth;
747	747	} else {

758	758	* completely ignored except when computing frame size).
759	759	*/
760	760
761		if (slavePtr->flags & OLD_STYLE) {
	761	if (contentPtr->flags & OLD_STYLE) {
762	762	borderX = borderY = 0;
763	763	borderTop = borderBtm = 0;
764	764	borderLeft = borderRight = 0;
765	765	} else {
766		borderX = slavePtr->padX;
767		borderY = slavePtr->padY;
768		borderLeft = slavePtr->padLeft;
	766	borderX = contentPtr->padX;
	767	borderY = contentPtr->padY;
	768	borderLeft = contentPtr->padLeft;
769	769	borderRight = borderX - borderLeft;
770		borderTop = slavePtr->padTop;
	770	borderTop = contentPtr->padTop;
771	771	borderBtm = borderY - borderTop;
772	772	}
773		width = Tk_ReqWidth(slavePtr->tkwin) + slavePtr->doubleBw
774		+ slavePtr->iPadX;
775		if ((slavePtr->flags & FILLX)
	773	width = Tk_ReqWidth(contentPtr->tkwin) + contentPtr->doubleBw
	774	+ contentPtr->iPadX;
	775	if ((contentPtr->flags & FILLX)
776	776	\|\| (width > (frameWidth - borderX))) {
777	777	width = frameWidth - borderX;
778	778	}
779		height = Tk_ReqHeight(slavePtr->tkwin) + slavePtr->doubleBw
780		+ slavePtr->iPadY;
781		if ((slavePtr->flags & FILLY)
	779	height = Tk_ReqHeight(contentPtr->tkwin) + contentPtr->doubleBw
	780	+ contentPtr->iPadY;
	781	if ((contentPtr->flags & FILLY)
782	782	\|\| (height > (frameHeight - borderY))) {
783	783	height = frameHeight - borderY;
784	784	}
785		switch (slavePtr->anchor) {
	785	switch (contentPtr->anchor) {
786	786	case TK_ANCHOR_N:
787	787	x = frameX + (borderLeft + frameWidth - width - borderRight)/2;
788	788	y = frameY + borderTop;

822	822	default:
823	823	Tcl_Panic("bad frame factor in ArrangePacking");
824	824	}
825		width -= slavePtr->doubleBw;
826		height -= slavePtr->doubleBw;
	825	width -= contentPtr->doubleBw;
	826	height -= contentPtr->doubleBw;
827	827
828	828	/*
829	829	* The final step is to set the position, size, and mapped/unmapped
830		* state of the slave. If the slave is a child of the master, then do
	830	* state of the content. If the content is a child of the container, then do
831	831	* this here. Otherwise let Tk_MaintainGeometry do the work.
832	832	*/
833	833
834		if (masterPtr->tkwin == Tk_Parent(slavePtr->tkwin)) {
	834	if (containerPtr->tkwin == Tk_Parent(contentPtr->tkwin)) {
835	835	if ((width <= 0) \|\| (height <= 0)) {
836		Tk_UnmapWindow(slavePtr->tkwin);
	836	Tk_UnmapWindow(contentPtr->tkwin);
837	837	} else {
838		if ((x != Tk_X(slavePtr->tkwin))
839		\|\| (y != Tk_Y(slavePtr->tkwin))
840		\|\| (width != Tk_Width(slavePtr->tkwin))
841		\|\| (height != Tk_Height(slavePtr->tkwin))) {
842		Tk_MoveResizeWindow(slavePtr->tkwin, x, y, width, height);
	838	if ((x != Tk_X(contentPtr->tkwin))
	839	\|\| (y != Tk_Y(contentPtr->tkwin))
	840	\|\| (width != Tk_Width(contentPtr->tkwin))
	841	\|\| (height != Tk_Height(contentPtr->tkwin))) {
	842	Tk_MoveResizeWindow(contentPtr->tkwin, x, y, width, height);
843	843	}
844	844	if (abort) {
845	845	goto done;
846	846	}
847	847
848	848	/*
849		* Don't map the slave if the master isn't mapped: wait until
850		* the master gets mapped later.
	849	* Don't map the content if the container isn't mapped: wait until
	850	* the container gets mapped later.
851	851	*/
852	852
853		if (Tk_IsMapped(masterPtr->tkwin)) {
854		Tk_MapWindow(slavePtr->tkwin);
	853	if (Tk_IsMapped(containerPtr->tkwin)) {
	854	Tk_MapWindow(contentPtr->tkwin);
855	855	}
856	856	}
857	857	} else {
858	858	if ((width <= 0) \|\| (height <= 0)) {
859		Tk_UnmaintainGeometry(slavePtr->tkwin, masterPtr->tkwin);
860		Tk_UnmapWindow(slavePtr->tkwin);
	859	Tk_UnmaintainGeometry(contentPtr->tkwin, containerPtr->tkwin);
	860	Tk_UnmapWindow(contentPtr->tkwin);
861	861	} else {
862		Tk_MaintainGeometry(slavePtr->tkwin, masterPtr->tkwin,
	862	Tk_MaintainGeometry(contentPtr->tkwin, containerPtr->tkwin,
863	863	x, y, width, height);
864	864	}
865	865	}

876	876	}
877	877
878	878	done:
879		masterPtr->abortPtr = NULL;
880		Tcl_Release(masterPtr);
	879	containerPtr->abortPtr = NULL;
	880	Tcl_Release(containerPtr);
881	881	}
882	882
883	883	/*

885	885	*
886	886	* XExpansion --
887	887	*
888		* Given a list of packed slaves, the first of which is packed on the
	888	* Given a list of packed content, the first of which is packed on the
889	889	* left or right and is expandable, compute how much to expand the child.
890	890	*
891	891	* Results:

900	900
901	901	static int
902	902	XExpansion(
903		register Packer slavePtr, / First in list of remaining slaves. */
	903	Packer contentPtr, / First in list of remaining content. */
904	904	int cavityWidth) /* Horizontal space left for all remaining
905		* slaves. */
	905	* content. */
906	906	{
907	907	int numExpand, minExpand, curExpand;
908	908	int childWidth;

920	920
921	921	minExpand = cavityWidth;
922	922	numExpand = 0;
923		for ( ; slavePtr != NULL; slavePtr = slavePtr->nextPtr) {
924		childWidth = Tk_ReqWidth(slavePtr->tkwin) + slavePtr->doubleBw
925		+ slavePtr->padX + slavePtr->iPadX;
926		if ((slavePtr->side == TOP) \|\| (slavePtr->side == BOTTOM)) {
	923	for ( ; contentPtr != NULL; contentPtr = contentPtr->nextPtr) {
	924	childWidth = Tk_ReqWidth(contentPtr->tkwin) + contentPtr->doubleBw
	925	+ contentPtr->padX + contentPtr->iPadX;
	926	if ((contentPtr->side == TOP) \|\| (contentPtr->side == BOTTOM)) {
927	927	if (numExpand) {
928	928	curExpand = (cavityWidth - childWidth)/numExpand;
929	929	if (curExpand < minExpand) {

932	932	}
933	933	} else {
934	934	cavityWidth -= childWidth;
935		if (slavePtr->flags & EXPAND) {
	935	if (contentPtr->flags & EXPAND) {
936	936	numExpand++;
937	937	}
938	938	}

951	951	*
952	952	* YExpansion --
953	953	*
954		* Given a list of packed slaves, the first of which is packed on the top
	954	* Given a list of packed content, the first of which is packed on the top
955	955	* or bottom and is expandable, compute how much to expand the child.
956	956	*
957	957	* Results:

966	966
967	967	static int
968	968	YExpansion(
969		register Packer slavePtr, / First in list of remaining slaves. */
	969	Packer contentPtr, / First in list of remaining content. */
970	970	int cavityHeight) /* Vertical space left for all remaining
971		* slaves. */
	971	* content. */
972	972	{
973	973	int numExpand, minExpand, curExpand;
974	974	int childHeight;

979	979
980	980	minExpand = cavityHeight;
981	981	numExpand = 0;
982		for ( ; slavePtr != NULL; slavePtr = slavePtr->nextPtr) {
983		childHeight = Tk_ReqHeight(slavePtr->tkwin) + slavePtr->doubleBw
984		+ slavePtr->padY + slavePtr->iPadY;
985		if ((slavePtr->side == LEFT) \|\| (slavePtr->side == RIGHT)) {
	982	for ( ; contentPtr != NULL; contentPtr = contentPtr->nextPtr) {
	983	childHeight = Tk_ReqHeight(contentPtr->tkwin) + contentPtr->doubleBw
	984	+ contentPtr->padY + contentPtr->iPadY;
	985	if ((contentPtr->side == LEFT) \|\| (contentPtr->side == RIGHT)) {
986	986	if (numExpand) {
987	987	curExpand = (cavityHeight - childHeight)/numExpand;
988	988	if (curExpand < minExpand) {

991	991	}
992	992	} else {
993	993	cavityHeight -= childHeight;
994		if (slavePtr->flags & EXPAND) {
	994	if (contentPtr->flags & EXPAND) {
995	995	numExpand++;
996	996	}
997	997	}

1029	1029	Tk_Window tkwin) /* Token for window for which packer structure
1030	1030	* is desired. */
1031	1031	{
1032		register Packer *packPtr;
	1032	Packer *packPtr;
1033	1033	Tcl_HashEntry *hPtr;
1034	1034	int isNew;
1035	1035	TkDisplay dispPtr = ((TkWindow ) tkwin)->dispPtr;

1047	1047	hPtr = Tcl_CreateHashEntry(&dispPtr->packerHashTable, (char *) tkwin,
1048	1048	&isNew);
1049	1049	if (!isNew) {
1050		return Tcl_GetHashValue(hPtr);
1051		}
1052		packPtr = ckalloc(sizeof(Packer));
	1050	return (Packer *)Tcl_GetHashValue(hPtr);
	1051	}
	1052	packPtr = (Packer *)ckalloc(sizeof(Packer));
1053	1053	packPtr->tkwin = tkwin;
1054		packPtr->masterPtr = NULL;
	1054	packPtr->containerPtr = NULL;
1055	1055	packPtr->nextPtr = NULL;
1056		packPtr->slavePtr = NULL;
	1056	packPtr->contentPtr = NULL;
1057	1057	packPtr->side = TOP;
1058	1058	packPtr->anchor = TK_ANCHOR_CENTER;
1059	1059	packPtr->padX = packPtr->padY = 0;

1074	1074	* PackAfter --
1075	1075	*
1076	1076	* This function does most of the real work of adding one or more windows
1077		* into the packing order for its master.
	1077	* into the packing order for its container.
1078	1078	*
1079	1079	* Results:
1080	1080	* A standard Tcl return value.

1091	1091	Tcl_Interp interp, / Interpreter for error reporting. */
1092	1092	Packer prevPtr, / Pack windows in argv just after this
1093	1093	* window; NULL means pack as first child of
1094		* masterPtr. */
1095		Packer masterPtr, / Master in which to pack windows. */
	1094	* containerPtr. */
	1095	Packer containerPtr, / Container in which to pack windows. */
1096	1096	int objc, /* Number of elements in objv. */
1097	1097	Tcl_Obj const objv[]) / Array of lists, each containing 2 elements:
1098	1098	* window name and side against which to
1099	1099	* pack. */
1100	1100	{
1101		register Packer *packPtr;
	1101	Packer *packPtr;
1102	1102	Tk_Window tkwin, ancestor, parent;
1103	1103	Tcl_Obj **options;
1104	1104	int index, optionCount, c;

1124	1124	* its parent.
1125	1125	*/
1126	1126
1127		if (TkGetWindowFromObj(interp, masterPtr->tkwin, objv[0], &tkwin)
	1127	if (TkGetWindowFromObj(interp, containerPtr->tkwin, objv[0], &tkwin)
1128	1128	!= TCL_OK) {
1129	1129	return TCL_ERROR;
1130	1130	}
1131	1131
1132	1132	parent = Tk_Parent(tkwin);
1133		for (ancestor = masterPtr->tkwin; ; ancestor = Tk_Parent(ancestor)) {
	1133	for (ancestor = containerPtr->tkwin; ; ancestor = Tk_Parent(ancestor)) {
1134	1134	if (ancestor == parent) {
1135	1135	break;
1136	1136	}

1138	1138	badWindow:
1139	1139	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
1140	1140	"can't pack %s inside %s", Tcl_GetString(objv[0]),
1141		Tk_PathName(masterPtr->tkwin)));
	1141	Tk_PathName(containerPtr->tkwin)));
1142	1142	Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "HIERARCHY", NULL);
1143	1143	return TCL_ERROR;
1144	1144	}

1146	1146	if (((Tk_FakeWin *) (tkwin))->flags & TK_TOP_HIERARCHY) {
1147	1147	goto badWindow;
1148	1148	}
1149		if (tkwin == masterPtr->tkwin) {
	1149	if (tkwin == containerPtr->tkwin) {
1150	1150	goto badWindow;
1151	1151	}
1152	1152	packPtr = GetPacker(tkwin);

1168	1168	packPtr->flags \|= OLD_STYLE;
1169	1169	for (index = 0 ; index < optionCount; index++) {
1170	1170	Tcl_Obj *curOptPtr = options[index];
1171		const char *curOpt = Tcl_GetString(curOptPtr);
1172		size_t length = curOptPtr->length;
	1171	int length;
	1172	const char *curOpt = Tcl_GetStringFromObj(curOptPtr, &length);
1173	1173
1174	1174	c = curOpt[0];
1175	1175

1226	1226	packPtr->iPadY = 0;
1227	1227	index++;
1228	1228	} else if ((c == 'f') && (length > 1)
1229		&& (strncmp(curOpt, "frame", (size_t) length) == 0)) {
	1229	&& (strncmp(curOpt, "frame", length) == 0)) {
1230	1230	if (optionCount < (index+2)) {
1231	1231	Tcl_SetObjResult(interp, Tcl_NewStringObj(
1232	1232	"wrong # args: \"frame\""

1256	1256	* Unpack this window if it's currently packed.
1257	1257	*/
1258	1258
1259		if (packPtr->masterPtr != NULL) {
1260		if ((packPtr->masterPtr != masterPtr) &&
1261		(packPtr->masterPtr->tkwin
	1259	if (packPtr->containerPtr != NULL) {
	1260	if ((packPtr->containerPtr != containerPtr) &&
	1261	(packPtr->containerPtr->tkwin
1262	1262	!= Tk_Parent(packPtr->tkwin))) {
1263	1263	Tk_UnmaintainGeometry(packPtr->tkwin,
1264		packPtr->masterPtr->tkwin);
	1264	packPtr->containerPtr->tkwin);
1265	1265	}
1266	1266	Unlink(packPtr);
1267	1267	}
1268	1268
1269	1269	/*
1270		* Add the window in the correct place in its master's packing
	1270	* Add the window in the correct place in its container's packing
1271	1271	* order, then make sure that the window is managed by us.
1272	1272	*/
1273	1273
1274		packPtr->masterPtr = masterPtr;
	1274	packPtr->containerPtr = containerPtr;
1275	1275	if (prevPtr == NULL) {
1276		packPtr->nextPtr = masterPtr->slavePtr;
1277		masterPtr->slavePtr = packPtr;
	1276	packPtr->nextPtr = containerPtr->contentPtr;
	1277	containerPtr->contentPtr = packPtr;
1278	1278	} else {
1279	1279	packPtr->nextPtr = prevPtr->nextPtr;
1280	1280	prevPtr->nextPtr = packPtr;
1281	1281	}
1282	1282	Tk_ManageGeometry(tkwin, &packerType, packPtr);
1283	1283
1284		if (!(masterPtr->flags & DONT_PROPAGATE)) {
1285		if (TkSetGeometryMaster(interp, masterPtr->tkwin, "pack")
	1284	if (!(containerPtr->flags & DONT_PROPAGATE)) {
	1285	if (TkSetGeometryContainer(interp, containerPtr->tkwin, "pack")
1286	1286	!= TCL_OK) {
1287	1287	Tk_ManageGeometry(tkwin, NULL, NULL);
1288	1288	Unlink(packPtr);
1289	1289	return TCL_ERROR;
1290	1290	}
1291		masterPtr->flags \|= ALLOCED_MASTER;
	1291	containerPtr->flags \|= ALLOCED_CONTAINER;
1292	1292	}
1293	1293	}
1294	1294	}
1295	1295
1296	1296	/*
1297		* Arrange for the master to be re-packed at the first idle moment.
	1297	* Arrange for the container to be re-packed at the first idle moment.
1298	1298	*/
1299	1299
1300		if (masterPtr->abortPtr != NULL) {
1301		*masterPtr->abortPtr = 1;
1302		}
1303		if (!(masterPtr->flags & REQUESTED_REPACK)) {
1304		masterPtr->flags \|= REQUESTED_REPACK;
1305		Tcl_DoWhenIdle(ArrangePacking, masterPtr);
	1300	if (containerPtr->abortPtr != NULL) {
	1301	*containerPtr->abortPtr = 1;
	1302	}
	1303	if (!(containerPtr->flags & REQUESTED_REPACK)) {
	1304	containerPtr->flags \|= REQUESTED_REPACK;
	1305	Tcl_DoWhenIdle(ArrangePacking, containerPtr);
1306	1306	}
1307	1307	return TCL_OK;
1308	1308	}

1312	1312	*
1313	1313	* Unlink --
1314	1314	*
1315		* Remove a packer from its master's list of slaves.
	1315	* Remove a packer from its container's list of content.
1316	1316	*
1317	1317	* Results:
1318	1318	* None.
1319	1319	*
1320	1320	* Side effects:
1321		* The master will be scheduled for repacking.
	1321	* The container will be scheduled for repacking.
1322	1322	*
1323	1323	*----------------------------------------------------------------------
1324	1324	*/
1325	1325
1326	1326	static void
1327	1327	Unlink(
1328		register Packer packPtr) / Window to unlink. */
	1328	Packer packPtr) / Window to unlink. */
1329	1329	{
1330		register Packer masterPtr, packPtr2;
1331
1332		masterPtr = packPtr->masterPtr;
1333		if (masterPtr == NULL) {
	1330	Packer containerPtr, packPtr2;
	1331
	1332	containerPtr = packPtr->containerPtr;
	1333	if (containerPtr == NULL) {
1334	1334	return;
1335	1335	}
1336		if (masterPtr->slavePtr == packPtr) {
1337		masterPtr->slavePtr = packPtr->nextPtr;
	1336	if (containerPtr->contentPtr == packPtr) {
	1337	containerPtr->contentPtr = packPtr->nextPtr;
1338	1338	} else {
1339		for (packPtr2 = masterPtr->slavePtr; ; packPtr2 = packPtr2->nextPtr) {
	1339	for (packPtr2 = containerPtr->contentPtr; ; packPtr2 = packPtr2->nextPtr) {
1340	1340	if (packPtr2 == NULL) {
1341	1341	Tcl_Panic("Unlink couldn't find previous window");
1342	1342	}

1346	1346	}
1347	1347	}
1348	1348	}
1349		if (!(masterPtr->flags & REQUESTED_REPACK)) {
1350		masterPtr->flags \|= REQUESTED_REPACK;
1351		Tcl_DoWhenIdle(ArrangePacking, masterPtr);
1352		}
1353		if (masterPtr->abortPtr != NULL) {
1354		*masterPtr->abortPtr = 1;
1355		}
1356
1357		packPtr->masterPtr = NULL;
	1349	if (!(containerPtr->flags & REQUESTED_REPACK)) {
	1350	containerPtr->flags \|= REQUESTED_REPACK;
	1351	Tcl_DoWhenIdle(ArrangePacking, containerPtr);
	1352	}
	1353	if (containerPtr->abortPtr != NULL) {
	1354	*containerPtr->abortPtr = 1;
	1355	}
	1356
	1357	packPtr->containerPtr = NULL;
1358	1358
1359	1359	/*
1360		* If we have emptied this master from slaves it means we are no longer
	1360	* If we have emptied this container from content it means we are no longer
1361	1361	* handling it and should mark it as free.
1362	1362	*/
1363	1363
1364		if ((masterPtr->slavePtr == NULL) && (masterPtr->flags & ALLOCED_MASTER)) {
1365		TkFreeGeometryMaster(masterPtr->tkwin, "pack");
1366		masterPtr->flags &= ~ALLOCED_MASTER;
	1364	if ((containerPtr->contentPtr == NULL) && (containerPtr->flags & ALLOCED_CONTAINER)) {
	1365	TkFreeGeometryContainer(containerPtr->tkwin, "pack");
	1366	containerPtr->flags &= ~ALLOCED_CONTAINER;
1367	1367	}
1368	1368
1369	1369	}

1391	1391	void memPtr) / Info about packed window that is now
1392	1392	* dead. */
1393	1393	{
1394		register Packer *packPtr = memPtr;
	1394	Packer packPtr = (Packer )memPtr;
1395	1395
1396	1396	ckfree(packPtr);
1397	1397	}

1409	1409	*
1410	1410	* Side effects:
1411	1411	* If a window was just deleted, clean up all its packer-related
1412		* information. If it was just resized, repack its slaves, if any.
	1412	* information. If it was just resized, repack its content, if any.
1413	1413	*
1414	1414	*----------------------------------------------------------------------
1415	1415	*/

1420	1420	* eventPtr. */
1421	1421	XEvent eventPtr) / Describes what just happened. */
1422	1422	{
1423		register Packer *packPtr = clientData;
	1423	Packer packPtr = (Packer )clientData;
1424	1424
1425	1425	if (eventPtr->type == ConfigureNotify) {
1426		if ((packPtr->slavePtr != NULL)
	1426	if ((packPtr->contentPtr != NULL)
1427	1427	&& !(packPtr->flags & REQUESTED_REPACK)) {
1428	1428	packPtr->flags \|= REQUESTED_REPACK;
1429	1429	Tcl_DoWhenIdle(ArrangePacking, packPtr);
1430	1430	}
1431		if ((packPtr->masterPtr != NULL)
	1431	if ((packPtr->containerPtr != NULL)
1432	1432	&& (packPtr->doubleBw != 2*Tk_Changes(packPtr->tkwin)->border_width)) {
1433		if (!(packPtr->masterPtr->flags & REQUESTED_REPACK)) {
	1433	if (!(packPtr->containerPtr->flags & REQUESTED_REPACK)) {
1434	1434	packPtr->doubleBw = 2*Tk_Changes(packPtr->tkwin)->border_width;
1435		packPtr->masterPtr->flags \|= REQUESTED_REPACK;
1436		Tcl_DoWhenIdle(ArrangePacking, packPtr->masterPtr);
	1435	packPtr->containerPtr->flags \|= REQUESTED_REPACK;
	1436	Tcl_DoWhenIdle(ArrangePacking, packPtr->containerPtr);
1437	1437	}
1438	1438	}
1439	1439	} else if (eventPtr->type == DestroyNotify) {
1440		register Packer slavePtr, nextPtr;
1441
1442		if (packPtr->masterPtr != NULL) {
	1440	Packer contentPtr, nextPtr;
	1441
	1442	if (packPtr->containerPtr != NULL) {
1443	1443	Unlink(packPtr);
1444	1444	}
1445	1445
1446		for (slavePtr = packPtr->slavePtr; slavePtr != NULL;
1447		slavePtr = nextPtr) {
1448		Tk_ManageGeometry(slavePtr->tkwin, NULL, NULL);
1449		Tk_UnmapWindow(slavePtr->tkwin);
1450		slavePtr->masterPtr = NULL;
1451		nextPtr = slavePtr->nextPtr;
1452		slavePtr->nextPtr = NULL;
	1446	for (contentPtr = packPtr->contentPtr; contentPtr != NULL;
	1447	contentPtr = nextPtr) {
	1448	Tk_ManageGeometry(contentPtr->tkwin, NULL, NULL);
	1449	Tk_UnmapWindow(contentPtr->tkwin);
	1450	contentPtr->containerPtr = NULL;
	1451	nextPtr = contentPtr->nextPtr;
	1452	contentPtr->nextPtr = NULL;
1453	1453	}
1454	1454
1455	1455	if (packPtr->tkwin != NULL) {
1456	1456	TkDisplay dispPtr = ((TkWindow ) packPtr->tkwin)->dispPtr;
1457	1457	Tcl_DeleteHashEntry(Tcl_FindHashEntry(&dispPtr->packerHashTable,
1458		(char *) packPtr->tkwin));
	1458	(void *)packPtr->tkwin));
1459	1459	}
1460	1460
1461	1461	if (packPtr->flags & REQUESTED_REPACK) {

1465	1465	Tcl_EventuallyFree(packPtr, (Tcl_FreeProc *) DestroyPacker);
1466	1466	} else if (eventPtr->type == MapNotify) {
1467	1467	/*
1468		* When a master gets mapped, must redo the geometry computation so
1469		* that all of its slaves get remapped.
	1468	* When a container gets mapped, must redo the geometry computation so
	1469	* that all of its content get remapped.
1470	1470	*/
1471	1471
1472		if ((packPtr->slavePtr != NULL)
	1472	if ((packPtr->contentPtr != NULL)
1473	1473	&& !(packPtr->flags & REQUESTED_REPACK)) {
1474	1474	packPtr->flags \|= REQUESTED_REPACK;
1475	1475	Tcl_DoWhenIdle(ArrangePacking, packPtr);
1476	1476	}
1477	1477	} else if (eventPtr->type == UnmapNotify) {
1478		register Packer *packPtr2;
	1478	Packer *packPtr2;
1479	1479
1480	1480	/*
1481		* Unmap all of the slaves when the master gets unmapped, so that they
	1481	* Unmap all of the content when the container gets unmapped, so that they
1482	1482	* don't bother to keep redisplaying themselves.
1483	1483	*/
1484	1484
1485		for (packPtr2 = packPtr->slavePtr; packPtr2 != NULL;
	1485	for (packPtr2 = packPtr->contentPtr; packPtr2 != NULL;
1486	1486	packPtr2 = packPtr2->nextPtr) {
1487	1487	Tk_UnmapWindow(packPtr2->tkwin);
1488	1488	}

1492	1492	/*
1493	1493	*----------------------------------------------------------------------
1494	1494	*
1495		* ConfigureSlaves --
	1495	* ConfigureContent --
1496	1496	*
1497	1497	* This implements the guts of the "pack configure" command. Given a list
1498		* of slaves and configuration options, it arranges for the packer to
1499		* manage the slaves and sets the specified options.
	1498	* of content and configuration options, it arranges for the packer to
	1499	* manage the content and sets the specified options.
1500	1500	*
1501	1501	* Results:
1502	1502	* TCL_OK is returned if all went well. Otherwise, TCL_ERROR is returned
1503	1503	* and the interp's result is set to contain an error message.
1504	1504	*
1505	1505	* Side effects:
1506		* Slave windows get taken over by the packer.
	1506	* Content windows get taken over by the packer.
1507	1507	*
1508	1508	*----------------------------------------------------------------------
1509	1509	*/
1510	1510
1511	1511	static int
1512		ConfigureSlaves(
	1512	ConfigureContent(
1513	1513	Tcl_Interp interp, / Interpreter for error reporting. */
1514	1514	Tk_Window tkwin, /* Any window in application containing
1515		* slaves. Used to look up slave names. */
	1515	* content. Used to look up content names. */
1516	1516	int objc, /* Number of elements in argv. */
1517	1517	Tcl_Obj const objv[]) / Argument objects: contains one or more
1518	1518	* window names followed by any number of
1519	1519	* "option value" pairs. Caller must make sure
1520	1520	* that there is at least one window name. */
1521	1521	{
1522		Packer masterPtr, slavePtr, prevPtr, otherPtr;
1523		Tk_Window other, slave, parent, ancestor;
1524		TkWindow *master;
	1522	Packer containerPtr, contentPtr, prevPtr, otherPtr;
	1523	Tk_Window other, content, parent, ancestor;
	1524	TkWindow *container;
1525	1525	int i, j, numWindows, tmp, positionGiven;
1526	1526	const char *string;
1527	1527	static const char *const optionStrings[] = {

1544	1544	}
1545	1545
1546	1546	/*
1547		* Iterate over all of the slave windows, parsing the configuration
1548		* options for each slave. It's a bit wasteful to re-parse the options for
1549		* each slave, but things get too messy if we try to parse the arguments
1550		* just once at the beginning. For example, if a slave already is packed
	1547	* Iterate over all of the content windows, parsing the configuration
	1548	* options for each content. It's a bit wasteful to re-parse the options for
	1549	* each content, but things get too messy if we try to parse the arguments
	1550	* just once at the beginning. For example, if a content already is packed
1551	1551	* we want to just change a few existing values without resetting
1552	1552	* everything. If there are multiple windows, the -after, -before, and -in
1553	1553	* options only get processed for the first window.
1554	1554	*/
1555	1555
1556		masterPtr = NULL;
	1556	containerPtr = NULL;
1557	1557	prevPtr = NULL;
1558	1558	positionGiven = 0;
1559	1559	for (j = 0; j < numWindows; j++) {
1560		if (TkGetWindowFromObj(interp, tkwin, objv[j], &slave) != TCL_OK) {
1561		return TCL_ERROR;
1562		}
1563		if (Tk_TopWinHierarchy(slave)) {
	1560	if (TkGetWindowFromObj(interp, tkwin, objv[j], &content) != TCL_OK) {
	1561	return TCL_ERROR;
	1562	}
	1563	if (Tk_TopWinHierarchy(content)) {
1564	1564	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
1565	1565	"can't pack \"%s\": it's a top-level window",
1566	1566	Tcl_GetString(objv[j])));
1567	1567	Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "TOPLEVEL", NULL);
1568	1568	return TCL_ERROR;
1569	1569	}
1570		slavePtr = GetPacker(slave);
1571		slavePtr->flags &= ~OLD_STYLE;
	1570	contentPtr = GetPacker(content);
	1571	contentPtr->flags &= ~OLD_STYLE;
1572	1572
1573	1573	/*
1574		* If the slave isn't currently packed, reset all of its configuration
	1574	* If the content isn't currently packed, reset all of its configuration
1575	1575	* information to default values (there could be old values left from
1576	1576	* a previous packing).
1577	1577	*/
1578	1578
1579		if (slavePtr->masterPtr == NULL) {
1580		slavePtr->side = TOP;
1581		slavePtr->anchor = TK_ANCHOR_CENTER;
1582		slavePtr->padX = slavePtr->padY = 0;
1583		slavePtr->padLeft = slavePtr->padTop = 0;
1584		slavePtr->iPadX = slavePtr->iPadY = 0;
1585		slavePtr->flags &= ~(FILLX\|FILLY\|EXPAND);
	1579	if (contentPtr->containerPtr == NULL) {
	1580	contentPtr->side = TOP;
	1581	contentPtr->anchor = TK_ANCHOR_CENTER;
	1582	contentPtr->padX = contentPtr->padY = 0;
	1583	contentPtr->padLeft = contentPtr->padTop = 0;
	1584	contentPtr->iPadX = contentPtr->iPadY = 0;
	1585	contentPtr->flags &= ~(FILLX\|FILLY\|EXPAND);
1586	1586	}
1587	1587
1588	1588	for (i = numWindows; i < objc; i+=2) {

1606	1606	return TCL_ERROR;
1607	1607	}
1608	1608	prevPtr = GetPacker(other);
1609		if (prevPtr->masterPtr == NULL) {
	1609	if (prevPtr->containerPtr == NULL) {
1610	1610	notPacked:
1611	1611	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
1612	1612	"window \"%s\" isn't packed",

1615	1615	NULL);
1616	1616	return TCL_ERROR;
1617	1617	}
1618		masterPtr = prevPtr->masterPtr;
	1618	containerPtr = prevPtr->containerPtr;
1619	1619	positionGiven = 1;
1620	1620	}
1621	1621	break;
1622	1622	case CONF_ANCHOR:
1623		if (Tk_GetAnchorFromObj(interp, objv[i+1], &slavePtr->anchor)
	1623	if (Tk_GetAnchorFromObj(interp, objv[i+1], &contentPtr->anchor)
1624	1624	!= TCL_OK) {
1625	1625	return TCL_ERROR;
1626	1626	}

1632	1632	return TCL_ERROR;
1633	1633	}
1634	1634	otherPtr = GetPacker(other);
1635		if (otherPtr->masterPtr == NULL) {
	1635	if (otherPtr->containerPtr == NULL) {
1636	1636	goto notPacked;
1637	1637	}
1638		masterPtr = otherPtr->masterPtr;
1639		prevPtr = masterPtr->slavePtr;
	1638	containerPtr = otherPtr->containerPtr;
	1639	prevPtr = containerPtr->contentPtr;
1640	1640	if (prevPtr == otherPtr) {
1641	1641	prevPtr = NULL;
1642	1642	} else {

1651	1651	if (Tcl_GetBooleanFromObj(interp, objv[i+1], &tmp) != TCL_OK) {
1652	1652	return TCL_ERROR;
1653	1653	}
1654		slavePtr->flags &= ~EXPAND;
	1654	contentPtr->flags &= ~EXPAND;
1655	1655	if (tmp) {
1656		slavePtr->flags \|= EXPAND;
	1656	contentPtr->flags \|= EXPAND;
1657	1657	}
1658	1658	break;
1659	1659	case CONF_FILL:
1660	1660	string = Tcl_GetString(objv[i+1]);
1661	1661	if (strcmp(string, "none") == 0) {
1662		slavePtr->flags &= ~(FILLX\|FILLY);
	1662	contentPtr->flags &= ~(FILLX\|FILLY);
1663	1663	} else if (strcmp(string, "x") == 0) {
1664		slavePtr->flags = (slavePtr->flags & ~FILLY) \| FILLX;
	1664	contentPtr->flags = (contentPtr->flags & ~FILLY) \| FILLX;
1665	1665	} else if (strcmp(string, "y") == 0) {
1666		slavePtr->flags = (slavePtr->flags & ~FILLX) \| FILLY;
	1666	contentPtr->flags = (contentPtr->flags & ~FILLX) \| FILLY;
1667	1667	} else if (strcmp(string, "both") == 0) {
1668		slavePtr->flags \|= FILLX\|FILLY;
	1668	contentPtr->flags \|= FILLX\|FILLY;
1669	1669	} else {
1670	1670	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
1671	1671	"bad fill style \"%s\": must be "

1680	1680	!= TCL_OK) {
1681	1681	return TCL_ERROR;
1682	1682	}
1683		masterPtr = GetPacker(other);
1684		prevPtr = masterPtr->slavePtr;
	1683	containerPtr = GetPacker(other);
	1684	prevPtr = containerPtr->contentPtr;
1685	1685	if (prevPtr != NULL) {
1686	1686	while (prevPtr->nextPtr != NULL) {
1687	1687	prevPtr = prevPtr->nextPtr;

1691	1691	}
1692	1692	break;
1693	1693	case CONF_IPADX:
1694		if ((Tk_GetPixelsFromObj(interp, slave, objv[i+1], &tmp)
	1694	if ((Tk_GetPixelsFromObj(interp, content, objv[i+1], &tmp)
1695	1695	!= TCL_OK) \|\| (tmp < 0)) {
1696	1696	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
1697	1697	"bad ipadx value \"%s\": must be positive screen"

1699	1699	Tcl_SetErrorCode(interp, "TK", "VALUE", "INT_PAD", NULL);
1700	1700	return TCL_ERROR;
1701	1701	}
1702		slavePtr->iPadX = tmp * 2;
	1702	contentPtr->iPadX = tmp * 2;
1703	1703	break;
1704	1704	case CONF_IPADY:
1705		if ((Tk_GetPixelsFromObj(interp, slave, objv[i+1], &tmp)
	1705	if ((Tk_GetPixelsFromObj(interp, content, objv[i+1], &tmp)
1706	1706	!= TCL_OK) \|\| (tmp < 0)) {
1707	1707	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
1708	1708	"bad ipady value \"%s\": must be positive screen"

1710	1710	Tcl_SetErrorCode(interp, "TK", "VALUE", "INT_PAD", NULL);
1711	1711	return TCL_ERROR;
1712	1712	}
1713		slavePtr->iPadY = tmp * 2;
	1713	contentPtr->iPadY = tmp * 2;
1714	1714	break;
1715	1715	case CONF_PADX:
1716		if (TkParsePadAmount(interp, slave, objv[i+1],
1717		&slavePtr->padLeft, &slavePtr->padX) != TCL_OK) {
	1716	if (TkParsePadAmount(interp, content, objv[i+1],
	1717	&contentPtr->padLeft, &contentPtr->padX) != TCL_OK) {
1718	1718	return TCL_ERROR;
1719	1719	}
1720	1720	break;
1721	1721	case CONF_PADY:
1722		if (TkParsePadAmount(interp, slave, objv[i+1],
1723		&slavePtr->padTop, &slavePtr->padY) != TCL_OK) {
	1722	if (TkParsePadAmount(interp, content, objv[i+1],
	1723	&contentPtr->padTop, &contentPtr->padY) != TCL_OK) {
1724	1724	return TCL_ERROR;
1725	1725	}
1726	1726	break;

1729	1729	sizeof(char *), "side", TCL_EXACT, &side) != TCL_OK) {
1730	1730	return TCL_ERROR;
1731	1731	}
1732		slavePtr->side = (Side) side;
	1732	contentPtr->side = (Side) side;
1733	1733	break;
1734	1734	}
1735	1735	}
1736	1736
1737	1737	/*
1738		* If no position in a packing list was specified and the slave is
	1738	* If no position in a packing list was specified and the content is
1739	1739	* already packed, then leave it in its current location in its
1740	1740	* current packing list.
1741	1741	*/
1742	1742
1743		if (!positionGiven && (slavePtr->masterPtr != NULL)) {
1744		masterPtr = slavePtr->masterPtr;
	1743	if (!positionGiven && (contentPtr->containerPtr != NULL)) {
	1744	containerPtr = contentPtr->containerPtr;
1745	1745	goto scheduleLayout;
1746	1746	}
1747	1747
1748	1748	/*
1749		* If the slave is going to be put back after itself or the same -in
	1749	* If the content is going to be put back after itself or the same -in
1750	1750	* window is passed in again, then just skip the whole operation,
1751	1751	* since it won't work anyway.
1752	1752	*/
1753	1753
1754		if (prevPtr == slavePtr) {
1755		masterPtr = slavePtr->masterPtr;
	1754	if (prevPtr == contentPtr) {
	1755	containerPtr = contentPtr->containerPtr;
1756	1756	goto scheduleLayout;
1757	1757	}
1758	1758
1759	1759	/*
1760	1760	* If none of the "-in", "-before", or "-after" options has been
1761		* specified, arrange for the slave to go at the end of the order for
	1761	* specified, arrange for the content to go at the end of the order for
1762	1762	* its parent.
1763	1763	*/
1764	1764
1765	1765	if (!positionGiven) {
1766		masterPtr = GetPacker(Tk_Parent(slave));
1767		prevPtr = masterPtr->slavePtr;
	1766	containerPtr = GetPacker(Tk_Parent(content));
	1767	prevPtr = containerPtr->contentPtr;
1768	1768	if (prevPtr != NULL) {
1769	1769	while (prevPtr->nextPtr != NULL) {
1770	1770	prevPtr = prevPtr->nextPtr;

1773	1773	}
1774	1774
1775	1775	/*
1776		* Make sure that the slave's parent is either the master or an
1777		* ancestor of the master, and that the master and slave aren't the
	1776	* Make sure that the content's parent is either the container or an
	1777	* ancestor of the container, and that the container and content aren't the
1778	1778	* same.
1779	1779	*/
1780	1780
1781		parent = Tk_Parent(slave);
1782		for (ancestor = masterPtr->tkwin; ; ancestor = Tk_Parent(ancestor)) {
	1781	parent = Tk_Parent(content);
	1782	for (ancestor = containerPtr->tkwin; ; ancestor = Tk_Parent(ancestor)) {
1783	1783	if (ancestor == parent) {
1784	1784	break;
1785	1785	}
1786	1786	if (Tk_TopWinHierarchy(ancestor)) {
1787	1787	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
1788	1788	"can't pack %s inside %s", Tcl_GetString(objv[j]),
1789		Tk_PathName(masterPtr->tkwin)));
	1789	Tk_PathName(containerPtr->tkwin)));
1790	1790	Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "HIERARCHY", NULL);
1791	1791	return TCL_ERROR;
1792	1792	}
1793	1793	}
1794		if (slave == masterPtr->tkwin) {
	1794	if (content == containerPtr->tkwin) {
1795	1795	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
1796	1796	"can't pack %s inside itself", Tcl_GetString(objv[j])));
1797	1797	Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "SELF", NULL);

1802	1802	* Check for management loops.
1803	1803	*/
1804	1804
1805		for (master = (TkWindow *)masterPtr->tkwin; master != NULL;
1806		master = (TkWindow *)TkGetGeomMaster(master)) {
1807		if (master == (TkWindow *)slave) {
	1805	for (container = (TkWindow *)containerPtr->tkwin; container != NULL;
	1806	container = (TkWindow *)TkGetContainer(container)) {
	1807	if (container == (TkWindow *)content) {
1808	1808	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
1809	1809	"can't put %s inside %s, would cause management loop",
1810		Tcl_GetString(objv[j]), Tk_PathName(masterPtr->tkwin)));
	1810	Tcl_GetString(objv[j]), Tk_PathName(containerPtr->tkwin)));
1811	1811	Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "LOOP", NULL);
1812	1812	return TCL_ERROR;
1813	1813	}
1814	1814	}
1815		if (masterPtr->tkwin != Tk_Parent(slave)) {
1816		((TkWindow )slave)->maintainerPtr = (TkWindow )masterPtr->tkwin;
	1815	if (containerPtr->tkwin != Tk_Parent(content)) {
	1816	((TkWindow )content)->maintainerPtr = (TkWindow )containerPtr->tkwin;
1817	1817	}
1818	1818
1819	1819	/*
1820		* Unpack the slave if it's currently packed, then position it after
	1820	* Unpack the content if it's currently packed, then position it after
1821	1821	* prevPtr.
1822	1822	*/
1823	1823
1824		if (slavePtr->masterPtr != NULL) {
1825		if ((slavePtr->masterPtr != masterPtr) &&
1826		(slavePtr->masterPtr->tkwin
1827		!= Tk_Parent(slavePtr->tkwin))) {
1828		Tk_UnmaintainGeometry(slavePtr->tkwin,
1829		slavePtr->masterPtr->tkwin);
1830		}
1831		Unlink(slavePtr);
1832		}
1833
1834		slavePtr->masterPtr = masterPtr;
	1824	if (contentPtr->containerPtr != NULL) {
	1825	if ((contentPtr->containerPtr != containerPtr) &&
	1826	(contentPtr->containerPtr->tkwin
	1827	!= Tk_Parent(contentPtr->tkwin))) {
	1828	Tk_UnmaintainGeometry(contentPtr->tkwin,
	1829	contentPtr->containerPtr->tkwin);
	1830	}
	1831	Unlink(contentPtr);
	1832	}
	1833
	1834	contentPtr->containerPtr = containerPtr;
1835	1835	if (prevPtr == NULL) {
1836		slavePtr->nextPtr = masterPtr->slavePtr;
1837		masterPtr->slavePtr = slavePtr;
	1836	contentPtr->nextPtr = containerPtr->contentPtr;
	1837	containerPtr->contentPtr = contentPtr;
1838	1838	} else {
1839		slavePtr->nextPtr = prevPtr->nextPtr;
1840		prevPtr->nextPtr = slavePtr;
1841		}
1842		Tk_ManageGeometry(slave, &packerType, slavePtr);
1843		prevPtr = slavePtr;
1844
1845		if (!(masterPtr->flags & DONT_PROPAGATE)) {
1846		if (TkSetGeometryMaster(interp, masterPtr->tkwin, "pack")
	1839	contentPtr->nextPtr = prevPtr->nextPtr;
	1840	prevPtr->nextPtr = contentPtr;
	1841	}
	1842	Tk_ManageGeometry(content, &packerType, contentPtr);
	1843	prevPtr = contentPtr;
	1844
	1845	if (!(containerPtr->flags & DONT_PROPAGATE)) {
	1846	if (TkSetGeometryContainer(interp, containerPtr->tkwin, "pack")
1847	1847	!= TCL_OK) {
1848		Tk_ManageGeometry(slave, NULL, NULL);
1849		Unlink(slavePtr);
	1848	Tk_ManageGeometry(content, NULL, NULL);
	1849	Unlink(contentPtr);
1850	1850	return TCL_ERROR;
1851	1851	}
1852		masterPtr->flags \|= ALLOCED_MASTER;
	1852	containerPtr->flags \|= ALLOCED_CONTAINER;
1853	1853	}
1854	1854
1855	1855	/*
1856		* Arrange for the master to be re-packed at the first idle moment.
	1856	* Arrange for the container to be re-packed at the first idle moment.
1857	1857	*/
1858	1858
1859	1859	scheduleLayout:
1860		if (masterPtr->abortPtr != NULL) {
1861		*masterPtr->abortPtr = 1;
1862		}
1863		if (!(masterPtr->flags & REQUESTED_REPACK)) {
1864		masterPtr->flags \|= REQUESTED_REPACK;
1865		Tcl_DoWhenIdle(ArrangePacking, masterPtr);
	1860	if (containerPtr->abortPtr != NULL) {
	1861	*containerPtr->abortPtr = 1;
	1862	}
	1863	if (!(containerPtr->flags & REQUESTED_REPACK)) {
	1864	containerPtr->flags \|= REQUESTED_REPACK;
	1865	Tcl_DoWhenIdle(ArrangePacking, containerPtr);
1866	1866	}
1867	1867	}
1868	1868	return TCL_OK;

+485

-486

generic/tkPanedWindow.c less more

12	12	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
13	13	*/
14	14
	15	#include "tkInt.h"
15	16	#include "default.h"
16		#include "tkInt.h"
17	17
18	18	/*
19	19	* Flag values for "sticky"ness. The 16 combinations subsume the packer's

69	69
70	70	typedef struct {
71	71	Tk_OptionTable pwOptions; /* Token for paned window option table. */
72		Tk_OptionTable slaveOpts; /* Token for slave cget option table. */
	72	Tk_OptionTable paneOpts; /* Token for pane cget option table. */
73	73	} OptionTables;
74	74
75	75	/*

77	77	* managed by a paned window widget.
78	78	*/
79	79
80		typedef struct Slave {
	80	typedef struct Pane {
81	81	Tk_Window tkwin; /* Window being managed. */
82	82	int minSize; /* Minimum size of this pane, on the relevant
83	83	* axis, in pixels. */
84		int padx; /* Additional padding requested for slave, in
	84	int padx; /* Additional padding requested for pane, in
85	85	* the x dimension. */
86		int pady; /* Additional padding requested for slave, in
	86	int pady; /* Additional padding requested for pane, in
87	87	* the y dimension. */
88	88	Tcl_Obj widthPtr, heightPtr;
89		/* Tcl_Obj rep's of slave width/height, to
	89	/* Tcl_Obj rep's of pane width/height, to
90	90	* allow for null values. */
91		int width; /* Slave width. */
92		int height; /* Slave height. */
	91	int width; /* Pane width. */
	92	int height; /* Pane height. */
93	93	int sticky; /* Sticky string. */
94	94	int x, y; /* Coordinates of the widget. */
95	95	int paneWidth, paneHeight; /* Pane dimensions (may be different from
96		* slave width/height). */
	96	* pane width/height). */
97	97	int sashx, sashy; /* Coordinates of the sash of the right or
98	98	* bottom of this pane. */
99	99	int markx, marky; /* Coordinates of the last mark set for the
100	100	* sash. */
101	101	int handlex, handley; /* Coordinates of the sash handle. */
102		enum stretch stretch; /* Controls how slave grows/shrinks */
	102	enum stretch stretch; /* Controls how pane grows/shrinks */
103	103	int hide; /* Controls visibility of pane */
104		struct PanedWindow *masterPtr;
	104	struct PanedWindow *containerPtr;
105	105	/* Paned window managing the window. */
106	106	Tk_Window after; /* Placeholder for parsing options. */
107	107	Tk_Window before; /* Placeholder for parsing options. */
108		} Slave;
	108	} Pane;
109	109
110	110	/*
111	111	* A data structure of the following type is kept for each paned window widget

120	120	Tcl_Command widgetCmd; /* Token for square's widget command. */
121	121	Tk_OptionTable optionTable; /* Token representing the configuration
122	122	* specifications. */
123		Tk_OptionTable slaveOpts; /* Token for slave cget table. */
	123	Tk_OptionTable paneOpts; /* Token for pane cget table. */
124	124	Tk_3DBorder background; /* Background color. */
125	125	int borderWidth; /* Value of -borderwidth option. */
126	126	int relief; /* 3D border effect (TK_RELIEF_RAISED, etc) */

150	150	Tcl_Obj proxyBorderWidthPtr; / Tcl_Obj rep for proxyBorderWidth */
151	151	int proxyBorderWidth; /* Borderwidth used to draw proxy. */
152	152	int proxyRelief; /* Relief used to draw proxy, if TK_RELIEF_NULL then use relief. */
153		Slave *slaves; / Pointer to array of Slaves. */
154		int numSlaves; /* Number of slaves. */
155		int sizeofSlaves; /* Number of elements in the slaves array. */
	153	Pane *panes; / Pointer to array of Panes. */
	154	int numPanes; /* Number of panes. */
	155	int sizeofPanes; /* Number of elements in the panes array. */
156	156	int flags; /* Flags for widget; see below. */
157	157	} PanedWindow;
158	158

199	199	static void PanedWindowWorldChanged(ClientData instanceData);
200	200	static int PanedWindowWidgetObjCmd(ClientData clientData,
201	201	Tcl_Interp , int objc, Tcl_Obj const objv[]);
202		static void PanedWindowLostSlaveProc(ClientData clientData,
	202	static void PanedWindowLostPaneProc(ClientData clientData,
203	203	Tk_Window tkwin);
204	204	static void PanedWindowReqProc(ClientData clientData,
205	205	Tk_Window tkwin);
206	206	static void ArrangePanes(ClientData clientData);
207		static void Unlink(Slave *slavePtr);
208		static Slave * GetPane(PanedWindow *pwPtr, Tk_Window tkwin);
	207	static void Unlink(Pane *panePtr);
	208	static Pane * GetPane(PanedWindow *pwPtr, Tk_Window tkwin);
209	209	static void GetFirstLastVisiblePane(PanedWindow *pwPtr,
210	210	int firstPtr, int lastPtr);
211		static void SlaveStructureProc(ClientData clientData,
	211	static void PaneStructureProc(ClientData clientData,
212	212	XEvent *eventPtr);
213	213	static int PanedWindowSashCommand(PanedWindow *pwPtr,
214	214	Tcl_Interp *interp, int objc,

217	217	Tcl_Interp *interp, int objc,
218	218	Tcl_Obj * const objv[]);
219	219	static void ComputeGeometry(PanedWindow *pwPtr);
220		static int ConfigureSlaves(PanedWindow *pwPtr,
	220	static int ConfigurePanes(PanedWindow *pwPtr,
221	221	Tcl_Interp *interp, int objc,
222	222	Tcl_Obj * const objv[]);
223	223	static void DestroyOptionTables(ClientData clientData,

232	232	char internalPtr, char oldInternalPtr);
233	233	static void AdjustForSticky(int sticky, int cavityWidth,
234	234	int cavityHeight, int xPtr, int yPtr,
235		int slaveWidthPtr, int slaveHeightPtr);
	235	int paneWidthPtr, int paneHeightPtr);
236	236	static void MoveSash(PanedWindow *pwPtr, int sash, int diff);
237	237	static int ObjectIsEmpty(Tcl_Obj *objPtr);
238	238	static char * ComputeSlotAddress(char *recordPtr, int offset);

240	240	Tcl_Interp *interp, int x, int y);
241	241
242	242	/*
243		* Sashes are between panes only, so there is one less sash than slaves
	243	* Sashes are between panes only, so there is one less sash than panes
244	244	*/
245	245
246	246	#define ValidSashIndex(pwPtr, sash) \
247		(((sash) >= 0) && ((sash) < ((pwPtr)->numSlaves-1)))
	247	(((sash) >= 0) && ((sash) < ((pwPtr)->numPanes-1)))
248	248
249	249	static const Tk_GeomMgr panedWindowMgrType = {
250	250	"panedwindow", /* name */
251	251	PanedWindowReqProc, /* requestProc */
252		PanedWindowLostSlaveProc, /* lostSlaveProc */
	252	PanedWindowLostPaneProc, /* lostPaneProc */
253	253	};
254	254
255	255	/*

260	260
261	261	/*
262	262	* The following structure contains pointers to functions used for processing
263		* the custom "-sticky" option for slave windows.
	263	* the custom "-sticky" option for panes.
264	264	*/
265	265
266	266	static const Tk_ObjCustomOption stickyOption = {

333	333	{TK_OPTION_END, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0}
334	334	};
335	335
336		static const Tk_OptionSpec slaveOptionSpecs[] = {
	336	static const Tk_OptionSpec paneOptionSpecs[] = {
337	337	{TK_OPTION_WINDOW, "-after", NULL, NULL,
338		DEF_PANEDWINDOW_PANE_AFTER, -1, Tk_Offset(Slave, after),
	338	DEF_PANEDWINDOW_PANE_AFTER, -1, Tk_Offset(Pane, after),
339	339	TK_OPTION_NULL_OK, 0, 0},
340	340	{TK_OPTION_WINDOW, "-before", NULL, NULL,
341		DEF_PANEDWINDOW_PANE_BEFORE, -1, Tk_Offset(Slave, before),
	341	DEF_PANEDWINDOW_PANE_BEFORE, -1, Tk_Offset(Pane, before),
342	342	TK_OPTION_NULL_OK, 0, 0},
343	343	{TK_OPTION_PIXELS, "-height", NULL, NULL,
344		DEF_PANEDWINDOW_PANE_HEIGHT, Tk_Offset(Slave, heightPtr),
345		Tk_Offset(Slave, height), TK_OPTION_NULL_OK, 0, 0},
	344	DEF_PANEDWINDOW_PANE_HEIGHT, Tk_Offset(Pane, heightPtr),
	345	Tk_Offset(Pane, height), TK_OPTION_NULL_OK, 0, 0},
346	346	{TK_OPTION_BOOLEAN, "-hide", "hide", "Hide",
347		DEF_PANEDWINDOW_PANE_HIDE, -1, Tk_Offset(Slave, hide), 0,0,GEOMETRY},
	347	DEF_PANEDWINDOW_PANE_HIDE, -1, Tk_Offset(Pane, hide), 0,0,GEOMETRY},
348	348	{TK_OPTION_PIXELS, "-minsize", NULL, NULL,
349		DEF_PANEDWINDOW_PANE_MINSIZE, -1, Tk_Offset(Slave, minSize), 0, 0, 0},
	349	DEF_PANEDWINDOW_PANE_MINSIZE, -1, Tk_Offset(Pane, minSize), 0, 0, 0},
350	350	{TK_OPTION_PIXELS, "-padx", NULL, NULL,
351		DEF_PANEDWINDOW_PANE_PADX, -1, Tk_Offset(Slave, padx), 0, 0, 0},
	351	DEF_PANEDWINDOW_PANE_PADX, -1, Tk_Offset(Pane, padx), 0, 0, 0},
352	352	{TK_OPTION_PIXELS, "-pady", NULL, NULL,
353		DEF_PANEDWINDOW_PANE_PADY, -1, Tk_Offset(Slave, pady), 0, 0, 0},
	353	DEF_PANEDWINDOW_PANE_PADY, -1, Tk_Offset(Pane, pady), 0, 0, 0},
354	354	{TK_OPTION_CUSTOM, "-sticky", NULL, NULL,
355		DEF_PANEDWINDOW_PANE_STICKY, -1, Tk_Offset(Slave, sticky), 0,
	355	DEF_PANEDWINDOW_PANE_STICKY, -1, Tk_Offset(Pane, sticky), 0,
356	356	&stickyOption, 0},
357	357	{TK_OPTION_STRING_TABLE, "-stretch", "stretch", "Stretch",
358		DEF_PANEDWINDOW_PANE_STRETCH, -1, Tk_Offset(Slave, stretch), 0,
	358	DEF_PANEDWINDOW_PANE_STRETCH, -1, Tk_Offset(Pane, stretch), 0,
359	359	(ClientData) stretchStrings, 0},
360	360	{TK_OPTION_PIXELS, "-width", NULL, NULL,
361		DEF_PANEDWINDOW_PANE_WIDTH, Tk_Offset(Slave, widthPtr),
362		Tk_Offset(Slave, width), TK_OPTION_NULL_OK, 0, 0},
	361	DEF_PANEDWINDOW_PANE_WIDTH, Tk_Offset(Pane, widthPtr),
	362	Tk_Offset(Pane, width), TK_OPTION_NULL_OK, 0, 0},
363	363	{TK_OPTION_END, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0}
364	364	};
365	365

382	382
383	383	int
384	384	Tk_PanedWindowObjCmd(
385		ClientData clientData, /* NULL. */
	385	TCL_UNUSED(ClientData), /* NULL. */
386	386	Tcl_Interp interp, / Current interpreter. */
387	387	int objc, /* Number of arguments. */
388	388	Tcl_Obj * const objv[]) /* Argument objects. */

427	427	*/
428	428
429	429	pwOpts->pwOptions = Tk_CreateOptionTable(interp, optionSpecs);
430		pwOpts->slaveOpts = Tk_CreateOptionTable(interp, slaveOptionSpecs);
	430	pwOpts->paneOpts = Tk_CreateOptionTable(interp, paneOptionSpecs);
431	431	}
432	432
433	433	Tk_SetClass(tkwin, "Panedwindow");

436	436	* Allocate and initialize the widget record.
437	437	*/
438	438
439		pwPtr = ckalloc(sizeof(PanedWindow));
	439	pwPtr = (PanedWindow *)ckalloc(sizeof(PanedWindow));
440	440	memset((void *)pwPtr, 0, (sizeof(PanedWindow)));
441	441	pwPtr->tkwin = tkwin;
442	442	pwPtr->display = Tk_Display(tkwin);

445	445	Tk_PathName(pwPtr->tkwin), PanedWindowWidgetObjCmd, pwPtr,
446	446	PanedWindowCmdDeletedProc);
447	447	pwPtr->optionTable = pwOpts->pwOptions;
448		pwPtr->slaveOpts = pwOpts->slaveOpts;
	448	pwPtr->paneOpts = pwOpts->paneOpts;
449	449	pwPtr->relief = TK_RELIEF_RAISED;
450	450	pwPtr->gc = NULL;
451	451	pwPtr->cursor = NULL;

470	470	/*
471	471	* Find the toplevel ancestor of the panedwindow, and make a proxy win as
472	472	* a child of that window; this way the proxy can always float above
473		* slaves in the panedwindow.
	473	* panes in the panedwindow.
474	474	*/
475	475
476	476	parent = Tk_Parent(pwPtr->tkwin);

534	534	int objc, /* Number of arguments. */
535	535	Tcl_Obj * const objv[]) /* Argument objects. */
536	536	{
537		PanedWindow *pwPtr = clientData;
	537	PanedWindow pwPtr = (PanedWindow )clientData;
538	538	int result = TCL_OK;
539	539	static const char *const optionStrings[] = {
540	540	"add", "cget", "configure", "forget", "identify", "panecget",

547	547	Tcl_Obj *resultObj;
548	548	int index, count, i, x, y;
549	549	Tk_Window tkwin;
550		Slave *slavePtr;
	550	Pane *panePtr;
551	551
552	552	if (objc < 2) {
553	553	Tcl_WrongNumArgs(interp, 1, objv, "option ?arg arg...?");

568	568	result = TCL_ERROR;
569	569	break;
570	570	}
571		result = ConfigureSlaves(pwPtr, interp, objc, objv);
	571	result = ConfigurePanes(pwPtr, interp, objc, objv);
572	572	break;
573	573
574	574	case PW_CGET:

603	603	break;
604	604
605	605	case PW_FORGET: {
606		int i;
607	606
608	607	if (objc < 3) {
609	608	Tcl_WrongNumArgs(interp, 2, objv, "widget ?widget ...?");

615	614	* Clean up each window named in the arg list.
616	615	*/
617	616	for (count = 0, i = 2; i < objc; i++) {
618		Tk_Window slave = Tk_NameToWindow(interp, Tcl_GetString(objv[i]),
	617	Tk_Window pane = Tk_NameToWindow(interp, Tcl_GetString(objv[i]),
619	618	pwPtr->tkwin);
620	619
621		if (slave == NULL) {
	620	if (pane == NULL) {
622	621	continue;
623	622	}
624		slavePtr = GetPane(pwPtr, slave);
625		if ((slavePtr != NULL) && (slavePtr->masterPtr != NULL)) {
	623	panePtr = GetPane(pwPtr, pane);
	624	if ((panePtr != NULL) && (panePtr->containerPtr != NULL)) {
626	625	count++;
627		Tk_ManageGeometry(slave, NULL, NULL);
628		Tk_UnmaintainGeometry(slavePtr->tkwin, pwPtr->tkwin);
629		Tk_DeleteEventHandler(slavePtr->tkwin, StructureNotifyMask,
630		SlaveStructureProc, slavePtr);
631		Tk_UnmapWindow(slavePtr->tkwin);
632		Unlink(slavePtr);
	626	Tk_ManageGeometry(pane, NULL, NULL);
	627	Tk_UnmaintainGeometry(panePtr->tkwin, pwPtr->tkwin);
	628	Tk_DeleteEventHandler(panePtr->tkwin, StructureNotifyMask,
	629	PaneStructureProc, panePtr);
	630	Tk_UnmapWindow(panePtr->tkwin);
	631	Unlink(panePtr);
633	632	}
634	633	if (count != 0) {
635	634	ComputeGeometry(pwPtr);

665	664	break;
666	665	}
667	666	resultObj = NULL;
668		for (i = 0; i < pwPtr->numSlaves; i++) {
669		if (pwPtr->slaves[i]->tkwin == tkwin) {
	667	for (i = 0; i < pwPtr->numPanes; i++) {
	668	if (pwPtr->panes[i]->tkwin == tkwin) {
670	669	resultObj = Tk_GetOptionValue(interp,
671		(char *) pwPtr->slaves[i], pwPtr->slaveOpts,
	670	(char *) pwPtr->panes[i], pwPtr->paneOpts,
672	671	objv[3], tkwin);
673	672	}
674	673	}
675	674	if (resultObj == NULL) {
676		if (i == pwPtr->numSlaves) {
	675	if (i == pwPtr->numPanes) {
677	676	Tcl_SetObjResult(interp, Tcl_NewStringObj(
678	677	"not managed by this window", -1));
679	678	Tcl_SetErrorCode(interp, "TK", "PANEDWINDOW", "UNMANAGED",

705	704	result = TCL_ERROR;
706	705	break;
707	706	}
708		for (i = 0; i < pwPtr->numSlaves; i++) {
709		if (pwPtr->slaves[i]->tkwin == tkwin) {
	707	for (i = 0; i < pwPtr->numPanes; i++) {
	708	if (pwPtr->panes[i]->tkwin == tkwin) {
710	709	resultObj = Tk_GetOptionInfo(interp,
711		(char *) pwPtr->slaves[i], pwPtr->slaveOpts,
	710	(char *) pwPtr->panes[i], pwPtr->paneOpts,
712	711	(objc == 4) ? objv[3] : NULL,
713	712	pwPtr->tkwin);
714	713	if (resultObj == NULL) {

720	719	}
721	720	}
722	721	} else {
723		result = ConfigureSlaves(pwPtr, interp, objc, objv);
	722	result = ConfigurePanes(pwPtr, interp, objc, objv);
724	723	}
725	724	break;
726	725
727	726	case PW_PANES:
728	727	resultObj = Tcl_NewObj();
729		for (i = 0; i < pwPtr->numSlaves; i++) {
	728	for (i = 0; i < pwPtr->numPanes; i++) {
730	729	Tcl_ListObjAppendElement(NULL, resultObj,
731		TkNewWindowObj(pwPtr->slaves[i]->tkwin));
	730	TkNewWindowObj(pwPtr->panes[i]->tkwin));
732	731	}
733	732	Tcl_SetObjResult(interp, resultObj);
734	733	break;

748	747	/*
749	748	*----------------------------------------------------------------------
750	749	*
751		* ConfigureSlaves --
752		*
753		* Add or alter the configuration options of a slave in a paned window.
	750	* ConfigurePanes --
	751	*
	752	* Add or alter the configuration options of a pane in a paned window.
754	753	*
755	754	* Results:
756	755	* Standard Tcl result.
757	756	*
758	757	* Side effects:
759		* Depends on options; may add a slave to the paned window, may alter the
760		* geometry management options of a slave.
	758	* Depends on options; may add a pane to the paned window, may alter the
	759	* geometry management options of a pane.
761	760	*
762	761	*----------------------------------------------------------------------
763	762	*/
764	763
765	764	static int
766		ConfigureSlaves(
	765	ConfigurePanes(
767	766	PanedWindow pwPtr, / Information about paned window. */
768	767	Tcl_Interp interp, / Current interpreter. */
769	768	int objc, /* Number of arguments. */
770	769	Tcl_Obj const objv[]) / Argument objects. */
771	770	{
772		int i, firstOptionArg, j, found, doubleBw, index, numNewSlaves, haveLoc;
	771	int i, firstOptionArg, j, found, doubleBw, index, numNewPanes, haveLoc;
773	772	int insertIndex;
774	773	Tk_Window tkwin = NULL, ancestor, parent;
775		Slave slavePtr, inserts, *newSlaves;
776		Slave options;
	774	Pane panePtr, inserts, *newPanes;
	775	Pane options;
777	776	const char *arg;
778	777
779	778	/*
780	779	* Find the non-window name arguments; these are the configure options for
781		* the slaves. Also validate that the window names given are legitimate
	780	* the panes. Also validate that the window names given are legitimate
782	781	* (ie, they are real windows, they are not the panedwindow itself, etc.).
783	782	*/
784	783

816	815	return TCL_ERROR;
817	816	} else {
818	817	/*
819		* Make sure the panedwindow is the parent of the slave,
820		* or a descendant of the slave's parent.
	818	* Make sure the panedwindow is the parent of the pane,
	819	* or a descendant of the pane's parent.
821	820	*/
822	821
823	822	parent = Tk_Parent(tkwin);

846	845	* extra testing in the for loop below.
847	846	*/
848	847
849		memset((void *)&options, 0, sizeof(Slave));
850		if (Tk_SetOptions(interp, (char *) &options, pwPtr->slaveOpts,
	848	memset((void *)&options, 0, sizeof(Pane));
	849	if (Tk_SetOptions(interp, (char *) &options, pwPtr->paneOpts,
851	850	objc - firstOptionArg, objv + firstOptionArg,
852	851	pwPtr->tkwin, NULL, NULL) != TCL_OK) {
853	852	return TCL_ERROR;

864	863	if (options.after != NULL) {
865	864	tkwin = options.after;
866	865	haveLoc = 1;
867		for (i = 0; i < pwPtr->numSlaves; i++) {
868		if (options.after == pwPtr->slaves[i]->tkwin) {
	866	for (i = 0; i < pwPtr->numPanes; i++) {
	867	if (options.after == pwPtr->panes[i]->tkwin) {
869	868	index = i + 1;
870	869	break;
871	870	}

873	872	} else if (options.before != NULL) {
874	873	tkwin = options.before;
875	874	haveLoc = 1;
876		for (i = 0; i < pwPtr->numSlaves; i++) {
877		if (options.before == pwPtr->slaves[i]->tkwin) {
	875	for (i = 0; i < pwPtr->numPanes; i++) {
	876	if (options.before == pwPtr->panes[i]->tkwin) {
878	877	index = i;
879	878	break;
880	879	}

891	890	"window \"%s\" is not managed by %s",
892	891	Tk_PathName(tkwin), Tk_PathName(pwPtr->tkwin)));
893	892	Tcl_SetErrorCode(interp, "TK", "PANEDWINDOW", "UNMANAGED", NULL);
894		Tk_FreeConfigOptions((char *) &options, pwPtr->slaveOpts,
	893	Tk_FreeConfigOptions((char *) &options, pwPtr->paneOpts,
895	894	pwPtr->tkwin);
896	895	return TCL_ERROR;
897	896	}
898	897
899	898	/*
900		* Allocate an array to hold, in order, the pointers to the slave
	899	* Allocate an array to hold, in order, the pointers to the pane
901	900	* structures corresponding to the windows specified. Some of those
902	901	* structures may already have existed, some may be new.
903	902	*/
904	903
905		inserts = ckalloc(sizeof(Slave ) (firstOptionArg - 2));
	904	inserts = (Pane *)ckalloc(sizeof(Pane ) * (firstOptionArg - 2));
906	905	insertIndex = 0;
907	906
908	907	/*
909		* Populate the inserts array, creating new slave structures as necessary,
	908	* Populate the inserts array, creating new pane structures as necessary,
910	909	* applying the options to each structure as we go, and, if necessary,
911		* marking the spot in the original slaves array as empty (for
912		* pre-existing slave structures).
913		*/
914
915		for (i = 0, numNewSlaves = 0; i < firstOptionArg - 2; i++) {
	910	* marking the spot in the original panes array as empty (for
	911	* pre-existing pane structures).
	912	*/
	913
	914	for (i = 0, numNewPanes = 0; i < firstOptionArg - 2; i++) {
916	915	/*
917	916	* We don't check that tkwin is NULL here, because the pre-pass above
918	917	* guarantees that the input at this stage is good.

922	921	pwPtr->tkwin);
923	922
924	923	found = 0;
925		for (j = 0; j < pwPtr->numSlaves; j++) {
926		if (pwPtr->slaves[j] != NULL && pwPtr->slaves[j]->tkwin == tkwin) {
927		Tk_SetOptions(interp, (char *) pwPtr->slaves[j],
928		pwPtr->slaveOpts, objc - firstOptionArg,
	924	for (j = 0; j < pwPtr->numPanes; j++) {
	925	if (pwPtr->panes[j] != NULL && pwPtr->panes[j]->tkwin == tkwin) {
	926	Tk_SetOptions(interp, (char *) pwPtr->panes[j],
	927	pwPtr->paneOpts, objc - firstOptionArg,
929	928	objv + firstOptionArg, pwPtr->tkwin, NULL, NULL);
930		if (pwPtr->slaves[j]->minSize < 0) {
931		pwPtr->slaves[j]->minSize = 0;
	929	if (pwPtr->panes[j]->minSize < 0) {
	930	pwPtr->panes[j]->minSize = 0;
932	931	}
933	932	found = 1;
934	933
935	934	/*
936		* If the slave is supposed to move, add it to the inserts
	935	* If the pane is supposed to move, add it to the inserts
937	936	* array now; otherwise, leave it where it is.
938	937	*/
939	938
940	939	if (index != -1) {
941		inserts[insertIndex++] = pwPtr->slaves[j];
942		pwPtr->slaves[j] = NULL;
	940	inserts[insertIndex++] = pwPtr->panes[j];
	941	pwPtr->panes[j] = NULL;
943	942	}
944	943	break;
945	944	}

950	949	}
951	950
952	951	/*
953		* Make sure this slave wasn't already put into the inserts array,
	952	* Make sure this pane wasn't already put into the inserts array,
954	953	* i.e., when the user specifies the same window multiple times in a
955	954	* single add commaned.
956	955	*/

965	964	}
966	965
967	966	/*
968		* Create a new slave structure and initialize it. All slaves start
	967	* Create a new pane structure and initialize it. All panes start
969	968	* out with their "natural" dimensions.
970	969	*/
971	970
972		slavePtr = ckalloc(sizeof(Slave));
973		memset(slavePtr, 0, sizeof(Slave));
974		Tk_InitOptions(interp, (char *)slavePtr, pwPtr->slaveOpts,
	971	panePtr = (Pane *)ckalloc(sizeof(Pane));
	972	memset(panePtr, 0, sizeof(Pane));
	973	Tk_InitOptions(interp, (char *)panePtr, pwPtr->paneOpts,
975	974	pwPtr->tkwin);
976		Tk_SetOptions(interp, (char *)slavePtr, pwPtr->slaveOpts,
	975	Tk_SetOptions(interp, (char *)panePtr, pwPtr->paneOpts,
977	976	objc - firstOptionArg, objv + firstOptionArg,
978	977	pwPtr->tkwin, NULL, NULL);
979		slavePtr->tkwin = tkwin;
980		slavePtr->masterPtr = pwPtr;
981		doubleBw = 2 * Tk_Changes(slavePtr->tkwin)->border_width;
982		if (slavePtr->width > 0) {
983		slavePtr->paneWidth = slavePtr->width;
	978	panePtr->tkwin = tkwin;
	979	panePtr->containerPtr = pwPtr;
	980	doubleBw = 2 * Tk_Changes(panePtr->tkwin)->border_width;
	981	if (panePtr->width > 0) {
	982	panePtr->paneWidth = panePtr->width;
984	983	} else {
985		slavePtr->paneWidth = Tk_ReqWidth(tkwin) + doubleBw;
986		}
987		if (slavePtr->height > 0) {
988		slavePtr->paneHeight = slavePtr->height;
	984	panePtr->paneWidth = Tk_ReqWidth(tkwin) + doubleBw;
	985	}
	986	if (panePtr->height > 0) {
	987	panePtr->paneHeight = panePtr->height;
989	988	} else {
990		slavePtr->paneHeight = Tk_ReqHeight(tkwin) + doubleBw;
991		}
992		if (slavePtr->minSize < 0) {
993		slavePtr->minSize = 0;
	989	panePtr->paneHeight = Tk_ReqHeight(tkwin) + doubleBw;
	990	}
	991	if (panePtr->minSize < 0) {
	992	panePtr->minSize = 0;
994	993	}
995	994
996	995	/*
997		* Set up the geometry management callbacks for this slave.
	996	* Set up the geometry management callbacks for this pane.
998	997	*/
999	998
1000		Tk_CreateEventHandler(slavePtr->tkwin, StructureNotifyMask,
1001		SlaveStructureProc, slavePtr);
1002		Tk_ManageGeometry(slavePtr->tkwin, &panedWindowMgrType, slavePtr);
1003		inserts[insertIndex++] = slavePtr;
1004		numNewSlaves++;
1005		}
1006
1007		/*
1008		* Allocate the new slaves array, then copy the slaves into it, in order.
1009		*/
1010
1011		i = sizeof(Slave ) (pwPtr->numSlaves + numNewSlaves);
1012		newSlaves = ckalloc(i);
1013		memset(newSlaves, 0, (size_t) i);
	999	Tk_CreateEventHandler(panePtr->tkwin, StructureNotifyMask,
	1000	PaneStructureProc, panePtr);
	1001	Tk_ManageGeometry(panePtr->tkwin, &panedWindowMgrType, panePtr);
	1002	inserts[insertIndex++] = panePtr;
	1003	numNewPanes++;
	1004	}
	1005
	1006	/*
	1007	* Allocate the new panes array, then copy the panes into it, in order.
	1008	*/
	1009
	1010	i = sizeof(Pane ) (pwPtr->numPanes + numNewPanes);
	1011	newPanes = (Pane **)ckalloc(i);
	1012	memset(newPanes, 0, i);
1014	1013	if (index == -1) {
1015	1014	/*
1016		* If none of the existing slaves have to be moved, just copy the old
	1015	* If none of the existing panes have to be moved, just copy the old
1017	1016	* and append the new.
1018	1017	*/
1019		memcpy((void *)&(newSlaves[0]), pwPtr->slaves,
1020		sizeof(Slave ) pwPtr->numSlaves);
1021		memcpy((void *)&(newSlaves[pwPtr->numSlaves]), inserts,
1022		sizeof(Slave ) numNewSlaves);
	1018	memcpy((void *)&(newPanes[0]), pwPtr->panes,
	1019	sizeof(Pane ) pwPtr->numPanes);
	1020	memcpy((void *)&(newPanes[pwPtr->numPanes]), inserts,
	1021	sizeof(Pane ) numNewPanes);
1023	1022	} else {
1024	1023	/*
1025		* If some of the existing slaves were moved, the old slaves array
	1024	* If some of the existing panes were moved, the old panes array
1026	1025	* will be partially populated, with some valid and some invalid
1027		* entries. Walk through it, copying valid entries to the new slaves
	1026	* entries. Walk through it, copying valid entries to the new panes
1028	1027	* array as we go; when we get to the insert location for the new
1029		* slaves, copy the inserts array over, then finish off the old slaves
	1028	* panes, copy the inserts array over, then finish off the old panes
1030	1029	* array.
1031	1030	*/
1032	1031
1033	1032	for (i = 0, j = 0; i < index; i++) {
1034		if (pwPtr->slaves[i] != NULL) {
1035		newSlaves[j] = pwPtr->slaves[i];
	1033	if (pwPtr->panes[i] != NULL) {
	1034	newPanes[j] = pwPtr->panes[i];
1036	1035	j++;
1037	1036	}
1038	1037	}
1039	1038
1040		memcpy((void )&(newSlaves[j]), inserts, sizeof(Slave )*insertIndex);
	1039	memcpy((void )&(newPanes[j]), inserts, sizeof(Pane )*insertIndex);
1041	1040	j += firstOptionArg - 2;
1042	1041
1043		for (i = index; i < pwPtr->numSlaves; i++) {
1044		if (pwPtr->slaves[i] != NULL) {
1045		newSlaves[j] = pwPtr->slaves[i];
	1042	for (i = index; i < pwPtr->numPanes; i++) {
	1043	if (pwPtr->panes[i] != NULL) {
	1044	newPanes[j] = pwPtr->panes[i];
1046	1045	j++;
1047	1046	}
1048	1047	}
1049	1048	}
1050	1049
1051	1050	/*
1052		* Make the new slaves array the paned window's slave array, and clean up.
1053		*/
1054
1055		ckfree(pwPtr->slaves);
	1051	* Make the new panes array the paned window's pane array, and clean up.
	1052	*/
	1053
	1054	ckfree(pwPtr->panes);
1056	1055	ckfree(inserts);
1057		pwPtr->slaves = newSlaves;
1058
1059		/*
1060		* Set the paned window's slave count to the new value.
1061		*/
1062
1063		pwPtr->numSlaves += numNewSlaves;
1064
1065		Tk_FreeConfigOptions((char *) &options, pwPtr->slaveOpts, pwPtr->tkwin);
	1056	pwPtr->panes = newPanes;
	1057
	1058	/*
	1059	* Set the paned window's pane count to the new value.
	1060	*/
	1061
	1062	pwPtr->numPanes += numNewPanes;
	1063
	1064	Tk_FreeConfigOptions((char *) &options, pwPtr->paneOpts, pwPtr->tkwin);
1066	1065
1067	1066	ComputeGeometry(pwPtr);
1068	1067	return TCL_OK;

1100	1099	};
1101	1100	int index, sash, x, y, diff;
1102	1101	Tcl_Obj *coords[2];
1103		Slave *slavePtr;
	1102	Pane *panePtr;
1104	1103
1105	1104	if (objc < 3) {
1106	1105	Tcl_WrongNumArgs(interp, 2, objv, "option ?arg ...?");

1129	1128	Tcl_SetErrorCode(interp, "TK", "VALUE", "SASH_INDEX", NULL);
1130	1129	return TCL_ERROR;
1131	1130	}
1132		slavePtr = pwPtr->slaves[sash];
1133
1134		coords[0] = Tcl_NewIntObj(slavePtr->sashx);
1135		coords[1] = Tcl_NewIntObj(slavePtr->sashy);
	1131	panePtr = pwPtr->panes[sash];
	1132
	1133	coords[0] = Tcl_NewIntObj(panePtr->sashx);
	1134	coords[1] = Tcl_NewIntObj(panePtr->sashy);
1136	1135	Tcl_SetObjResult(interp, Tcl_NewListObj(2, coords));
1137	1136	break;
1138	1137

1162	1161	return TCL_ERROR;
1163	1162	}
1164	1163
1165		pwPtr->slaves[sash]->markx = x;
1166		pwPtr->slaves[sash]->marky = y;
	1164	pwPtr->panes[sash]->markx = x;
	1165	pwPtr->panes[sash]->marky = y;
1167	1166	} else {
1168		coords[0] = Tcl_NewIntObj(pwPtr->slaves[sash]->markx);
1169		coords[1] = Tcl_NewIntObj(pwPtr->slaves[sash]->marky);
	1167	coords[0] = Tcl_NewIntObj(pwPtr->panes[sash]->markx);
	1168	coords[1] = Tcl_NewIntObj(pwPtr->panes[sash]->marky);
1170	1169	Tcl_SetObjResult(interp, Tcl_NewListObj(2, coords));
1171	1170	}
1172	1171	break;

1197	1196	return TCL_ERROR;
1198	1197	}
1199	1198
1200		slavePtr = pwPtr->slaves[sash];
	1199	panePtr = pwPtr->panes[sash];
1201	1200	if (pwPtr->orient == ORIENT_HORIZONTAL) {
1202	1201	if (index == SASH_PLACE) {
1203		diff = x - pwPtr->slaves[sash]->sashx;
	1202	diff = x - pwPtr->panes[sash]->sashx;
1204	1203	} else {
1205		diff = x - pwPtr->slaves[sash]->markx;
	1204	diff = x - pwPtr->panes[sash]->markx;
1206	1205	}
1207	1206	} else {
1208	1207	if (index == SASH_PLACE) {
1209		diff = y - pwPtr->slaves[sash]->sashy;
	1208	diff = y - pwPtr->panes[sash]->sashy;
1210	1209	} else {
1211		diff = y - pwPtr->slaves[sash]->marky;
	1210	diff = y - pwPtr->panes[sash]->marky;
1212	1211	}
1213	1212	}
1214	1213

1248	1247	Tk_SavedOptions savedOptions;
1249	1248	int typemask = 0;
1250	1249
1251		if (Tk_SetOptions(interp, (char *) pwPtr, pwPtr->optionTable, objc, objv,
	1250	if (Tk_SetOptions(interp, (char *)pwPtr, pwPtr->optionTable, objc, objv,
1252	1251	pwPtr->tkwin, &savedOptions, &typemask) != TCL_OK) {
1253	1252	Tk_RestoreSavedOptions(&savedOptions);
1254	1253	return TCL_ERROR;

1294	1293	{
1295	1294	XGCValues gcValues;
1296	1295	GC newGC;
1297		PanedWindow *pwPtr = instanceData;
	1296	PanedWindow pwPtr = (PanedWindow )instanceData;
1298	1297
1299	1298	/*
1300	1299	* Allocated a graphics context for drawing the paned window widget

1351	1350	ClientData clientData, /* Information about window. */
1352	1351	XEvent eventPtr) / Information about event. */
1353	1352	{
1354		PanedWindow *pwPtr = clientData;
	1353	PanedWindow pwPtr = (PanedWindow )clientData;
1355	1354	int i;
1356	1355
1357	1356	if (eventPtr->type == Expose) {

1368	1367	} else if (eventPtr->type == DestroyNotify) {
1369	1368	DestroyPanedWindow(pwPtr);
1370	1369	} else if (eventPtr->type == UnmapNotify) {
1371		for (i = 0; i < pwPtr->numSlaves; i++) {
1372		if (!pwPtr->slaves[i]->hide) {
1373		Tk_UnmapWindow(pwPtr->slaves[i]->tkwin);
	1370	for (i = 0; i < pwPtr->numPanes; i++) {
	1371	if (!pwPtr->panes[i]->hide) {
	1372	Tk_UnmapWindow(pwPtr->panes[i]->tkwin);
1374	1373	}
1375	1374	}
1376	1375	} else if (eventPtr->type == MapNotify) {
1377		for (i = 0; i < pwPtr->numSlaves; i++) {
1378		if (!pwPtr->slaves[i]->hide) {
1379		Tk_MapWindow(pwPtr->slaves[i]->tkwin);
	1376	for (i = 0; i < pwPtr->numPanes; i++) {
	1377	if (!pwPtr->panes[i]->hide) {
	1378	Tk_MapWindow(pwPtr->panes[i]->tkwin);
1380	1379	}
1381	1380	}
1382	1381	}

1404	1403	PanedWindowCmdDeletedProc(
1405	1404	ClientData clientData) /* Pointer to widget record for widget. */
1406	1405	{
1407		PanedWindow *pwPtr = clientData;
	1406	PanedWindow pwPtr = (PanedWindow )clientData;
1408	1407
1409	1408	/*
1410	1409	* This function could be invoked either because the window was destroyed

1441	1440	DisplayPanedWindow(
1442	1441	ClientData clientData) /* Information about window. */
1443	1442	{
1444		PanedWindow *pwPtr = clientData;
1445		Slave *slavePtr;
	1443	PanedWindow pwPtr = (PanedWindow )clientData;
	1444	Pane *panePtr;
1446	1445	Pixmap pixmap;
1447	1446	Tk_Window tkwin = pwPtr->tkwin;
1448	1447	int i, sashWidth, sashHeight;

1483	1482	*/
1484	1483
1485	1484	if (horizontal) {
1486		sashHeight = Tk_Height(tkwin) - (2 * Tk_InternalBorderWidth(tkwin));
	1485	sashHeight = Tk_Height(tkwin) - (2 * Tk_InternalBorderLeft(tkwin));
1487	1486	sashWidth = pwPtr->sashWidth;
1488	1487	} else {
1489		sashWidth = Tk_Width(tkwin) - (2 * Tk_InternalBorderWidth(tkwin));
	1488	sashWidth = Tk_Width(tkwin) - (2 * Tk_InternalBorderLeft(tkwin));
1490	1489	sashHeight = pwPtr->sashWidth;
1491	1490	}
1492	1491

1495	1494	*/
1496	1495
1497	1496	GetFirstLastVisiblePane(pwPtr, &first, &last);
1498		for (i = 0; i < pwPtr->numSlaves - 1; i++) {
1499		slavePtr = pwPtr->slaves[i];
1500		if (slavePtr->hide \|\| i == last) {
	1497	for (i = 0; i < pwPtr->numPanes - 1; i++) {
	1498	panePtr = pwPtr->panes[i];
	1499	if (panePtr->hide \|\| i == last) {
1501	1500	continue;
1502	1501	}
1503	1502	if (sashWidth > 0 && sashHeight > 0) {
1504	1503	Tk_Fill3DRectangle(tkwin, pixmap, pwPtr->background,
1505		slavePtr->sashx, slavePtr->sashy, sashWidth, sashHeight,
	1504	panePtr->sashx, panePtr->sashy, sashWidth, sashHeight,
1506	1505	1, pwPtr->sashRelief);
1507	1506	}
1508	1507	if (pwPtr->showHandle) {
1509	1508	Tk_Fill3DRectangle(tkwin, pixmap, pwPtr->background,
1510		slavePtr->handlex, slavePtr->handley,
	1509	panePtr->handlex, panePtr->handley,
1511	1510	pwPtr->handleSize, pwPtr->handleSize, 1,
1512	1511	TK_RELIEF_RAISED);
1513	1512	}

1568	1567	}
1569	1568
1570	1569	/*
1571		* Clean up the slave list; foreach slave:
1572		* o Cancel the slave's structure notification callback
1573		* o Cancel geometry management for the slave.
1574		* o Free memory for the slave
1575		*/
1576
1577		for (i = 0; i < pwPtr->numSlaves; i++) {
1578		Tk_DeleteEventHandler(pwPtr->slaves[i]->tkwin, StructureNotifyMask,
1579		SlaveStructureProc, pwPtr->slaves[i]);
1580		Tk_ManageGeometry(pwPtr->slaves[i]->tkwin, NULL, NULL);
1581		Tk_FreeConfigOptions((char *) pwPtr->slaves[i], pwPtr->slaveOpts,
	1570	* Clean up the pane list; foreach pane:
	1571	* o Cancel the pane's structure notification callback
	1572	* o Cancel geometry management for the pane.
	1573	* o Free memory for the pane
	1574	*/
	1575
	1576	for (i = 0; i < pwPtr->numPanes; i++) {
	1577	Tk_DeleteEventHandler(pwPtr->panes[i]->tkwin, StructureNotifyMask,
	1578	PaneStructureProc, pwPtr->panes[i]);
	1579	Tk_ManageGeometry(pwPtr->panes[i]->tkwin, NULL, NULL);
	1580	Tk_FreeConfigOptions((char *) pwPtr->panes[i], pwPtr->paneOpts,
1582	1581	pwPtr->tkwin);
1583		ckfree(pwPtr->slaves[i]);
1584		pwPtr->slaves[i] = NULL;
1585		}
1586		if (pwPtr->slaves) {
1587		ckfree(pwPtr->slaves);
	1582	ckfree(pwPtr->panes[i]);
	1583	pwPtr->panes[i] = NULL;
	1584	}
	1585	if (pwPtr->panes) {
	1586	ckfree(pwPtr->panes);
1588	1587	}
1589	1588
1590	1589	/*

1626	1625	PanedWindowReqProc(
1627	1626	ClientData clientData, /* Paned window's information about window
1628	1627	* that got new preferred geometry. */
1629		Tk_Window tkwin) /* Other Tk-related information about the
	1628	TCL_UNUSED(Tk_Window)) /* Other Tk-related information about the
1630	1629	* window. */
1631	1630	{
1632		Slave *slavePtr = clientData;
1633		PanedWindow pwPtr = (PanedWindow ) slavePtr->masterPtr;
	1631	Pane panePtr = (Pane )clientData;
	1632	PanedWindow pwPtr = (PanedWindow ) panePtr->containerPtr;
1634	1633
1635	1634	if (Tk_IsMapped(pwPtr->tkwin)) {
1636	1635	if (!(pwPtr->flags & RESIZE_PENDING)) {

1638	1637	Tcl_DoWhenIdle(ArrangePanes, pwPtr);
1639	1638	}
1640	1639	} else {
1641		int doubleBw = 2 * Tk_Changes(slavePtr->tkwin)->border_width;
1642
1643		if (slavePtr->width <= 0) {
1644		slavePtr->paneWidth = Tk_ReqWidth(slavePtr->tkwin) + doubleBw;
1645		}
1646		if (slavePtr->height <= 0) {
1647		slavePtr->paneHeight = Tk_ReqHeight(slavePtr->tkwin) + doubleBw;
	1640	int doubleBw = 2 * Tk_Changes(panePtr->tkwin)->border_width;
	1641
	1642	if (panePtr->width <= 0) {
	1643	panePtr->paneWidth = Tk_ReqWidth(panePtr->tkwin) + doubleBw;
	1644	}
	1645	if (panePtr->height <= 0) {
	1646	panePtr->paneHeight = Tk_ReqHeight(panePtr->tkwin) + doubleBw;
1648	1647	}
1649	1648	ComputeGeometry(pwPtr);
1650	1649	}

1653	1652	/*
1654	1653	*--------------------------------------------------------------
1655	1654	*
1656		* PanedWindowLostSlaveProc --
	1655	* PanedWindowLostPaneProc --
1657	1656	*
1658	1657	* This function is invoked by Tk whenever some other geometry claims
1659		* control over a slave that used to be managed by us.
	1658	* control over a pane that used to be managed by us.
1660	1659	*
1661	1660	* Results:
1662	1661	* None.
1663	1662	*
1664	1663	* Side effects:
1665		* Forgets all information about the slave. Causes geometry to be
	1664	* Forgets all information about the pane. Causes geometry to be
1666	1665	* recomputed for the panedwindow.
1667	1666	*
1668	1667	*--------------------------------------------------------------
1669	1668	*/
1670	1669
1671	1670	static void
1672		PanedWindowLostSlaveProc(
1673		ClientData clientData, /* Grid structure for slave window that was
	1671	PanedWindowLostPaneProc(
	1672	ClientData clientData, /* Grid structure for the pane that was
1674	1673	* stolen away. */
1675		Tk_Window tkwin) /* Tk's handle for the slave window. */
	1674	TCL_UNUSED(Tk_Window)) /* Tk's handle for the pane. */
1676	1675	{
1677		register Slave *slavePtr = clientData;
1678		PanedWindow pwPtr = (PanedWindow ) slavePtr->masterPtr;
1679
1680		if (pwPtr->tkwin != Tk_Parent(slavePtr->tkwin)) {
1681		Tk_UnmaintainGeometry(slavePtr->tkwin, pwPtr->tkwin);
1682		}
1683		Unlink(slavePtr);
1684		Tk_DeleteEventHandler(slavePtr->tkwin, StructureNotifyMask,
1685		SlaveStructureProc, slavePtr);
1686		Tk_UnmapWindow(slavePtr->tkwin);
1687		slavePtr->tkwin = NULL;
1688		ckfree(slavePtr);
	1676	Pane panePtr = (Pane )clientData;
	1677	PanedWindow pwPtr = (PanedWindow ) panePtr->containerPtr;
	1678
	1679	if (pwPtr->tkwin != Tk_Parent(panePtr->tkwin)) {
	1680	Tk_UnmaintainGeometry(panePtr->tkwin, pwPtr->tkwin);
	1681	}
	1682	Unlink(panePtr);
	1683	Tk_DeleteEventHandler(panePtr->tkwin, StructureNotifyMask,
	1684	PaneStructureProc, panePtr);
	1685	Tk_UnmapWindow(panePtr->tkwin);
	1686	panePtr->tkwin = NULL;
	1687	ckfree(panePtr);
1689	1688	ComputeGeometry(pwPtr);
1690	1689	}
1691	1690

1703	1702	* None.
1704	1703	*
1705	1704	* Side effects:
1706		* The slaves of masterPtr may get resized or moved.
	1705	* The panes of containerPtr may get resized or moved.
1707	1706	*
1708	1707	*--------------------------------------------------------------
1709	1708	*/
1710	1709
1711	1710	static void
1712	1711	ArrangePanes(
1713		ClientData clientData) /* Structure describing parent whose slaves
	1712	ClientData clientData) /* Structure describing parent whose panes
1714	1713	* are to be re-layed out. */
1715	1714	{
1716		register PanedWindow *pwPtr = clientData;
1717		register Slave *slavePtr;
1718		int i, slaveWidth, slaveHeight, slaveX, slaveY;
	1715	PanedWindow pwPtr = (PanedWindow )clientData;
	1716	Pane *panePtr;
	1717	int i, newPaneWidth, newPaneHeight, paneX, paneY;
1719	1718	int paneWidth, paneHeight, paneSize, paneMinSize;
1720	1719	int doubleBw;
1721	1720	int x, y;

1730	1729	pwPtr->flags &= ~(REQUESTED_RELAYOUT\|RESIZE_PENDING);
1731	1730
1732	1731	/*
1733		* If the parent has no slaves anymore, then don't do anything at all:
	1732	* If the parent has no panes anymore, then don't do anything at all:
1734	1733	* just leave the parent's size as-is. Otherwise there is no way to
1735	1734	* "relinquish" control over the parent so another geometry manager can
1736	1735	* take over.
1737	1736	*/
1738	1737
1739		if (pwPtr->numSlaves == 0) {
	1738	if (pwPtr->numPanes == 0) {
1740	1739	return;
1741	1740	}
1742	1741

1753	1752	*/
1754	1753
1755	1754	paneDynSize = paneDynMinSize = 0;
1756		internalBW = Tk_InternalBorderWidth(pwPtr->tkwin);
	1755	internalBW = Tk_InternalBorderLeft(pwPtr->tkwin);
1757	1756	pwHeight = Tk_Height(pwPtr->tkwin) - (2 * internalBW);
1758	1757	pwWidth = Tk_Width(pwPtr->tkwin) - (2 * internalBW);
1759	1758	x = y = internalBW;

1775	1774	+ pwPtr->sashPad;
1776	1775	}
1777	1776
1778		for (i = sashCount = 0; i < pwPtr->numSlaves; i++) {
1779		slavePtr = pwPtr->slaves[i];
1780
1781		if (slavePtr->hide) {
	1777	for (i = sashCount = 0; i < pwPtr->numPanes; i++) {
	1778	panePtr = pwPtr->panes[i];
	1779
	1780	if (panePtr->hide) {
1782	1781	continue;
1783	1782	}
1784	1783
1785	1784	/*
1786		* Compute the total size needed by all the slaves and the left-over,
	1785	* Compute the total size needed by all the panes and the left-over,
1787	1786	* or shortage of space available.
1788	1787	*/
1789	1788
1790	1789	if (horizontal) {
1791		if (slavePtr->width > 0) {
1792		paneSize = slavePtr->width;
	1790	if (panePtr->width > 0) {
	1791	paneSize = panePtr->width;
1793	1792	} else {
1794		paneSize = slavePtr->paneWidth;
	1793	paneSize = panePtr->paneWidth;
1795	1794	}
1796		stretchReserve -= paneSize + (2 * slavePtr->padx);
	1795	stretchReserve -= paneSize + (2 * panePtr->padx);
1797	1796	} else {
1798		if (slavePtr->height > 0) {
1799		paneSize = slavePtr->height;
	1797	if (panePtr->height > 0) {
	1798	paneSize = panePtr->height;
1800	1799	} else {
1801		paneSize = slavePtr->paneHeight;
	1800	paneSize = panePtr->paneHeight;
1802	1801	}
1803		stretchReserve -= paneSize + (2 * slavePtr->pady);
1804		}
1805		if (IsStretchable(slavePtr->stretch,i,first,last)
	1802	stretchReserve -= paneSize + (2 * panePtr->pady);
	1803	}
	1804	if (IsStretchable(panePtr->stretch,i,first,last)
1806	1805	&& Tk_IsMapped(pwPtr->tkwin)) {
1807	1806	paneDynSize += paneSize;
1808		paneDynMinSize += slavePtr->minSize;
	1807	paneDynMinSize += panePtr->minSize;
1809	1808	}
1810	1809	if (i != last) {
1811	1810	stretchReserve -= sashWidth;

1817	1816	* Second pass; adjust/arrange panes.
1818	1817	*/
1819	1818
1820		for (i = 0; i < pwPtr->numSlaves; i++) {
1821		slavePtr = pwPtr->slaves[i];
1822
1823		if (slavePtr->hide) {
1824		Tk_UnmaintainGeometry(slavePtr->tkwin, pwPtr->tkwin);
1825		Tk_UnmapWindow(slavePtr->tkwin);
	1819	for (i = 0; i < pwPtr->numPanes; i++) {
	1820	panePtr = pwPtr->panes[i];
	1821
	1822	if (panePtr->hide) {
	1823	Tk_UnmaintainGeometry(panePtr->tkwin, pwPtr->tkwin);
	1824	Tk_UnmapWindow(panePtr->tkwin);
1826	1825	continue;
1827	1826	}
1828	1827
1829	1828	/*
1830		* Compute the size of this slave. The algorithm (assuming a
	1829	* Compute the size of this pane. The algorithm (assuming a
1831	1830	* horizontal paned window) is:
1832	1831	*
1833	1832	* 1. Get "base" dimensions. If a width or height is specified for
1834		* this slave, use those values; else use the ReqWidth/ReqHeight.
	1833	* this pane, use those values; else use the ReqWidth/ReqHeight.
1835	1834	* 2. Using base dimensions, pane dimensions, and sticky values,
1836	1835	* determine the x and y, and actual width and height of the
1837	1836	* widget.
1838	1837	*/
1839	1838
1840		doubleBw = 2 * Tk_Changes(slavePtr->tkwin)->border_width;
1841		slaveWidth = (slavePtr->width > 0 ? slavePtr->width :
1842		Tk_ReqWidth(slavePtr->tkwin) + doubleBw);
1843		slaveHeight = (slavePtr->height > 0 ? slavePtr->height :
1844		Tk_ReqHeight(slavePtr->tkwin) + doubleBw);
1845		paneMinSize = slavePtr->minSize;
	1839	doubleBw = 2 * Tk_Changes(panePtr->tkwin)->border_width;
	1840	newPaneWidth = (panePtr->width > 0 ? panePtr->width :
	1841	Tk_ReqWidth(panePtr->tkwin) + doubleBw);
	1842	newPaneHeight = (panePtr->height > 0 ? panePtr->height :
	1843	Tk_ReqHeight(panePtr->tkwin) + doubleBw);
	1844	paneMinSize = panePtr->minSize;
1846	1845
1847	1846	/*
1848	1847	* Calculate pane width and height.
1849	1848	*/
1850	1849
1851	1850	if (horizontal) {
1852		if (slavePtr->width > 0) {
1853		paneSize = slavePtr->width;
	1851	if (panePtr->width > 0) {
	1852	paneSize = panePtr->width;
1854	1853	} else {
1855		paneSize = slavePtr->paneWidth;
	1854	paneSize = panePtr->paneWidth;
1856	1855	}
1857	1856	pwSize = pwWidth;
1858	1857	} else {
1859		if (slavePtr->height > 0) {
1860		paneSize = slavePtr->height;
	1858	if (panePtr->height > 0) {
	1859	paneSize = panePtr->height;
1861	1860	} else {
1862		paneSize = slavePtr->paneHeight;
	1861	paneSize = panePtr->paneHeight;
1863	1862	}
1864	1863	pwSize = pwHeight;
1865	1864	}
1866		if (IsStretchable(slavePtr->stretch, i, first, last)) {
	1865	if (IsStretchable(panePtr->stretch, i, first, last)) {
1867	1866	double frac;
1868	1867
1869	1868	if (paneDynSize > 0) {

1873	1872	}
1874	1873
1875	1874	paneDynSize -= paneSize;
1876		paneDynMinSize -= slavePtr->minSize;
	1875	paneDynMinSize -= panePtr->minSize;
1877	1876	stretchAmount = (int) (frac * stretchReserve);
1878	1877	if (paneSize + stretchAmount >= paneMinSize) {
1879	1878	stretchReserve -= stretchAmount;

1898	1897	}
1899	1898	if (horizontal) {
1900	1899	paneWidth = paneSize;
1901		paneHeight = pwHeight - (2 * slavePtr->pady);
	1900	paneHeight = pwHeight - (2 * panePtr->pady);
1902	1901	} else {
1903		paneWidth = pwWidth - (2 * slavePtr->padx);
	1902	paneWidth = pwWidth - (2 * panePtr->padx);
1904	1903	paneHeight = paneSize;
1905	1904	}
1906	1905

1928	1927	paneHeight = pwHeight - syReserve - y + internalBW;
1929	1928	}
1930	1929
1931		if (slaveWidth > paneWidth) {
1932		slaveWidth = paneWidth;
1933		}
1934		if (slaveHeight > paneHeight) {
1935		slaveHeight = paneHeight;
1936		}
1937
1938		slavePtr->x = x;
1939		slavePtr->y = y;
	1930	if (newPaneWidth > paneWidth) {
	1931	newPaneWidth = paneWidth;
	1932	}
	1933	if (newPaneHeight > paneHeight) {
	1934	newPaneHeight = paneHeight;
	1935	}
	1936
	1937	panePtr->x = x;
	1938	panePtr->y = y;
1940	1939
1941	1940	/*
1942	1941	* Compute the location of the sash at the right or bottom of the

1944	1943	*/
1945	1944
1946	1945	if (horizontal) {
1947		x += paneWidth + (2 * slavePtr->padx);
	1946	x += paneWidth + (2 * panePtr->padx);
1948	1947	if (x < internalBW) {
1949	1948	x = internalBW;
1950	1949	}
1951		slavePtr->sashx = x + sashOffset;
1952		slavePtr->sashy = y;
1953		slavePtr->handlex = x + handleOffset;
1954		slavePtr->handley = y + pwPtr->handlePad;
	1950	panePtr->sashx = x + sashOffset;
	1951	panePtr->sashy = y;
	1952	panePtr->handlex = x + handleOffset;
	1953	panePtr->handley = y + pwPtr->handlePad;
1955	1954	x += sashWidth;
1956	1955	} else {
1957		y += paneHeight + (2 * slavePtr->pady);
	1956	y += paneHeight + (2 * panePtr->pady);
1958	1957	if (y < internalBW) {
1959	1958	y = internalBW;
1960	1959	}
1961		slavePtr->sashx = x;
1962		slavePtr->sashy = y + sashOffset;
1963		slavePtr->handlex = x + pwPtr->handlePad;
1964		slavePtr->handley = y + handleOffset;
	1960	panePtr->sashx = x;
	1961	panePtr->sashy = y + sashOffset;
	1962	panePtr->handlex = x + pwPtr->handlePad;
	1963	panePtr->handley = y + handleOffset;
1965	1964	y += sashWidth;
1966	1965	}
1967	1966
1968	1967	/*
1969		* Compute the actual dimensions of the slave in the pane.
	1968	* Compute the actual dimensions of the pane in the pane.
1970	1969	*/
1971	1970
1972		slaveX = slavePtr->x;
1973		slaveY = slavePtr->y;
1974		AdjustForSticky(slavePtr->sticky, paneWidth, paneHeight,
1975		&slaveX, &slaveY, &slaveWidth, &slaveHeight);
1976
1977		slaveX += slavePtr->padx;
1978		slaveY += slavePtr->pady;
	1971	paneX = panePtr->x;
	1972	paneY = panePtr->y;
	1973	AdjustForSticky(panePtr->sticky, paneWidth, paneHeight,
	1974	&paneX, &paneY, &newPaneWidth, &newPaneHeight);
	1975
	1976	paneX += panePtr->padx;
	1977	paneY += panePtr->pady;
1979	1978
1980	1979	/*
1981	1980	* Now put the window in the proper spot.
1982	1981	*/
1983	1982
1984		if (slaveWidth <= 0 \|\| slaveHeight <= 0 \|\|
1985		(horizontal ? slaveX - internalBW > pwWidth :
1986		slaveY - internalBW > pwHeight)) {
1987		Tk_UnmaintainGeometry(slavePtr->tkwin, pwPtr->tkwin);
1988		Tk_UnmapWindow(slavePtr->tkwin);
	1983	if (newPaneWidth <= 0 \|\| newPaneHeight <= 0 \|\|
	1984	(horizontal ? paneX - internalBW > pwWidth :
	1985	paneY - internalBW > pwHeight)) {
	1986	Tk_UnmaintainGeometry(panePtr->tkwin, pwPtr->tkwin);
	1987	Tk_UnmapWindow(panePtr->tkwin);
1989	1988	} else {
1990		Tk_MaintainGeometry(slavePtr->tkwin, pwPtr->tkwin,
1991		slaveX, slaveY, slaveWidth, slaveHeight);
	1989	Tk_MaintainGeometry(panePtr->tkwin, pwPtr->tkwin,
	1990	paneX, paneY, newPaneWidth, newPaneHeight);
1992	1991	}
1993	1992	sashCount--;
1994	1993	}

2000	1999	*
2001	2000	* Unlink --
2002	2001	*
2003		* Remove a slave from a paned window.
	2002	* Remove a pane from a paned window.
2004	2003	*
2005	2004	* Results:
2006	2005	* None.

2013	2012
2014	2013	static void
2015	2014	Unlink(
2016		register Slave slavePtr) / Window to unlink. */
	2015	Pane panePtr) / Window to unlink. */
2017	2016	{
2018		register PanedWindow *masterPtr;
	2017	PanedWindow *containerPtr;
2019	2018	int i, j;
2020	2019
2021		masterPtr = slavePtr->masterPtr;
2022		if (masterPtr == NULL) {
	2020	containerPtr = panePtr->containerPtr;
	2021	if (containerPtr == NULL) {
2023	2022	return;
2024	2023	}
2025	2024
2026	2025	/*
2027		* Find the specified slave in the panedwindow's list of slaves, then
	2026	* Find the specified pane in the panedwindow's list of panes, then
2028	2027	* remove it from that list.
2029	2028	*/
2030	2029
2031		for (i = 0; i < masterPtr->numSlaves; i++) {
2032		if (masterPtr->slaves[i] == slavePtr) {
2033		for (j = i; j < masterPtr->numSlaves - 1; j++) {
2034		masterPtr->slaves[j] = masterPtr->slaves[j + 1];
	2030	for (i = 0; i < containerPtr->numPanes; i++) {
	2031	if (containerPtr->panes[i] == panePtr) {
	2032	for (j = i; j < containerPtr->numPanes - 1; j++) {
	2033	containerPtr->panes[j] = containerPtr->panes[j + 1];
2035	2034	}
2036	2035	break;
2037	2036	}
2038	2037	}
2039	2038
2040	2039	/*
2041		* Clean out any -after or -before references to this slave
2042		*/
2043
2044		for (i = 0; i < masterPtr->numSlaves; i++) {
2045		if (masterPtr->slaves[i]->before == slavePtr->tkwin) {
2046		masterPtr->slaves[i]->before = NULL;
2047		}
2048		if (masterPtr->slaves[i]->after == slavePtr->tkwin) {
2049		masterPtr->slaves[i]->after = NULL;
2050		}
2051		}
2052
2053		masterPtr->flags \|= REQUESTED_RELAYOUT;
2054		if (!(masterPtr->flags & REDRAW_PENDING)) {
2055		masterPtr->flags \|= REDRAW_PENDING;
2056		Tcl_DoWhenIdle(DisplayPanedWindow, masterPtr);
2057		}
2058
2059		/*
2060		* Set the slave's masterPtr to NULL, so that we can tell that the slave
	2040	* Clean out any -after or -before references to this pane
	2041	*/
	2042
	2043	for (i = 0; i < containerPtr->numPanes; i++) {
	2044	if (containerPtr->panes[i]->before == panePtr->tkwin) {
	2045	containerPtr->panes[i]->before = NULL;
	2046	}
	2047	if (containerPtr->panes[i]->after == panePtr->tkwin) {
	2048	containerPtr->panes[i]->after = NULL;
	2049	}
	2050	}
	2051
	2052	containerPtr->flags \|= REQUESTED_RELAYOUT;
	2053	if (!(containerPtr->flags & REDRAW_PENDING)) {
	2054	containerPtr->flags \|= REDRAW_PENDING;
	2055	Tcl_DoWhenIdle(DisplayPanedWindow, containerPtr);
	2056	}
	2057
	2058	/*
	2059	* Set the pane's containerPtr to NULL, so that we can tell that the pane
2061	2060	* is no longer attached to any panedwindow.
2062	2061	*/
2063	2062
2064		slavePtr->masterPtr = NULL;
2065
2066		masterPtr->numSlaves--;
	2063	panePtr->containerPtr = NULL;
	2064
	2065	containerPtr->numPanes--;
2067	2066	}
2068	2067
2069	2068	/*

2075	2074	* token in a given paned window.
2076	2075	*
2077	2076	* Results:
2078		* Pointer to the slave structure, or NULL if the window is not managed
	2077	* Pointer to the pane structure, or NULL if the window is not managed
2079	2078	* by this paned window.
2080	2079	*
2081	2080	* Side effects:

2084	2083	*----------------------------------------------------------------------
2085	2084	*/
2086	2085
2087		static Slave *
	2086	static Pane *
2088	2087	GetPane(
2089	2088	PanedWindow pwPtr, / Pointer to the paned window info. */
2090	2089	Tk_Window tkwin) /* Window to search for. */
2091	2090	{
2092	2091	int i;
2093	2092
2094		for (i = 0; i < pwPtr->numSlaves; i++) {
2095		if (pwPtr->slaves[i]->tkwin == tkwin) {
2096		return pwPtr->slaves[i];
	2093	for (i = 0; i < pwPtr->numPanes; i++) {
	2094	if (pwPtr->panes[i]->tkwin == tkwin) {
	2095	return pwPtr->panes[i];
2097	2096	}
2098	2097	}
2099	2098	return NULL;

2124	2123	{
2125	2124	int i;
2126	2125
2127		for (i = 0, lastPtr = 0, firstPtr = -1; i < pwPtr->numSlaves; i++) {
2128		if (pwPtr->slaves[i]->hide == 0) {
	2126	for (i = 0, lastPtr = 0, firstPtr = -1; i < pwPtr->numPanes; i++) {
	2127	if (pwPtr->panes[i]->hide == 0) {
2129	2128	if (*firstPtr < 0) {
2130	2129	*firstPtr = i;
2131	2130	}

2137	2136	/*
2138	2137	*--------------------------------------------------------------
2139	2138	*
2140		* SlaveStructureProc --
	2139	* PaneStructureProc --
2141	2140	*
2142	2141	* This function is invoked whenever StructureNotify events occur for a
2143	2142	* window that's managed by a paned window. This function's only purpose

2147	2146	* None.
2148	2147	*
2149	2148	* Side effects:
2150		* The paned window slave structure associated with the window
2151		* is freed, and the slave is disassociated from the paned
	2149	* The paned window pane structure associated with the window
	2150	* is freed, and the pane is disassociated from the paned
2152	2151	* window which managed it.
2153	2152	*
2154	2153	*--------------------------------------------------------------
2155	2154	*/
2156	2155
2157	2156	static void
2158		SlaveStructureProc(
	2157	PaneStructureProc(
2159	2158	ClientData clientData, /* Pointer to record describing window item. */
2160	2159	XEvent eventPtr) / Describes what just happened. */
2161	2160	{
2162		Slave *slavePtr = clientData;
2163		PanedWindow *pwPtr = slavePtr->masterPtr;
	2161	Pane panePtr = (Pane )clientData;
	2162	PanedWindow *pwPtr = panePtr->containerPtr;
2164	2163
2165	2164	if (eventPtr->type == DestroyNotify) {
2166		Unlink(slavePtr);
2167		slavePtr->tkwin = NULL;
2168		ckfree(slavePtr);
	2165	Unlink(panePtr);
	2166	panePtr->tkwin = NULL;
	2167	ckfree(panePtr);
2169	2168	ComputeGeometry(pwPtr);
2170	2169	}
2171	2170	}

2176	2175	* ComputeGeometry --
2177	2176	*
2178	2177	* Compute geometry for the paned window, including coordinates of all
2179		* slave windows and each sash.
	2178	* panes and each sash.
2180	2179	*
2181	2180	* Results:
2182	2181	* None.

2194	2193	int i, x, y, doubleBw, internalBw;
2195	2194	int sashWidth, sashOffset, handleOffset;
2196	2195	int reqWidth, reqHeight, dim;
2197		Slave *slavePtr;
	2196	Pane *panePtr;
2198	2197	const int horizontal = (pwPtr->orient == ORIENT_HORIZONTAL);
2199	2198
2200	2199	pwPtr->flags \|= REQUESTED_RELAYOUT;
2201	2200
2202		x = y = internalBw = Tk_InternalBorderWidth(pwPtr->tkwin);
	2201	x = y = internalBw = Tk_InternalBorderLeft(pwPtr->tkwin);
2203	2202	reqWidth = reqHeight = 0;
2204	2203
2205	2204	/*

2220	2219	+ pwPtr->sashPad;
2221	2220	}
2222	2221
2223		for (i = 0; i < pwPtr->numSlaves; i++) {
2224		slavePtr = pwPtr->slaves[i];
2225
2226		if (slavePtr->hide) {
	2222	for (i = 0; i < pwPtr->numPanes; i++) {
	2223	panePtr = pwPtr->panes[i];
	2224
	2225	if (panePtr->hide) {
2227	2226	continue;
2228	2227	}
2229	2228
2230	2229	/*
2231		* First set the coordinates for the top left corner of the slave's
	2230	* First set the coordinates for the top left corner of the pane's
2232	2231	* parcel.
2233	2232	*/
2234	2233
2235		slavePtr->x = x;
2236		slavePtr->y = y;
	2234	panePtr->x = x;
	2235	panePtr->y = y;
2237	2236
2238	2237	/*
2239	2238	* Make sure the pane's paned dimension is at least minsize. This

2242	2241	*/
2243	2242
2244	2243	if (horizontal) {
2245		if (slavePtr->paneWidth < slavePtr->minSize) {
2246		slavePtr->paneWidth = slavePtr->minSize;
	2244	if (panePtr->paneWidth < panePtr->minSize) {
	2245	panePtr->paneWidth = panePtr->minSize;
2247	2246	}
2248	2247	} else {
2249		if (slavePtr->paneHeight < slavePtr->minSize) {
2250		slavePtr->paneHeight = slavePtr->minSize;
	2248	if (panePtr->paneHeight < panePtr->minSize) {
	2249	panePtr->paneHeight = panePtr->minSize;
2251	2250	}
2252	2251	}
2253	2252

2257	2256	*/
2258	2257
2259	2258	if (horizontal) {
2260		x += slavePtr->paneWidth + (2 * slavePtr->padx);
2261		slavePtr->sashx = x + sashOffset;
2262		slavePtr->sashy = y;
2263		slavePtr->handlex = x + handleOffset;
2264		slavePtr->handley = y + pwPtr->handlePad;
	2259	x += panePtr->paneWidth + (2 * panePtr->padx);
	2260	panePtr->sashx = x + sashOffset;
	2261	panePtr->sashy = y;
	2262	panePtr->handlex = x + handleOffset;
	2263	panePtr->handley = y + pwPtr->handlePad;
2265	2264	x += sashWidth;
2266	2265	} else {
2267		y += slavePtr->paneHeight + (2 * slavePtr->pady);
2268		slavePtr->sashx = x;
2269		slavePtr->sashy = y + sashOffset;
2270		slavePtr->handlex = x + pwPtr->handlePad;
2271		slavePtr->handley = y + handleOffset;
	2266	y += panePtr->paneHeight + (2 * panePtr->pady);
	2267	panePtr->sashx = x;
	2268	panePtr->sashy = y + sashOffset;
	2269	panePtr->handlex = x + pwPtr->handlePad;
	2270	panePtr->handley = y + handleOffset;
2272	2271	y += sashWidth;
2273	2272	}
2274	2273
2275	2274	/*
2276		* Find the maximum height/width of the slaves, for computing the
	2275	* Find the maximum height/width of the panes, for computing the
2277	2276	* requested height/width of the paned window.
2278	2277	*/
2279	2278
2280	2279	if (horizontal) {
2281	2280	/*
2282		* If the slave has an explicit height set, use that; otherwise,
2283		* use the slave's requested height.
	2281	* If the pane has an explicit height set, use that; otherwise,
	2282	* use the pane's requested height.
2284	2283	*/
2285	2284
2286		if (slavePtr->height > 0) {
2287		dim = slavePtr->height;
	2285	if (panePtr->height > 0) {
	2286	dim = panePtr->height;
2288	2287	} else {
2289		doubleBw = 2 * Tk_Changes(slavePtr->tkwin)->border_width;
2290		dim = Tk_ReqHeight(slavePtr->tkwin) + doubleBw;
2291		}
2292		dim += 2 * slavePtr->pady;
	2288	doubleBw = 2 * Tk_Changes(panePtr->tkwin)->border_width;
	2289	dim = Tk_ReqHeight(panePtr->tkwin) + doubleBw;
	2290	}
	2291	dim += 2 * panePtr->pady;
2293	2292	if (dim > reqHeight) {
2294	2293	reqHeight = dim;
2295	2294	}
2296	2295	} else {
2297	2296	/*
2298		* If the slave has an explicit width set use that; otherwise, use
2299		* the slave's requested width.
	2297	* If the pane has an explicit width set use that; otherwise, use
	2298	* the pane's requested width.
2300	2299	*/
2301	2300
2302		if (slavePtr->width > 0) {
2303		dim = slavePtr->width;
	2301	if (panePtr->width > 0) {
	2302	dim = panePtr->width;
2304	2303	} else {
2305		doubleBw = 2 * Tk_Changes(slavePtr->tkwin)->border_width;
2306		dim = Tk_ReqWidth(slavePtr->tkwin) + doubleBw;
2307		}
2308		dim += 2 * slavePtr->padx;
	2304	doubleBw = 2 * Tk_Changes(panePtr->tkwin)->border_width;
	2305	dim = Tk_ReqWidth(panePtr->tkwin) + doubleBw;
	2306	}
	2307	dim += 2 * panePtr->padx;
2309	2308	if (dim > reqWidth) {
2310	2309	reqWidth = dim;
2311	2310	}

2323	2322	* the paned window.
2324	2323	*
2325	2324	* The height (or width) is equal to the maximum height (or width) of the
2326		* slaves, plus the width of the border of the top and bottom (or left and
	2325	* panes, plus the width of the border of the top and bottom (or left and
2327	2326	* right) of the paned window.
2328	2327	*
2329	2328	* If the panedwindow has an explicit width/height set use that;

2369	2368	static void
2370	2369	DestroyOptionTables(
2371	2370	ClientData clientData, /* Pointer to the OptionTables struct */
2372		Tcl_Interp interp) / Pointer to the calling interp */
	2371	TCL_UNUSED(Tcl_Interp )) / Pointer to the calling interp */
2373	2372	{
2374	2373	ckfree(clientData);
2375	2374	}

2393	2392
2394	2393	static Tcl_Obj *
2395	2394	GetSticky(
2396		ClientData clientData,
2397		Tk_Window tkwin,
	2395	TCL_UNUSED(void *),
	2396	TCL_UNUSED(Tk_Window),
2398	2397	char recordPtr, / Pointer to widget record. */
2399	2398	int internalOffset) /* Offset within *recordPtr containing the
2400	2399	* sticky value. */

2441	2440
2442	2441	static int
2443	2442	SetSticky(
2444		ClientData clientData,
	2443	TCL_UNUSED(void *),
2445	2444	Tcl_Interp interp, / Current interp; may be used for errors. */
2446		Tk_Window tkwin, /* Window for which option is being set. */
	2445	TCL_UNUSED(Tk_Window), /* Window for which option is being set. */
2447	2446	Tcl_Obj *value, / Pointer to the pointer to the value object.
2448	2447	* We use a pointer to the pointer because we
2449	2448	* may need to return a value (NULL). */

2520	2519
2521	2520	static void
2522	2521	RestoreSticky(
2523		ClientData clientData,
2524		Tk_Window tkwin,
	2522	TCL_UNUSED(void *),
	2523	TCL_UNUSED(Tk_Window),
2525	2524	char internalPtr, / Pointer to storage for value. */
2526	2525	char oldInternalPtr) / Pointer to old value. */
2527	2526	{

2534	2533	* AdjustForSticky --
2535	2534	*
2536	2535	* Given the x,y coords of the top-left corner of a pane, the dimensions
2537		* of that pane, and the dimensions of a slave, compute the x,y coords
2538		* and actual dimensions of the slave based on the slave's sticky value.
	2536	* of that pane, and the dimensions of a pane, compute the x,y coords
	2537	* and actual dimensions of the pane based on the pane's sticky value.
2539	2538	*
2540	2539	* Results:
2541		* No direct return; sets the x, y, slaveWidth and slaveHeight to correct
	2540	* No direct return; sets the x, y, paneWidth and paneHeight to correct
2542	2541	* values.
2543	2542	*
2544	2543	* Side effects:

2555	2554	int cavityHeight, /* Height of the cavity. */
2556	2555	int xPtr, int yPtr, /* Initially, coordinates of the top-left
2557	2556	* corner of cavity; also return values for
2558		* actual x, y coords of slave. */
2559		int slaveWidthPtr, / Slave width. */
2560		int slaveHeightPtr) / Slave height. */
	2557	* actual x, y coords of pane. */
	2558	int paneWidthPtr, / Pane width. */
	2559	int paneHeightPtr) / Pane height. */
2561	2560	{
2562		int diffx = 0; /* Cavity width - slave width. */
2563		int diffy = 0; /* Cavity hight - slave height. */
2564
2565		if (cavityWidth > *slaveWidthPtr) {
2566		diffx = cavityWidth - *slaveWidthPtr;
2567		}
2568
2569		if (cavityHeight > *slaveHeightPtr) {
2570		diffy = cavityHeight - *slaveHeightPtr;
	2561	int diffx = 0; /* Cavity width - pane width. */
	2562	int diffy = 0; /* Cavity hight - pane height. */
	2563
	2564	if (cavityWidth > *paneWidthPtr) {
	2565	diffx = cavityWidth - *paneWidthPtr;
	2566	}
	2567
	2568	if (cavityHeight > *paneHeightPtr) {
	2569	diffy = cavityHeight - *paneHeightPtr;
2571	2570	}
2572	2571
2573	2572	if ((sticky & STICK_EAST) && (sticky & STICK_WEST)) {
2574		*slaveWidthPtr += diffx;
	2573	*paneWidthPtr += diffx;
2575	2574	}
2576	2575	if ((sticky & STICK_NORTH) && (sticky & STICK_SOUTH)) {
2577		*slaveHeightPtr += diffy;
	2576	*paneHeightPtr += diffy;
2578	2577	}
2579	2578	if (!(sticky & STICK_WEST)) {
2580	2579	*xPtr += (sticky & STICK_EAST) ? diffx : diffx/2;

2607	2606	int diff)
2608	2607	{
2609	2608	int i;
2610		int expandPane, reduceFirst, reduceLast, reduceIncr, slaveSize, sashOffset;
2611		Slave *slavePtr;
	2609	int expandPane, reduceFirst, reduceLast, reduceIncr, paneSize, sashOffset;
	2610	Pane *panePtr;
2612	2611	int stretchReserve = 0;
2613	2612	int nextSash = sash + 1;
2614	2613	const int horizontal = (pwPtr->orient == ORIENT_HORIZONTAL);

2617	2616	return;
2618	2617
2619	2618	/*
2620		* Update the slave sizes with their real sizes.
	2619	* Update the pane sizes with their real sizes.
2621	2620	*/
2622	2621
2623	2622	if (pwPtr->showHandle && pwPtr->handleSize > pwPtr->sashWidth) {

2626	2625	} else {
2627	2626	sashOffset = pwPtr->sashPad;
2628	2627	}
2629		for (i = 0; i < pwPtr->numSlaves; i++) {
2630		slavePtr = pwPtr->slaves[i];
2631		if (slavePtr->hide) {
	2628	for (i = 0; i < pwPtr->numPanes; i++) {
	2629	panePtr = pwPtr->panes[i];
	2630	if (panePtr->hide) {
2632	2631	continue;
2633	2632	}
2634	2633	if (horizontal) {
2635		slavePtr->paneWidth = slavePtr->width = slavePtr->sashx
2636		- sashOffset - slavePtr->x - (2 * slavePtr->padx);
	2634	panePtr->paneWidth = panePtr->width = panePtr->sashx
	2635	- sashOffset - panePtr->x - (2 * panePtr->padx);
2637	2636	} else {
2638		slavePtr->paneHeight = slavePtr->height = slavePtr->sashy
2639		- sashOffset - slavePtr->y - (2 * slavePtr->pady);
	2637	panePtr->paneHeight = panePtr->height = panePtr->sashy
	2638	- sashOffset - panePtr->y - (2 * panePtr->pady);
2640	2639	}
2641	2640	}
2642	2641

2646	2645	* pane to either side of the sash.
2647	2646	*/
2648	2647
2649		while (nextSash < pwPtr->numSlaves-1 && pwPtr->slaves[nextSash]->hide) {
	2648	while (nextSash < pwPtr->numPanes-1 && pwPtr->panes[nextSash]->hide) {
2650	2649	nextSash++;
2651	2650	}
2652	2651

2657	2656	if (diff > 0) {
2658	2657	expandPane = sash;
2659	2658	reduceFirst = nextSash;
2660		reduceLast = pwPtr->numSlaves;
	2659	reduceLast = pwPtr->numPanes;
2661	2660	reduceIncr = 1;
2662	2661	} else {
2663	2662	diff = abs(diff);

2673	2672	*/
2674	2673
2675	2674	for (i = reduceFirst; i != reduceLast; i += reduceIncr) {
2676		slavePtr = pwPtr->slaves[i];
2677		if (slavePtr->hide) {
	2675	panePtr = pwPtr->panes[i];
	2676	if (panePtr->hide) {
2678	2677	continue;
2679	2678	}
2680	2679	if (horizontal) {
2681		stretchReserve += slavePtr->width - slavePtr->minSize;
	2680	stretchReserve += panePtr->width - panePtr->minSize;
2682	2681	} else {
2683		stretchReserve += slavePtr->height - slavePtr->minSize;
	2682	stretchReserve += panePtr->height - panePtr->minSize;
2684	2683	}
2685	2684	}
2686	2685	if (stretchReserve <= 0) {

2694	2693	* Expand pane by diff amount.
2695	2694	*/
2696	2695
2697		slavePtr = pwPtr->slaves[expandPane];
	2696	panePtr = pwPtr->panes[expandPane];
2698	2697	if (horizontal) {
2699		slavePtr->paneWidth = slavePtr->width += diff;
	2698	panePtr->paneWidth = panePtr->width += diff;
2700	2699	} else {
2701		slavePtr->paneHeight = slavePtr->height += diff;
	2700	panePtr->paneHeight = panePtr->height += diff;
2702	2701	}
2703	2702
2704	2703	/*

2706	2705	*/
2707	2706
2708	2707	for (i = reduceFirst; i != reduceLast; i += reduceIncr) {
2709		slavePtr = pwPtr->slaves[i];
2710		if (slavePtr->hide) {
	2708	panePtr = pwPtr->panes[i];
	2709	if (panePtr->hide) {
2711	2710	continue;
2712	2711	}
2713	2712	if (horizontal) {
2714		slaveSize = slavePtr->width;
	2713	paneSize = panePtr->width;
2715	2714	} else {
2716		slaveSize = slavePtr->height;
2717		}
2718		if (diff > (slaveSize - slavePtr->minSize)) {
2719		diff -= slaveSize - slavePtr->minSize;
2720		slaveSize = slavePtr->minSize;
	2715	paneSize = panePtr->height;
	2716	}
	2717	if (diff > (paneSize - panePtr->minSize)) {
	2718	diff -= paneSize - panePtr->minSize;
	2719	paneSize = panePtr->minSize;
2721	2720	} else {
2722		slaveSize -= diff;
	2721	paneSize -= diff;
2723	2722	i = reduceLast - reduceIncr;
2724	2723	}
2725	2724	if (horizontal) {
2726		slavePtr->paneWidth = slavePtr->width = slaveSize;
	2725	panePtr->paneWidth = panePtr->width = paneSize;
2727	2726	} else {
2728		slavePtr->paneHeight = slavePtr->height = slaveSize;
	2727	panePtr->paneHeight = panePtr->height = paneSize;
2729	2728	}
2730	2729	}
2731	2730	}

2753	2752	ClientData clientData, /* Information about window. */
2754	2753	XEvent eventPtr) / Information about event. */
2755	2754	{
2756		PanedWindow *pwPtr = clientData;
	2755	PanedWindow pwPtr = (PanedWindow )clientData;
2757	2756
2758	2757	if (eventPtr->type == Expose) {
2759	2758	if (pwPtr->proxywin != NULL &&!(pwPtr->flags & PROXY_REDRAW_PENDING)) {

2785	2784	DisplayProxyWindow(
2786	2785	ClientData clientData) /* Information about window. */
2787	2786	{
2788		PanedWindow *pwPtr = clientData;
	2787	PanedWindow pwPtr = (PanedWindow )clientData;
2789	2788	Pixmap pixmap;
2790	2789	Tk_Window tkwin = pwPtr->proxywin;
2791	2790	pwPtr->flags &= ~PROXY_REDRAW_PENDING;

2905	2904	return TCL_ERROR;
2906	2905	}
2907	2906
2908		internalBW = Tk_InternalBorderWidth(pwPtr->tkwin);
	2907	internalBW = Tk_InternalBorderLeft(pwPtr->tkwin);
2909	2908	if (pwPtr->orient == ORIENT_HORIZONTAL) {
2910	2909	if (x < 0) {
2911	2910	x = 0;

2914	2913	if (x > pwWidth) {
2915	2914	x = pwWidth;
2916	2915	}
2917		y = Tk_InternalBorderWidth(pwPtr->tkwin);
	2916	y = Tk_InternalBorderLeft(pwPtr->tkwin);
2918	2917	sashWidth = pwPtr->sashWidth;
2919	2918	sashHeight = Tk_Height(pwPtr->tkwin) -
2920		(2 * Tk_InternalBorderWidth(pwPtr->tkwin));
	2919	(2 * Tk_InternalBorderLeft(pwPtr->tkwin));
2921	2920	} else {
2922	2921	if (y < 0) {
2923	2922	y = 0;

2926	2925	if (y > pwHeight) {
2927	2926	y = pwHeight;
2928	2927	}
2929		x = Tk_InternalBorderWidth(pwPtr->tkwin);
	2928	x = Tk_InternalBorderLeft(pwPtr->tkwin);
2930	2929	sashHeight = pwPtr->sashWidth;
2931	2930	sashWidth = Tk_Width(pwPtr->tkwin) -
2932		(2 * Tk_InternalBorderWidth(pwPtr->tkwin));
	2931	(2 * Tk_InternalBorderLeft(pwPtr->tkwin));
2933	2932	}
2934	2933
2935	2934	if (sashWidth < 1) {

2948	2947
2949	2948	/*
2950	2949	* Make sure the proxy window is higher in the stacking order than the
2951		* slaves, so that it will be visible when drawn. It would be more
	2950	* panes, so that it will be visible when drawn. It would be more
2952	2951	* correct to push the proxy window just high enough to appear above
2953		* the highest slave, but it's much easier to just force it all the
	2952	* the highest pane, but it's much easier to just force it all the
2954	2953	* way to the top of the stacking order.
2955	2954	*/
2956	2955

3065	3064	} else {
3066	3065	sashHeight = Tk_ReqHeight(pwPtr->tkwin);
3067	3066	}
3068		sashHeight -= 2 * Tk_InternalBorderWidth(pwPtr->tkwin);
	3067	sashHeight -= 2 * Tk_InternalBorderLeft(pwPtr->tkwin);
3069	3068	if (pwPtr->showHandle && pwPtr->handleSize > pwPtr->sashWidth) {
3070	3069	sashWidth = pwPtr->handleSize;
3071	3070	lpad = (pwPtr->handleSize - pwPtr->sashWidth) / 2;

3093	3092	} else {
3094	3093	sashWidth = Tk_ReqWidth(pwPtr->tkwin);
3095	3094	}
3096		sashWidth -= 2 * Tk_InternalBorderWidth(pwPtr->tkwin);
	3095	sashWidth -= 2 * Tk_InternalBorderLeft(pwPtr->tkwin);
3097	3096	lpad = rpad = 0;
3098	3097	}
3099	3098
3100	3099	GetFirstLastVisiblePane(pwPtr, &first, &last);
3101	3100	isHandle = 0;
3102	3101	found = -1;
3103		for (i = 0; i < pwPtr->numSlaves - 1; i++) {
3104		if (pwPtr->slaves[i]->hide \|\| i == last) {
	3102	for (i = 0; i < pwPtr->numPanes - 1; i++) {
	3103	if (pwPtr->panes[i]->hide \|\| i == last) {
3105	3104	continue;
3106	3105	}
3107		thisx = pwPtr->slaves[i]->sashx;
3108		thisy = pwPtr->slaves[i]->sashy;
	3106	thisx = pwPtr->panes[i]->sashx;
	3107	thisy = pwPtr->panes[i]->sashy;
3109	3108
3110	3109	if (((thisx - lpad) <= x && x <= (thisx + rpad + sashWidth)) &&
3111	3110	((thisy - tpad) <= y && y <= (thisy + bpad + sashHeight))) {

3116	3115	*/
3117	3116
3118	3117	if (pwPtr->showHandle) {
3119		thisx = pwPtr->slaves[i]->handlex;
3120		thisy = pwPtr->slaves[i]->handley;
	3118	thisx = pwPtr->panes[i]->handlex;
	3119	thisy = pwPtr->panes[i]->handley;
3121	3120	if (pwPtr->orient == ORIENT_HORIZONTAL) {
3122	3121	if (thisy <= y && y <= (thisy + pwPtr->handleSize)) {
3123	3122	isHandle = 1;

+459

-460

generic/tkPlace.c less more

16	16	* Border modes for relative placement:
17	17	*
18	18	* BM_INSIDE: relative distances computed using area inside all
19		* borders of master window.
	19	* borders of container window.
20	20	* BM_OUTSIDE: relative distances computed using outside area that
21		* includes all borders of master.
22		* BM_IGNORE: border issues are ignored: place relative to master's
	21	* includes all borders of container.
	22	* BM_IGNORE: border issues are ignored: place relative to container's
23	23	* actual window size.
24	24	*/
25	25

34	34	* structure of the following type:
35	35	*/
36	36
37		typedef struct Slave {
	37	typedef struct Content {
38	38	Tk_Window tkwin; /* Tk's token for window. */
39	39	Tk_Window inTkwin; /* Token for the -in window. */
40		struct Master masterPtr; / Pointer to information for window relative
	40	struct Container containerPtr; / Pointer to information for window relative
41	41	* to which tkwin is placed. This isn't
42	42	* necessarily the logical parent of tkwin.
43		* NULL means the master was deleted or never
	43	* NULL means the container was deleted or never
44	44	* assigned. */
45		struct Slave nextPtr; / Next in list of windows placed relative to
46		* same master (NULL for end of list). */
	45	struct Content nextPtr; / Next in list of windows placed relative to
	46	* same container (NULL for end of list). */
47	47	Tk_OptionTable optionTable; /* Table that defines configuration options
48	48	* available for this command. */
49	49	/*

56	56	Tcl_Obj xPtr, yPtr; /* Tcl_Obj rep's of x, y coords, to keep pixel
57	57	* spec. information. */
58	58	double relX, relY; /* X and Y coordinates relative to size of
59		* master. */
	59	* container. */
60	60	int width, height; /* Absolute dimensions for tkwin. */
61	61	Tcl_Obj widthPtr; / Tcl_Obj rep of width, to keep pixel
62	62	* spec. */
63	63	Tcl_Obj heightPtr; / Tcl_Obj rep of height, to keep pixel
64	64	* spec. */
65	65	double relWidth, relHeight; /* Dimensions for tkwin relative to size of
66		* master. */
	66	* container. */
67	67	Tcl_Obj *relWidthPtr;
68	68	Tcl_Obj *relHeightPtr;
69	69	Tk_Anchor anchor; /* Which point on tkwin is placed at the given
70	70	* position. */
71		BorderMode borderMode; /* How to treat borders of master window. */
	71	BorderMode borderMode; /* How to treat borders of container window. */
72	72	int flags; /* Various flags; see below for bit
73	73	* definitions. */
74		} Slave;
	74	} Content;
75	75
76	76	/*
77	77	* Type masks for options:

81	81
82	82	static const Tk_OptionSpec optionSpecs[] = {
83	83	{TK_OPTION_ANCHOR, "-anchor", NULL, NULL, "nw", -1,
84		Tk_Offset(Slave, anchor), 0, 0, 0},
	84	Tk_Offset(Content, anchor), 0, 0, 0},
85	85	{TK_OPTION_STRING_TABLE, "-bordermode", NULL, NULL, "inside", -1,
86		Tk_Offset(Slave, borderMode), 0, borderModeStrings, 0},
87		{TK_OPTION_PIXELS, "-height", NULL, NULL, "", Tk_Offset(Slave, heightPtr),
88		Tk_Offset(Slave, height), TK_OPTION_NULL_OK, 0, 0},
89		{TK_OPTION_WINDOW, "-in", NULL, NULL, "", -1, Tk_Offset(Slave, inTkwin),
	86	Tk_Offset(Content, borderMode), 0, borderModeStrings, 0},
	87	{TK_OPTION_PIXELS, "-height", NULL, NULL, "", Tk_Offset(Content, heightPtr),
	88	Tk_Offset(Content, height), TK_OPTION_NULL_OK, 0, 0},
	89	{TK_OPTION_WINDOW, "-in", NULL, NULL, "", -1, Tk_Offset(Content, inTkwin),
90	90	0, 0, IN_MASK},
91	91	{TK_OPTION_DOUBLE, "-relheight", NULL, NULL, "",
92		Tk_Offset(Slave, relHeightPtr), Tk_Offset(Slave, relHeight),
	92	Tk_Offset(Content, relHeightPtr), Tk_Offset(Content, relHeight),
93	93	TK_OPTION_NULL_OK, 0, 0},
94	94	{TK_OPTION_DOUBLE, "-relwidth", NULL, NULL, "",
95		Tk_Offset(Slave, relWidthPtr), Tk_Offset(Slave, relWidth),
	95	Tk_Offset(Content, relWidthPtr), Tk_Offset(Content, relWidth),
96	96	TK_OPTION_NULL_OK, 0, 0},
97	97	{TK_OPTION_DOUBLE, "-relx", NULL, NULL, "0", -1,
98		Tk_Offset(Slave, relX), 0, 0, 0},
	98	Tk_Offset(Content, relX), 0, 0, 0},
99	99	{TK_OPTION_DOUBLE, "-rely", NULL, NULL, "0", -1,
100		Tk_Offset(Slave, relY), 0, 0, 0},
101		{TK_OPTION_PIXELS, "-width", NULL, NULL, "", Tk_Offset(Slave, widthPtr),
102		Tk_Offset(Slave, width), TK_OPTION_NULL_OK, 0, 0},
103		{TK_OPTION_PIXELS, "-x", NULL, NULL, "0", Tk_Offset(Slave, xPtr),
104		Tk_Offset(Slave, x), TK_OPTION_NULL_OK, 0, 0},
105		{TK_OPTION_PIXELS, "-y", NULL, NULL, "0", Tk_Offset(Slave, yPtr),
106		Tk_Offset(Slave, y), TK_OPTION_NULL_OK, 0, 0},
	100	Tk_Offset(Content, relY), 0, 0, 0},
	101	{TK_OPTION_PIXELS, "-width", NULL, NULL, "", Tk_Offset(Content, widthPtr),
	102	Tk_Offset(Content, width), TK_OPTION_NULL_OK, 0, 0},
	103	{TK_OPTION_PIXELS, "-x", NULL, NULL, "0", Tk_Offset(Content, xPtr),
	104	Tk_Offset(Content, x), TK_OPTION_NULL_OK, 0, 0},
	105	{TK_OPTION_PIXELS, "-y", NULL, NULL, "0", Tk_Offset(Content, yPtr),
	106	Tk_Offset(Content, y), TK_OPTION_NULL_OK, 0, 0},
107	107	{TK_OPTION_END, NULL, NULL, NULL, NULL, 0, -1, 0, 0, 0}
108	108	};
109	109
110	110	/*
111		* Flag definitions for Slave structures:
	111	* Flag definitions for Content structures:
112	112	*
113	113	* CHILD_WIDTH - 1 means -width was specified;
114	114	* CHILD_REL_WIDTH - 1 means -relwidth was specified.

122	122	#define CHILD_REL_HEIGHT 8
123	123
124	124	/*
125		* For each master window that has a slave managed by the placer there is a
	125	* For each container window that has a content managed by the placer there is a
126	126	* structure of the following form:
127	127	*/
128	128
129		typedef struct Master {
130		Tk_Window tkwin; /* Tk's token for master window. */
131		struct Slave slavePtr; / First in linked list of slaves placed
132		* relative to this master. */
	129	typedef struct Container {
	130	Tk_Window tkwin; /* Tk's token for container window. */
	131	struct Content contentPtr; / First in linked list of content placed
	132	* relative to this container. */
133	133	int abortPtr; / If non-NULL, it means that there is a nested
134	134	* call to RecomputePlacement already working on
135	135	* this window. *abortPtr may be set to 1 to
136	136	* abort that nested call. This happens, for
137		* example, if tkwin or any of its slaves
	137	* example, if tkwin or any of its content
138	138	* is deleted. */
139	139	int flags; /* See below for bit definitions. */
140		} Master;
141
142		/*
143		* Flag definitions for masters:
	140	} Container;
	141
	142	/*
	143	* Flag definitions for containers:
144	144	*
145	145	* PARENT_RECONFIG_PENDING - 1 means that a call to RecomputePlacement is
146	146	* already pending via a Do_When_Idle handler.

154	154
155	155	static void PlaceRequestProc(ClientData clientData,
156	156	Tk_Window tkwin);
157		static void PlaceLostSlaveProc(ClientData clientData,
	157	static void PlaceLostContentProc(ClientData clientData,
158	158	Tk_Window tkwin);
159	159
160	160	static const Tk_GeomMgr placerType = {
161	161	"place", /* name */
162	162	PlaceRequestProc, /* requestProc */
163		PlaceLostSlaveProc, /* lostSlaveProc */
	163	PlaceLostContentProc, /* lostContentProc */
164	164	};
165	165
166	166	/*
167	167	* Forward declarations for functions defined later in this file:
168	168	*/
169	169
170		static void SlaveStructureProc(ClientData clientData,
	170	static void ContentStructureProc(ClientData clientData,
171	171	XEvent *eventPtr);
172		static int ConfigureSlave(Tcl_Interp *interp, Tk_Window tkwin,
	172	static int ConfigureContent(Tcl_Interp *interp, Tk_Window tkwin,
173	173	Tk_OptionTable table, int objc,
174	174	Tcl_Obj *const objv[]);
175	175	static int PlaceInfoCommand(Tcl_Interp *interp, Tk_Window tkwin);
176		static Slave * CreateSlave(Tk_Window tkwin, Tk_OptionTable table);
177		static void FreeSlave(Slave *slavePtr);
178		static Slave * FindSlave(Tk_Window tkwin);
179		static Master * CreateMaster(Tk_Window tkwin);
180		static Master * FindMaster(Tk_Window tkwin);
181		static void MasterStructureProc(ClientData clientData,
	176	static Content * CreateContent(Tk_Window tkwin, Tk_OptionTable table);
	177	static void FreeContent(Content *contentPtr);
	178	static Content * FindContent(Tk_Window tkwin);
	179	static Container * CreateContainer(Tk_Window tkwin);
	180	static Container * FindContainer(Tk_Window tkwin);
	181	static void PlaceStructureProc(ClientData clientData,
182	182	XEvent *eventPtr);
183	183	static void RecomputePlacement(ClientData clientData);
184		static void UnlinkSlave(Slave *slavePtr);
	184	static void UnlinkContent(Content *contentPtr);
185	185
186	186	/*
187	187	*--------------------------------------------------------------

207	207	int objc, /* Number of arguments. */
208	208	Tcl_Obj const objv[]) / Argument objects. */
209	209	{
210		Tk_Window main_win = clientData;
	210	Tk_Window main_win = (Tk_Window)clientData;
211	211	Tk_Window tkwin;
212		Slave *slavePtr;
	212	Content *contentPtr;
213	213	TkDisplay *dispPtr;
214	214	Tk_OptionTable optionTable;
215	215	static const char *const optionStrings[] = {
216		"configure", "forget", "info", "slaves", NULL
	216	"configure", "content", "forget", "info", "slaves", NULL
217	217	};
218		enum options { PLACE_CONFIGURE, PLACE_FORGET, PLACE_INFO, PLACE_SLAVES };
	218	enum options { PLACE_CONFIGURE, PLACE_CONTENT, PLACE_FORGET, PLACE_INFO, PLACE_SLAVES };
219	219	int index;
220	220
221	221	if (objc < 3) {

251	251	dispPtr->placeInit = 1;
252	252	}
253	253
254		return ConfigureSlave(interp, tkwin, optionTable, objc-2, objv+2);
	254	return ConfigureContent(interp, tkwin, optionTable, objc-2, objv+2);
255	255	}
256	256
257	257	/*

285	285	if (objc == 3 \|\| objc == 4) {
286	286	Tcl_Obj *objPtr;
287	287
288		slavePtr = FindSlave(tkwin);
289		if (slavePtr == NULL) {
	288	contentPtr = FindContent(tkwin);
	289	if (contentPtr == NULL) {
290	290	return TCL_OK;
291	291	}
292		objPtr = Tk_GetOptionInfo(interp, (char *) slavePtr, optionTable,
	292	objPtr = Tk_GetOptionInfo(interp, (char *)contentPtr, optionTable,
293	293	(objc == 4) ? objv[3] : NULL, tkwin);
294	294	if (objPtr == NULL) {
295	295	return TCL_ERROR;

297	297	Tcl_SetObjResult(interp, objPtr);
298	298	return TCL_OK;
299	299	}
300		return ConfigureSlave(interp, tkwin, optionTable, objc-3, objv+3);
	300	return ConfigureContent(interp, tkwin, optionTable, objc-3, objv+3);
301	301
302	302	case PLACE_FORGET:
303	303	if (objc != 3) {
304	304	Tcl_WrongNumArgs(interp, 2, objv, "pathName");
305	305	return TCL_ERROR;
306	306	}
307		slavePtr = FindSlave(tkwin);
308		if (slavePtr == NULL) {
	307	contentPtr = FindContent(tkwin);
	308	if (contentPtr == NULL) {
309	309	return TCL_OK;
310	310	}
311		if ((slavePtr->masterPtr != NULL) &&
312		(slavePtr->masterPtr->tkwin != Tk_Parent(slavePtr->tkwin))) {
313		Tk_UnmaintainGeometry(slavePtr->tkwin, slavePtr->masterPtr->tkwin);
314		}
315		UnlinkSlave(slavePtr);
	311	if ((contentPtr->containerPtr != NULL) &&
	312	(contentPtr->containerPtr->tkwin != Tk_Parent(contentPtr->tkwin))) {
	313	Tk_UnmaintainGeometry(contentPtr->tkwin, contentPtr->containerPtr->tkwin);
	314	}
	315	UnlinkContent(contentPtr);
316	316	Tcl_DeleteHashEntry(Tcl_FindHashEntry(&dispPtr->slaveTable,
317		(char *) tkwin));
318		Tk_DeleteEventHandler(tkwin, StructureNotifyMask, SlaveStructureProc,
319		slavePtr);
	317	(void *)tkwin));
	318	Tk_DeleteEventHandler(tkwin, StructureNotifyMask, ContentStructureProc,
	319	contentPtr);
320	320	Tk_ManageGeometry(tkwin, NULL, NULL);
321	321	Tk_UnmapWindow(tkwin);
322		FreeSlave(slavePtr);
	322	FreeContent(contentPtr);
323	323	break;
324	324
325	325	case PLACE_INFO:

329	329	}
330	330	return PlaceInfoCommand(interp, tkwin);
331	331
	332	case PLACE_CONTENT:
332	333	case PLACE_SLAVES: {
333		Master *masterPtr;
	334	Container *containerPtr;
334	335
335	336	if (objc != 3) {
336	337	Tcl_WrongNumArgs(interp, 2, objv, "pathName");
337	338	return TCL_ERROR;
338	339	}
339		masterPtr = FindMaster(tkwin);
340		if (masterPtr != NULL) {
	340	containerPtr = FindContainer(tkwin);
	341	if (containerPtr != NULL) {
341	342	Tcl_Obj *listPtr = Tcl_NewObj();
342	343
343		for (slavePtr = masterPtr->slavePtr; slavePtr != NULL;
344		slavePtr = slavePtr->nextPtr) {
	344	for (contentPtr = containerPtr->contentPtr; contentPtr != NULL;
	345	contentPtr = contentPtr->nextPtr) {
345	346	Tcl_ListObjAppendElement(NULL, listPtr,
346		TkNewWindowObj(slavePtr->tkwin));
	347	TkNewWindowObj(contentPtr->tkwin));
347	348	}
348	349	Tcl_SetObjResult(interp, listPtr);
349	350	}

357	358	/*
358	359	*----------------------------------------------------------------------
359	360	*
360		* CreateSlave --
361		*
362		* Given a Tk_Window token, find the Slave structure corresponding to
	361	* CreateContent --
	362	*
	363	* Given a Tk_Window token, find the Content structure corresponding to
363	364	* that token, creating a new one if necessary.
364	365	*
365	366	* Results:
366		* Pointer to the Slave structure.
367		*
368		* Side effects:
369		* A new Slave structure may be created.
370		*
371		*----------------------------------------------------------------------
372		*/
373
374		static Slave *
375		CreateSlave(
376		Tk_Window tkwin, /* Token for desired slave. */
	367	* Pointer to the Content structure.
	368	*
	369	* Side effects:
	370	* A new Content structure may be created.
	371	*
	372	*----------------------------------------------------------------------
	373	*/
	374
	375	static Content *
	376	CreateContent(
	377	Tk_Window tkwin, /* Token for desired content. */
377	378	Tk_OptionTable table)
378	379	{
379	380	Tcl_HashEntry *hPtr;
380		register Slave *slavePtr;
	381	Content *contentPtr;
381	382	int isNew;
382	383	TkDisplay dispPtr = ((TkWindow ) tkwin)->dispPtr;
383	384
384	385	hPtr = Tcl_CreateHashEntry(&dispPtr->slaveTable, (char *) tkwin, &isNew);
385	386	if (!isNew) {
386		return Tcl_GetHashValue(hPtr);
	387	return (Content *)Tcl_GetHashValue(hPtr);
387	388	}
388	389
389	390	/*
390		* No preexisting slave structure for that window, so make a new one and
	391	* No preexisting content structure for that window, so make a new one and
391	392	* populate it with some default values.
392	393	*/
393	394
394		slavePtr = ckalloc(sizeof(Slave));
395		memset(slavePtr, 0, sizeof(Slave));
396		slavePtr->tkwin = tkwin;
397		slavePtr->inTkwin = NULL;
398		slavePtr->anchor = TK_ANCHOR_NW;
399		slavePtr->borderMode = BM_INSIDE;
400		slavePtr->optionTable = table;
401		Tcl_SetHashValue(hPtr, slavePtr);
402		Tk_CreateEventHandler(tkwin, StructureNotifyMask, SlaveStructureProc,
403		slavePtr);
404		return slavePtr;
405		}
406
407		/*
408		*----------------------------------------------------------------------
409		*
410		* FreeSlave --
411		*
412		* Frees the resources held by a Slave structure.
	395	contentPtr = (Content *)ckalloc(sizeof(Content));
	396	memset(contentPtr, 0, sizeof(Content));
	397	contentPtr->tkwin = tkwin;
	398	contentPtr->inTkwin = NULL;
	399	contentPtr->anchor = TK_ANCHOR_NW;
	400	contentPtr->borderMode = BM_INSIDE;
	401	contentPtr->optionTable = table;
	402	Tcl_SetHashValue(hPtr, contentPtr);
	403	Tk_CreateEventHandler(tkwin, StructureNotifyMask, ContentStructureProc,
	404	contentPtr);
	405	return contentPtr;
	406	}
	407
	408	/*
	409	*----------------------------------------------------------------------
	410	*
	411	* FreeContent --
	412	*
	413	* Frees the resources held by a Content structure.
413	414	*
414	415	* Results:
415	416	* None

421	422	*/
422	423
423	424	static void
424		FreeSlave(
425		Slave *slavePtr)
426		{
427		Tk_FreeConfigOptions((char *) slavePtr, slavePtr->optionTable,
428		slavePtr->tkwin);
429		ckfree(slavePtr);
430		}
431
432		/*
433		*----------------------------------------------------------------------
434		*
435		* FindSlave --
436		*
437		* Given a Tk_Window token, find the Slave structure corresponding to
	425	FreeContent(
	426	Content *contentPtr)
	427	{
	428	Tk_FreeConfigOptions((char *) contentPtr, contentPtr->optionTable,
	429	contentPtr->tkwin);
	430	ckfree(contentPtr);
	431	}
	432
	433	/*
	434	*----------------------------------------------------------------------
	435	*
	436	* FindContent --
	437	*
	438	* Given a Tk_Window token, find the Content structure corresponding to
438	439	* that token. This is purely a lookup function; it will not create a
439	440	* record if one does not yet exist.
440	441	*
441	442	* Results:
442		* Pointer to Slave structure; NULL if none exists.
	443	* Pointer to Content structure; NULL if none exists.
443	444	*
444	445	* Side effects:
445	446	* None.

447	448	*----------------------------------------------------------------------
448	449	*/
449	450
450		static Slave *
451		FindSlave(
452		Tk_Window tkwin) /* Token for desired slave. */
453		{
454		register Tcl_HashEntry *hPtr;
	451	static Content *
	452	FindContent(
	453	Tk_Window tkwin) /* Token for desired content. */
	454	{
	455	Tcl_HashEntry *hPtr;
455	456	TkDisplay dispPtr = ((TkWindow ) tkwin)->dispPtr;
456	457
457	458	hPtr = Tcl_FindHashEntry(&dispPtr->slaveTable, (char *) tkwin);
458	459	if (hPtr == NULL) {
459	460	return NULL;
460	461	}
461		return Tcl_GetHashValue(hPtr);
462		}
463
464		/*
465		*----------------------------------------------------------------------
466		*
467		* UnlinkSlave --
468		*
469		* This function removes a slave window from the chain of slaves in its
470		* master.
	462	return (Content *)Tcl_GetHashValue(hPtr);
	463	}
	464
	465	/*
	466	*----------------------------------------------------------------------
	467	*
	468	* UnlinkContent --
	469	*
	470	* This function removes a content window from the chain of content in its
	471	* container.
471	472	*
472	473	* Results:
473	474	* None.
474	475	*
475	476	* Side effects:
476		* The slave list of slavePtr's master changes.
	477	* The content list of contentPtr's container changes.
477	478	*
478	479	*----------------------------------------------------------------------
479	480	*/
480	481
481	482	static void
482		UnlinkSlave(
483		Slave slavePtr) / Slave structure to be unlinked. */
484		{
485		register Master *masterPtr;
486		register Slave *prevPtr;
487
488		masterPtr = slavePtr->masterPtr;
489		if (masterPtr == NULL) {
	483	UnlinkContent(
	484	Content contentPtr) / Content structure to be unlinked. */
	485	{
	486	Container *containerPtr;
	487	Content *prevPtr;
	488
	489	containerPtr = contentPtr->containerPtr;
	490	if (containerPtr == NULL) {
490	491	return;
491	492	}
492		if (masterPtr->slavePtr == slavePtr) {
493		masterPtr->slavePtr = slavePtr->nextPtr;
	493	if (containerPtr->contentPtr == contentPtr) {
	494	containerPtr->contentPtr = contentPtr->nextPtr;
494	495	} else {
495		for (prevPtr = masterPtr->slavePtr; ; prevPtr = prevPtr->nextPtr) {
	496	for (prevPtr = containerPtr->contentPtr; ; prevPtr = prevPtr->nextPtr) {
496	497	if (prevPtr == NULL) {
497		Tcl_Panic("UnlinkSlave couldn't find slave to unlink");
498		}
499		if (prevPtr->nextPtr == slavePtr) {
500		prevPtr->nextPtr = slavePtr->nextPtr;
	498	Tcl_Panic("UnlinkContent couldn't find slave to unlink");
	499	}
	500	if (prevPtr->nextPtr == contentPtr) {
	501	prevPtr->nextPtr = contentPtr->nextPtr;
501	502	break;
502	503	}
503	504	}
504	505	}
505	506
506		if (masterPtr->abortPtr != NULL) {
507		*masterPtr->abortPtr = 1;
508		}
509		slavePtr->masterPtr = NULL;
510		}
511
512		/*
513		*----------------------------------------------------------------------
514		*
515		* CreateMaster --
516		*
517		* Given a Tk_Window token, find the Master structure corresponding to
	507	if (containerPtr->abortPtr != NULL) {
	508	*containerPtr->abortPtr = 1;
	509	}
	510	contentPtr->containerPtr = NULL;
	511	}
	512
	513	/*
	514	*----------------------------------------------------------------------
	515	*
	516	* CreateContainer --
	517	*
	518	* Given a Tk_Window token, find the Container structure corresponding to
518	519	* that token, creating a new one if necessary.
519	520	*
520	521	* Results:
521		* Pointer to the Master structure.
522		*
523		* Side effects:
524		* A new Master structure may be created.
525		*
526		*----------------------------------------------------------------------
527		*/
528
529		static Master *
530		CreateMaster(
531		Tk_Window tkwin) /* Token for desired master. */
	522	* Pointer to the Container structure.
	523	*
	524	* Side effects:
	525	* A new Container structure may be created.
	526	*
	527	*----------------------------------------------------------------------
	528	*/
	529
	530	static Container *
	531	CreateContainer(
	532	Tk_Window tkwin) /* Token for desired container. */
532	533	{
533	534	Tcl_HashEntry *hPtr;
534		register Master *masterPtr;
	535	Container *containerPtr;
535	536	int isNew;
536	537	TkDisplay dispPtr = ((TkWindow ) tkwin)->dispPtr;
537	538
538		hPtr = Tcl_CreateHashEntry(&dispPtr->masterTable, (char *) tkwin, &isNew);
	539	hPtr = Tcl_CreateHashEntry(&dispPtr->masterTable, (char *)tkwin, &isNew);
539	540	if (isNew) {
540		masterPtr = ckalloc(sizeof(Master));
541		masterPtr->tkwin = tkwin;
542		masterPtr->slavePtr = NULL;
543		masterPtr->abortPtr = NULL;
544		masterPtr->flags = 0;
545		Tcl_SetHashValue(hPtr, masterPtr);
546		Tk_CreateEventHandler(masterPtr->tkwin, StructureNotifyMask,
547		MasterStructureProc, masterPtr);
	541	containerPtr = (Container *)ckalloc(sizeof(Container));
	542	containerPtr->tkwin = tkwin;
	543	containerPtr->contentPtr = NULL;
	544	containerPtr->abortPtr = NULL;
	545	containerPtr->flags = 0;
	546	Tcl_SetHashValue(hPtr, containerPtr);
	547	Tk_CreateEventHandler(containerPtr->tkwin, StructureNotifyMask,
	548	PlaceStructureProc, containerPtr);
548	549	} else {
549		masterPtr = Tcl_GetHashValue(hPtr);
550		}
551		return masterPtr;
552		}
553
554		/*
555		*----------------------------------------------------------------------
556		*
557		* FindMaster --
558		*
559		* Given a Tk_Window token, find the Master structure corresponding to
	550	containerPtr = (Container *)Tcl_GetHashValue(hPtr);
	551	}
	552	return containerPtr;
	553	}
	554
	555	/*
	556	*----------------------------------------------------------------------
	557	*
	558	* FindContainer --
	559	*
	560	* Given a Tk_Window token, find the Container structure corresponding to
560	561	* that token. This is simply a lookup function; a new record will not be
561	562	* created if one does not already exist.
562	563	*
563	564	* Results:
564		* Pointer to the Master structure; NULL if one does not exist for the
	565	* Pointer to the Container structure; NULL if one does not exist for the
565	566	* given Tk_Window token.
566	567	*
567	568	* Side effects:

570	571	*----------------------------------------------------------------------
571	572	*/
572	573
573		static Master *
574		FindMaster(
575		Tk_Window tkwin) /* Token for desired master. */
576		{
577		register Tcl_HashEntry *hPtr;
	574	static Container *
	575	FindContainer(
	576	Tk_Window tkwin) /* Token for desired container. */
	577	{
	578	Tcl_HashEntry *hPtr;
578	579	TkDisplay dispPtr = ((TkWindow ) tkwin)->dispPtr;
579	580
580	581	hPtr = Tcl_FindHashEntry(&dispPtr->masterTable, (char *) tkwin);
581	582	if (hPtr == NULL) {
582	583	return NULL;
583	584	}
584		return Tcl_GetHashValue(hPtr);
585		}
586
587		/*
588		*----------------------------------------------------------------------
589		*
590		* ConfigureSlave --
	585	return (Container *)Tcl_GetHashValue(hPtr);
	586	}
	587
	588	/*
	589	*----------------------------------------------------------------------
	590	*
	591	* ConfigureContent --
591	592	*
592	593	* This function is called to process an argv/argc list to reconfigure
593	594	* the placement of a window.

597	598	* the interp's result.
598	599	*
599	600	* Side effects:
600		* Information in slavePtr may change, and slavePtr's master is scheduled
	601	* Information in contentPtr may change, and contentPtr's container is scheduled
601	602	* for reconfiguration.
602	603	*
603	604	*----------------------------------------------------------------------
604	605	*/
605	606
606	607	static int
607		ConfigureSlave(
	608	ConfigureContent(
608	609	Tcl_Interp interp, / Used for error reporting. */
609	610	Tk_Window tkwin, /* Token for the window to manipulate. */
610	611	Tk_OptionTable table, /* Token for option table. */
611	612	int objc, /* Number of config arguments. */
612	613	Tcl_Obj const objv[]) / Object values for arguments. */
613	614	{
614		register Master *masterPtr;
	615	Container *containerPtr;
615	616	Tk_SavedOptions savedOptions;
616	617	int mask;
617		Slave *slavePtr;
618		Tk_Window masterWin = NULL;
619		TkWindow *master;
	618	Content *contentPtr;
	619	Tk_Window containerWin = NULL;
	620	TkWindow *container;
620	621
621	622	if (Tk_TopWinHierarchy(tkwin)) {
622	623	Tcl_SetObjResult(interp, Tcl_ObjPrintf(

626	627	return TCL_ERROR;
627	628	}
628	629
629		slavePtr = CreateSlave(tkwin, table);
630
631		if (Tk_SetOptions(interp, (char *) slavePtr, table, objc, objv,
632		slavePtr->tkwin, &savedOptions, &mask) != TCL_OK) {
	630	contentPtr = CreateContent(tkwin, table);
	631
	632	if (Tk_SetOptions(interp, (char *)contentPtr, table, objc, objv,
	633	contentPtr->tkwin, &savedOptions, &mask) != TCL_OK) {
633	634	goto error;
634	635	}
635	636
636	637	/*
637		* Set slave flags. First clear the field, then add bits as needed.
	638	* Set content flags. First clear the field, then add bits as needed.
638	639	*/
639	640
640		slavePtr->flags = 0;
641		if (slavePtr->heightPtr) {
642		slavePtr->flags \|= CHILD_HEIGHT;
643		}
644
645		if (slavePtr->relHeightPtr) {
646		slavePtr->flags \|= CHILD_REL_HEIGHT;
647		}
648
649		if (slavePtr->relWidthPtr) {
650		slavePtr->flags \|= CHILD_REL_WIDTH;
651		}
652
653		if (slavePtr->widthPtr) {
654		slavePtr->flags \|= CHILD_WIDTH;
655		}
656
657		if (!(mask & IN_MASK) && (slavePtr->masterPtr != NULL)) {
	641	contentPtr->flags = 0;
	642	if (contentPtr->heightPtr) {
	643	contentPtr->flags \|= CHILD_HEIGHT;
	644	}
	645
	646	if (contentPtr->relHeightPtr) {
	647	contentPtr->flags \|= CHILD_REL_HEIGHT;
	648	}
	649
	650	if (contentPtr->relWidthPtr) {
	651	contentPtr->flags \|= CHILD_REL_WIDTH;
	652	}
	653
	654	if (contentPtr->widthPtr) {
	655	contentPtr->flags \|= CHILD_WIDTH;
	656	}
	657
	658	if (!(mask & IN_MASK) && (contentPtr->containerPtr != NULL)) {
658	659	/*
659		* If no -in option was passed and the slave is already placed then
	660	* If no -in option was passed and the content is already placed then
660	661	* just recompute the placement.
661	662	*/
662	663
663		masterPtr = slavePtr->masterPtr;
	664	containerPtr = contentPtr->containerPtr;
664	665	goto scheduleLayout;
665	666	} else if (mask & IN_MASK) {
666	667	/* -in changed */
667		Tk_Window tkwin;
	668	Tk_Window win;
668	669	Tk_Window ancestor;
669	670
670		tkwin = slavePtr->inTkwin;
	671	win = contentPtr->inTkwin;
671	672
672	673	/*
673		* Make sure that the new master is either the logical parent of the
674		* slave or a descendant of that window, and that the master and slave
	674	* Make sure that the new container is either the logical parent of the
	675	* content or a descendant of that window, and that the container and content
675	676	* aren't the same.
676	677	*/
677	678
678		for (ancestor = tkwin; ; ancestor = Tk_Parent(ancestor)) {
679		if (ancestor == Tk_Parent(slavePtr->tkwin)) {
	679	for (ancestor = win; ; ancestor = Tk_Parent(ancestor)) {
	680	if (ancestor == Tk_Parent(contentPtr->tkwin)) {
680	681	break;
681	682	}
682	683	if (Tk_TopWinHierarchy(ancestor)) {
683	684	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
684	685	"can't place %s relative to %s",
685		Tk_PathName(slavePtr->tkwin), Tk_PathName(tkwin)));
	686	Tk_PathName(contentPtr->tkwin), Tk_PathName(win)));
686	687	Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "HIERARCHY", NULL);
687	688	goto error;
688	689	}
689	690	}
690		if (slavePtr->tkwin == tkwin) {
	691	if (contentPtr->tkwin == win) {
691	692	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
692	693	"can't place %s relative to itself",
693		Tk_PathName(slavePtr->tkwin)));
	694	Tk_PathName(contentPtr->tkwin)));
694	695	Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "LOOP", NULL);
695	696	goto error;
696	697	}

699	700	* Check for management loops.
700	701	*/
701	702
702		for (master = (TkWindow *)tkwin; master != NULL;
703		master = (TkWindow *)TkGetGeomMaster(master)) {
704		if (master == (TkWindow *)slavePtr->tkwin) {
	703	for (container = (TkWindow *)win; container != NULL;
	704	container = (TkWindow *)TkGetContainer(container)) {
	705	if (container == (TkWindow *)contentPtr->tkwin) {
705	706	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
706	707	"can't put %s inside %s, would cause management loop",
707		Tk_PathName(slavePtr->tkwin), Tk_PathName(tkwin)));
	708	Tk_PathName(contentPtr->tkwin), Tk_PathName(win)));
708	709	Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "LOOP", NULL);
709	710	goto error;
710	711	}
711	712	}
712		if (tkwin != Tk_Parent(slavePtr->tkwin)) {
713		((TkWindow )slavePtr->tkwin)->maintainerPtr = (TkWindow )tkwin;
714		}
715
716		if ((slavePtr->masterPtr != NULL)
717		&& (slavePtr->masterPtr->tkwin == tkwin)) {
	713	if (win != Tk_Parent(contentPtr->tkwin)) {
	714	((TkWindow )contentPtr->tkwin)->maintainerPtr = (TkWindow )win;
	715	}
	716
	717	if ((contentPtr->containerPtr != NULL)
	718	&& (contentPtr->containerPtr->tkwin == win)) {
718	719	/*
719		* Re-using same old master. Nothing to do.
	720	* Re-using same old container. Nothing to do.
720	721	*/
721	722
722		masterPtr = slavePtr->masterPtr;
	723	containerPtr = contentPtr->containerPtr;
723	724	goto scheduleLayout;
724	725	}
725		if ((slavePtr->masterPtr != NULL) &&
726		(slavePtr->masterPtr->tkwin != Tk_Parent(slavePtr->tkwin))) {
727		Tk_UnmaintainGeometry(slavePtr->tkwin, slavePtr->masterPtr->tkwin);
728		}
729		UnlinkSlave(slavePtr);
730		masterWin = tkwin;
	726	if ((contentPtr->containerPtr != NULL) &&
	727	(contentPtr->containerPtr->tkwin != Tk_Parent(contentPtr->tkwin))) {
	728	Tk_UnmaintainGeometry(contentPtr->tkwin, contentPtr->containerPtr->tkwin);
	729	}
	730	UnlinkContent(contentPtr);
	731	containerWin = win;
731	732	}
732	733
733	734	/*
734		* If there's no master specified for this slave, use its Tk_Parent.
	735	* If there's no container specified for this content, use its Tk_Parent.
735	736	*/
736	737
737		if (masterWin == NULL) {
738		masterWin = Tk_Parent(slavePtr->tkwin);
739		slavePtr->inTkwin = masterWin;
	738	if (containerWin == NULL) {
	739	containerWin = Tk_Parent(contentPtr->tkwin);
	740	contentPtr->inTkwin = containerWin;
740	741	}
741	742
742	743	/*
743		* Manage the slave window in this master.
	744	* Manage the content window in this container.
744	745	*/
745	746
746		masterPtr = CreateMaster(masterWin);
747		slavePtr->masterPtr = masterPtr;
748		slavePtr->nextPtr = masterPtr->slavePtr;
749		masterPtr->slavePtr = slavePtr;
750		Tk_ManageGeometry(slavePtr->tkwin, &placerType, slavePtr);
	747	containerPtr = CreateContainer(containerWin);
	748	contentPtr->containerPtr = containerPtr;
	749	contentPtr->nextPtr = containerPtr->contentPtr;
	750	containerPtr->contentPtr = contentPtr;
	751	Tk_ManageGeometry(contentPtr->tkwin, &placerType, contentPtr);
751	752
752	753	/*
753		* Arrange for the master to be re-arranged at the first idle moment.
	754	* Arrange for the container to be re-arranged at the first idle moment.
754	755	*/
755	756
756	757	scheduleLayout:
757	758	Tk_FreeSavedOptions(&savedOptions);
758	759
759		if (!(masterPtr->flags & PARENT_RECONFIG_PENDING)) {
760		masterPtr->flags \|= PARENT_RECONFIG_PENDING;
761		Tcl_DoWhenIdle(RecomputePlacement, masterPtr);
	760	if (!(containerPtr->flags & PARENT_RECONFIG_PENDING)) {
	761	containerPtr->flags \|= PARENT_RECONFIG_PENDING;
	762	Tcl_DoWhenIdle(RecomputePlacement, containerPtr);
762	763	}
763	764	return TCL_OK;
764	765

794	795	Tcl_Interp interp, / Interp into which to place result. */
795	796	Tk_Window tkwin) /* Token for the window to get info on. */
796	797	{
797		Slave *slavePtr;
	798	Content *contentPtr;
798	799	Tcl_Obj *infoObj;
799	800
800		slavePtr = FindSlave(tkwin);
801		if (slavePtr == NULL) {
	801	contentPtr = FindContent(tkwin);
	802	if (contentPtr == NULL) {
802	803	return TCL_OK;
803	804	}
804	805	infoObj = Tcl_NewObj();
805		if (slavePtr->masterPtr != NULL) {
	806	if (contentPtr->containerPtr != NULL) {
806	807	Tcl_AppendToObj(infoObj, "-in", -1);
807	808	Tcl_ListObjAppendElement(NULL, infoObj,
808		TkNewWindowObj(slavePtr->masterPtr->tkwin));
	809	TkNewWindowObj(contentPtr->containerPtr->tkwin));
809	810	Tcl_AppendToObj(infoObj, " ", -1);
810	811	}
811	812	Tcl_AppendPrintfToObj(infoObj,
812	813	"-x %d -relx %.4g -y %d -rely %.4g",
813		slavePtr->x, slavePtr->relX, slavePtr->y, slavePtr->relY);
814		if (slavePtr->flags & CHILD_WIDTH) {
815		Tcl_AppendPrintfToObj(infoObj, " -width %d", slavePtr->width);
	814	contentPtr->x, contentPtr->relX, contentPtr->y, contentPtr->relY);
	815	if (contentPtr->flags & CHILD_WIDTH) {
	816	Tcl_AppendPrintfToObj(infoObj, " -width %d", contentPtr->width);
816	817	} else {
817	818	Tcl_AppendToObj(infoObj, " -width {}", -1);
818	819	}
819		if (slavePtr->flags & CHILD_REL_WIDTH) {
	820	if (contentPtr->flags & CHILD_REL_WIDTH) {
820	821	Tcl_AppendPrintfToObj(infoObj,
821		" -relwidth %.4g", slavePtr->relWidth);
	822	" -relwidth %.4g", contentPtr->relWidth);
822	823	} else {
823	824	Tcl_AppendToObj(infoObj, " -relwidth {}", -1);
824	825	}
825		if (slavePtr->flags & CHILD_HEIGHT) {
826		Tcl_AppendPrintfToObj(infoObj, " -height %d", slavePtr->height);
	826	if (contentPtr->flags & CHILD_HEIGHT) {
	827	Tcl_AppendPrintfToObj(infoObj, " -height %d", contentPtr->height);
827	828	} else {
828	829	Tcl_AppendToObj(infoObj, " -height {}", -1);
829	830	}
830		if (slavePtr->flags & CHILD_REL_HEIGHT) {
	831	if (contentPtr->flags & CHILD_REL_HEIGHT) {
831	832	Tcl_AppendPrintfToObj(infoObj,
832		" -relheight %.4g", slavePtr->relHeight);
	833	" -relheight %.4g", contentPtr->relHeight);
833	834	} else {
834	835	Tcl_AppendToObj(infoObj, " -relheight {}", -1);
835	836	}
836	837
837	838	Tcl_AppendPrintfToObj(infoObj, " -anchor %s -bordermode %s",
838		Tk_NameOfAnchor(slavePtr->anchor),
839		borderModeStrings[slavePtr->borderMode]);
	839	Tk_NameOfAnchor(contentPtr->anchor),
	840	borderModeStrings[contentPtr->borderMode]);
840	841	Tcl_SetObjResult(interp, infoObj);
841	842	return TCL_OK;
842	843	}

847	848	* RecomputePlacement --
848	849	*
849	850	* This function is called as a when-idle handler. It recomputes the
850		* geometries of all the slaves of a given master.
	851	* geometries of all the content of a given container.
851	852	*
852	853	* Results:
853	854	* None.

860	861
861	862	static void
862	863	RecomputePlacement(
863		ClientData clientData) /* Pointer to Master record. */
864		{
865		register Master *masterPtr = clientData;
866		register Slave *slavePtr;
	864	ClientData clientData) /* Pointer to Container record. */
	865	{
	866	Container containerPtr = (Container )clientData;
	867	Content *contentPtr;
867	868	int x, y, width, height, tmp;
868		int masterWidth, masterHeight, masterX, masterY;
	869	int containerWidth, containerHeight, containerX, containerY;
869	870	double x1, y1, x2, y2;
870	871	int abort; /* May get set to non-zero to abort this
871	872	* placement operation. */
872	873
873		masterPtr->flags &= ~PARENT_RECONFIG_PENDING;
	874	containerPtr->flags &= ~PARENT_RECONFIG_PENDING;
874	875
875	876	/*
876	877	* Abort any nested call to RecomputePlacement for this window, since

878	879	* aborted if necessary.
879	880	*/
880	881
881		if (masterPtr->abortPtr != NULL) {
882		*masterPtr->abortPtr = 1;
883		}
884		masterPtr->abortPtr = &abort;
	882	if (containerPtr->abortPtr != NULL) {
	883	*containerPtr->abortPtr = 1;
	884	}
	885	containerPtr->abortPtr = &abort;
885	886	abort = 0;
886		Tcl_Preserve(masterPtr);
	887	Tcl_Preserve(containerPtr);
887	888
888	889	/*
889		* Iterate over all the slaves for the master. Each slave's geometry can
890		* be computed independently of the other slaves. Changes to the window's
	890	* Iterate over all the content for the container. Each content's geometry can
	891	* be computed independently of the other content. Changes to the window's
891	892	* structure could cause almost anything to happen, including deleting the
892	893	* parent or child. If this happens, we'll be told to abort.
893	894	*/
894	895
895		for (slavePtr = masterPtr->slavePtr; slavePtr != NULL && !abort;
896		slavePtr = slavePtr->nextPtr) {
	896	for (contentPtr = containerPtr->contentPtr; contentPtr != NULL && !abort;
	897	contentPtr = contentPtr->nextPtr) {
897	898	/*
898		* Step 1: compute size and borderwidth of master, taking into account
	899	* Step 1: compute size and borderwidth of container, taking into account
899	900	* desired border mode.
900	901	*/
901	902
902		masterX = masterY = 0;
903		masterWidth = Tk_Width(masterPtr->tkwin);
904		masterHeight = Tk_Height(masterPtr->tkwin);
905		if (slavePtr->borderMode == BM_INSIDE) {
906		masterX = Tk_InternalBorderLeft(masterPtr->tkwin);
907		masterY = Tk_InternalBorderTop(masterPtr->tkwin);
908		masterWidth -= masterX + Tk_InternalBorderRight(masterPtr->tkwin);
909		masterHeight -= masterY +
910		Tk_InternalBorderBottom(masterPtr->tkwin);
911		} else if (slavePtr->borderMode == BM_OUTSIDE) {
912		masterX = masterY = -Tk_Changes(masterPtr->tkwin)->border_width;
913		masterWidth -= 2 * masterX;
914		masterHeight -= 2 * masterY;
	903	containerX = containerY = 0;
	904	containerWidth = Tk_Width(containerPtr->tkwin);
	905	containerHeight = Tk_Height(containerPtr->tkwin);
	906	if (contentPtr->borderMode == BM_INSIDE) {
	907	containerX = Tk_InternalBorderLeft(containerPtr->tkwin);
	908	containerY = Tk_InternalBorderTop(containerPtr->tkwin);
	909	containerWidth -= containerX + Tk_InternalBorderRight(containerPtr->tkwin);
	910	containerHeight -= containerY +
	911	Tk_InternalBorderBottom(containerPtr->tkwin);
	912	} else if (contentPtr->borderMode == BM_OUTSIDE) {
	913	containerX = containerY = -Tk_Changes(containerPtr->tkwin)->border_width;
	914	containerWidth -= 2 * containerX;
	915	containerHeight -= 2 * containerY;
915	916	}
916	917
917	918	/*
918		* Step 2: compute size of slave (outside dimensions including border)
919		* and location of anchor point within master.
	919	* Step 2: compute size of content (outside dimensions including border)
	920	* and location of anchor point within container.
920	921	*/
921	922
922		x1 = slavePtr->x + masterX + (slavePtr->relX*masterWidth);
	923	x1 = contentPtr->x + containerX + (contentPtr->relX*containerWidth);
923	924	x = (int) (x1 + ((x1 > 0) ? 0.5 : -0.5));
924		y1 = slavePtr->y + masterY + (slavePtr->relY*masterHeight);
	925	y1 = contentPtr->y + containerY + (contentPtr->relY*containerHeight);
925	926	y = (int) (y1 + ((y1 > 0) ? 0.5 : -0.5));
926		if (slavePtr->flags & (CHILD_WIDTH\|CHILD_REL_WIDTH)) {
	927	if (contentPtr->flags & (CHILD_WIDTH\|CHILD_REL_WIDTH)) {
927	928	width = 0;
928		if (slavePtr->flags & CHILD_WIDTH) {
929		width += slavePtr->width;
930		}
931		if (slavePtr->flags & CHILD_REL_WIDTH) {
	929	if (contentPtr->flags & CHILD_WIDTH) {
	930	width += contentPtr->width;
	931	}
	932	if (contentPtr->flags & CHILD_REL_WIDTH) {
932	933	/*
933	934	* The code below is a bit tricky. In order to round correctly
934	935	* when both relX and relWidth are specified, compute the

937	938	* errors in relX and relWidth accumulate.
938	939	*/
939	940
940		x2 = x1 + (slavePtr->relWidth*masterWidth);
	941	x2 = x1 + (contentPtr->relWidth*containerWidth);
941	942	tmp = (int) (x2 + ((x2 > 0) ? 0.5 : -0.5));
942	943	width += tmp - x;
943	944	}
944	945	} else {
945		width = Tk_ReqWidth(slavePtr->tkwin)
946		+ 2*Tk_Changes(slavePtr->tkwin)->border_width;
947		}
948		if (slavePtr->flags & (CHILD_HEIGHT\|CHILD_REL_HEIGHT)) {
	946	width = Tk_ReqWidth(contentPtr->tkwin)
	947	+ 2*Tk_Changes(contentPtr->tkwin)->border_width;
	948	}
	949	if (contentPtr->flags & (CHILD_HEIGHT\|CHILD_REL_HEIGHT)) {
949	950	height = 0;
950		if (slavePtr->flags & CHILD_HEIGHT) {
951		height += slavePtr->height;
952		}
953		if (slavePtr->flags & CHILD_REL_HEIGHT) {
	951	if (contentPtr->flags & CHILD_HEIGHT) {
	952	height += contentPtr->height;
	953	}
	954	if (contentPtr->flags & CHILD_REL_HEIGHT) {
954	955	/*
955	956	* See note above for rounding errors in width computation.
956	957	*/
957	958
958		y2 = y1 + (slavePtr->relHeight*masterHeight);
	959	y2 = y1 + (contentPtr->relHeight*containerHeight);
959	960	tmp = (int) (y2 + ((y2 > 0) ? 0.5 : -0.5));
960	961	height += tmp - y;
961	962	}
962	963	} else {
963		height = Tk_ReqHeight(slavePtr->tkwin)
964		+ 2*Tk_Changes(slavePtr->tkwin)->border_width;
	964	height = Tk_ReqHeight(contentPtr->tkwin)
	965	+ 2*Tk_Changes(contentPtr->tkwin)->border_width;
965	966	}
966	967
967	968	/*
968	969	* Step 3: adjust the x and y positions so that the desired anchor
969		* point on the slave appears at that position. Also adjust for the
970		* border mode and master's border.
	970	* point on the content appears at that position. Also adjust for the
	971	* border mode and container's border.
971	972	*/
972	973
973		switch (slavePtr->anchor) {
	974	switch (contentPtr->anchor) {
974	975	case TK_ANCHOR_N:
975	976	x -= width/2;
976	977	break;

1009	1010	* height aren't zero.
1010	1011	*/
1011	1012
1012		width -= 2*Tk_Changes(slavePtr->tkwin)->border_width;
1013		height -= 2*Tk_Changes(slavePtr->tkwin)->border_width;
	1013	width -= 2*Tk_Changes(contentPtr->tkwin)->border_width;
	1014	height -= 2*Tk_Changes(contentPtr->tkwin)->border_width;
1014	1015	if (width <= 0) {
1015	1016	width = 1;
1016	1017	}

1019	1020	}
1020	1021
1021	1022	/*
1022		* Step 5: reconfigure the window and map it if needed. If the slave
1023		* is a child of the master, we do this ourselves. If the slave isn't
1024		* a child of the master, let Tk_MaintainGeometry do the work (it will
	1023	* Step 5: reconfigure the window and map it if needed. If the content
	1024	* is a child of the container, we do this ourselves. If the content isn't
	1025	* a child of the container, let Tk_MaintainGeometry do the work (it will
1025	1026	* re-adjust things as relevant windows map, unmap, and move).
1026	1027	*/
1027	1028
1028		if (masterPtr->tkwin == Tk_Parent(slavePtr->tkwin)) {
1029		if ((x != Tk_X(slavePtr->tkwin))
1030		\|\| (y != Tk_Y(slavePtr->tkwin))
1031		\|\| (width != Tk_Width(slavePtr->tkwin))
1032		\|\| (height != Tk_Height(slavePtr->tkwin))) {
1033		Tk_MoveResizeWindow(slavePtr->tkwin, x, y, width, height);
	1029	if (containerPtr->tkwin == Tk_Parent(contentPtr->tkwin)) {
	1030	if ((x != Tk_X(contentPtr->tkwin))
	1031	\|\| (y != Tk_Y(contentPtr->tkwin))
	1032	\|\| (width != Tk_Width(contentPtr->tkwin))
	1033	\|\| (height != Tk_Height(contentPtr->tkwin))) {
	1034	Tk_MoveResizeWindow(contentPtr->tkwin, x, y, width, height);
1034	1035	}
1035	1036	if (abort) {
1036	1037	break;
1037	1038	}
1038	1039
1039	1040	/*
1040		* Don't map the slave unless the master is mapped: the slave will
1041		* get mapped later, when the master is mapped.
	1041	* Don't map the content unless the container is mapped: the content will
	1042	* get mapped later, when the container is mapped.
1042	1043	*/
1043	1044
1044		if (Tk_IsMapped(masterPtr->tkwin)) {
1045		Tk_MapWindow(slavePtr->tkwin);
	1045	if (Tk_IsMapped(containerPtr->tkwin)) {
	1046	Tk_MapWindow(contentPtr->tkwin);
1046	1047	}
1047	1048	} else {
1048	1049	if ((width <= 0) \|\| (height <= 0)) {
1049		Tk_UnmaintainGeometry(slavePtr->tkwin, masterPtr->tkwin);
1050		Tk_UnmapWindow(slavePtr->tkwin);
	1050	Tk_UnmaintainGeometry(contentPtr->tkwin, containerPtr->tkwin);
	1051	Tk_UnmapWindow(contentPtr->tkwin);
1051	1052	} else {
1052		Tk_MaintainGeometry(slavePtr->tkwin, masterPtr->tkwin,
	1053	Tk_MaintainGeometry(contentPtr->tkwin, containerPtr->tkwin,
1053	1054	x, y, width, height);
1054	1055	}
1055	1056	}
1056	1057	}
1057	1058
1058		masterPtr->abortPtr = NULL;
1059		Tcl_Release(masterPtr);
1060		}
1061
1062		/*
1063		*----------------------------------------------------------------------
1064		*
1065		* MasterStructureProc --
	1059	containerPtr->abortPtr = NULL;
	1060	Tcl_Release(containerPtr);
	1061	}
	1062
	1063	/*
	1064	*----------------------------------------------------------------------
	1065	*
	1066	* PlaceStructureProc --
1066	1067	*
1067	1068	* This function is invoked by the Tk event handler when StructureNotify
1068		* events occur for a master window.
	1069	* events occur for a container window.
1069	1070	*
1070	1071	* Results:
1071	1072	* None.
1072	1073	*
1073	1074	* Side effects:
1074	1075	* Structures get cleaned up if the window was deleted. If the window was
1075		* resized then slave geometries get recomputed.
	1076	* resized then content geometries get recomputed.
1076	1077	*
1077	1078	*----------------------------------------------------------------------
1078	1079	*/
1079	1080
1080	1081	static void
1081		MasterStructureProc(
1082		ClientData clientData, /* Pointer to Master structure for window
	1082	PlaceStructureProc(
	1083	ClientData clientData, /* Pointer to Container structure for window
1083	1084	* referred to by eventPtr. */
1084	1085	XEvent eventPtr) / Describes what just happened. */
1085	1086	{
1086		register Master *masterPtr = clientData;
1087		register Slave slavePtr, nextPtr;
1088		TkDisplay dispPtr = ((TkWindow ) masterPtr->tkwin)->dispPtr;
	1087	Container containerPtr = (Container )clientData;
	1088	Content contentPtr, nextPtr;
	1089	TkDisplay dispPtr = ((TkWindow ) containerPtr->tkwin)->dispPtr;
1089	1090
1090	1091	switch (eventPtr->type) {
1091	1092	case ConfigureNotify:
1092		if ((masterPtr->slavePtr != NULL)
1093		&& !(masterPtr->flags & PARENT_RECONFIG_PENDING)) {
1094		masterPtr->flags \|= PARENT_RECONFIG_PENDING;
1095		Tcl_DoWhenIdle(RecomputePlacement, masterPtr);
	1093	if ((containerPtr->contentPtr != NULL)
	1094	&& !(containerPtr->flags & PARENT_RECONFIG_PENDING)) {
	1095	containerPtr->flags \|= PARENT_RECONFIG_PENDING;
	1096	Tcl_DoWhenIdle(RecomputePlacement, containerPtr);
1096	1097	}
1097	1098	return;
1098	1099	case DestroyNotify:
1099		for (slavePtr = masterPtr->slavePtr; slavePtr != NULL;
1100		slavePtr = nextPtr) {
1101		slavePtr->masterPtr = NULL;
1102		nextPtr = slavePtr->nextPtr;
1103		slavePtr->nextPtr = NULL;
	1100	for (contentPtr = containerPtr->contentPtr; contentPtr != NULL;
	1101	contentPtr = nextPtr) {
	1102	contentPtr->containerPtr = NULL;
	1103	nextPtr = contentPtr->nextPtr;
	1104	contentPtr->nextPtr = NULL;
1104	1105	}
1105	1106	Tcl_DeleteHashEntry(Tcl_FindHashEntry(&dispPtr->masterTable,
1106		(char *) masterPtr->tkwin));
1107		if (masterPtr->flags & PARENT_RECONFIG_PENDING) {
1108		Tcl_CancelIdleCall(RecomputePlacement, masterPtr);
1109		}
1110		masterPtr->tkwin = NULL;
1111		if (masterPtr->abortPtr != NULL) {
1112		*masterPtr->abortPtr = 1;
1113		}
1114		Tcl_EventuallyFree(masterPtr, TCL_DYNAMIC);
	1107	(char *) containerPtr->tkwin));
	1108	if (containerPtr->flags & PARENT_RECONFIG_PENDING) {
	1109	Tcl_CancelIdleCall(RecomputePlacement, containerPtr);
	1110	}
	1111	containerPtr->tkwin = NULL;
	1112	if (containerPtr->abortPtr != NULL) {
	1113	*containerPtr->abortPtr = 1;
	1114	}
	1115	Tcl_EventuallyFree(containerPtr, TCL_DYNAMIC);
1115	1116	return;
1116	1117	case MapNotify:
1117	1118	/*
1118		* When a master gets mapped, must redo the geometry computation so
1119		* that all of its slaves get remapped.
	1119	* When a container gets mapped, must redo the geometry computation so
	1120	* that all of its content get remapped.
1120	1121	*/
1121	1122
1122		if ((masterPtr->slavePtr != NULL)
1123		&& !(masterPtr->flags & PARENT_RECONFIG_PENDING)) {
1124		masterPtr->flags \|= PARENT_RECONFIG_PENDING;
1125		Tcl_DoWhenIdle(RecomputePlacement, masterPtr);
	1123	if ((containerPtr->contentPtr != NULL)
	1124	&& !(containerPtr->flags & PARENT_RECONFIG_PENDING)) {
	1125	containerPtr->flags \|= PARENT_RECONFIG_PENDING;
	1126	Tcl_DoWhenIdle(RecomputePlacement, containerPtr);
1126	1127	}
1127	1128	return;
1128	1129	case UnmapNotify:
1129	1130	/*
1130		* Unmap all of the slaves when the master gets unmapped, so that they
	1131	* Unmap all of the content when the container gets unmapped, so that they
1131	1132	* don't keep redisplaying themselves.
1132	1133	*/
1133	1134
1134		for (slavePtr = masterPtr->slavePtr; slavePtr != NULL;
1135		slavePtr = slavePtr->nextPtr) {
1136		Tk_UnmapWindow(slavePtr->tkwin);
	1135	for (contentPtr = containerPtr->contentPtr; contentPtr != NULL;
	1136	contentPtr = contentPtr->nextPtr) {
	1137	Tk_UnmapWindow(contentPtr->tkwin);
1137	1138	}
1138	1139	return;
1139	1140	}

1142	1143	/*
1143	1144	*----------------------------------------------------------------------
1144	1145	*
1145		* SlaveStructureProc --
	1146	* ContentStructureProc --
1146	1147	*
1147	1148	* This function is invoked by the Tk event handler when StructureNotify
1148		* events occur for a slave window.
	1149	* events occur for a content window.
1149	1150	*
1150	1151	* Results:
1151	1152	* None.

1157	1158	*/
1158	1159
1159	1160	static void
1160		SlaveStructureProc(
1161		ClientData clientData, /* Pointer to Slave structure for window
	1161	ContentStructureProc(
	1162	ClientData clientData, /* Pointer to Content structure for window
1162	1163	* referred to by eventPtr. */
1163	1164	XEvent eventPtr) / Describes what just happened. */
1164	1165	{
1165		register Slave *slavePtr = clientData;
1166		TkDisplay dispPtr = ((TkWindow ) slavePtr->tkwin)->dispPtr;
	1166	Content contentPtr = (Content )clientData;
	1167	TkDisplay dispPtr = ((TkWindow ) contentPtr->tkwin)->dispPtr;
1167	1168
1168	1169	if (eventPtr->type == DestroyNotify) {
1169		if (slavePtr->masterPtr != NULL) {
1170		UnlinkSlave(slavePtr);
	1170	if (contentPtr->containerPtr != NULL) {
	1171	UnlinkContent(contentPtr);
1171	1172	}
1172	1173	Tcl_DeleteHashEntry(Tcl_FindHashEntry(&dispPtr->slaveTable,
1173		(char *) slavePtr->tkwin));
1174		FreeSlave(slavePtr);
	1174	(char *) contentPtr->tkwin));
	1175	FreeContent(contentPtr);
1175	1176	}
1176	1177	}
1177	1178

1180	1181	*
1181	1182	* PlaceRequestProc --
1182	1183	*
1183		* This function is invoked by Tk whenever a slave managed by us changes
	1184	* This function is invoked by Tk whenever a content managed by us changes
1184	1185	* its requested geometry.
1185	1186	*
1186	1187	* Results:

1193	1194	*----------------------------------------------------------------------
1194	1195	*/
1195	1196
1196		/* ARGSUSED */
1197	1197	static void
1198	1198	PlaceRequestProc(
1199		ClientData clientData, /* Pointer to our record for slave. */
1200		Tk_Window tkwin) /* Window that changed its desired size. */
1201		{
1202		Slave *slavePtr = clientData;
1203		Master *masterPtr;
1204
1205		if ((slavePtr->flags & (CHILD_WIDTH\|CHILD_REL_WIDTH))
1206		&& (slavePtr->flags & (CHILD_HEIGHT\|CHILD_REL_HEIGHT))) {
	1199	ClientData clientData, /* Pointer to our record for content. */
	1200	TCL_UNUSED(Tk_Window)) /* Window that changed its desired size. */
	1201	{
	1202	Content contentPtr = (Content )clientData;
	1203	Container *containerPtr;
	1204
	1205	if ((contentPtr->flags & (CHILD_WIDTH\|CHILD_REL_WIDTH))
	1206	&& (contentPtr->flags & (CHILD_HEIGHT\|CHILD_REL_HEIGHT))) {
1207	1207	/*
1208	1208	* Send a ConfigureNotify to indicate that the size change
1209	1209	* request was rejected.
1210	1210	*/
1211	1211
1212		TkDoConfigureNotify((TkWindow *)(slavePtr->tkwin));
	1212	TkDoConfigureNotify((TkWindow *)(contentPtr->tkwin));
1213	1213	return;
1214	1214	}
1215		masterPtr = slavePtr->masterPtr;
1216		if (masterPtr == NULL) {
	1215	containerPtr = contentPtr->containerPtr;
	1216	if (containerPtr == NULL) {
1217	1217	return;
1218	1218	}
1219		if (!(masterPtr->flags & PARENT_RECONFIG_PENDING)) {
1220		masterPtr->flags \|= PARENT_RECONFIG_PENDING;
1221		Tcl_DoWhenIdle(RecomputePlacement, masterPtr);
	1219	if (!(containerPtr->flags & PARENT_RECONFIG_PENDING)) {
	1220	containerPtr->flags \|= PARENT_RECONFIG_PENDING;
	1221	Tcl_DoWhenIdle(RecomputePlacement, containerPtr);
1222	1222	}
1223	1223	}
1224	1224
1225	1225	/*
1226	1226	*--------------------------------------------------------------
1227	1227	*
1228		* PlaceLostSlaveProc --
	1228	* PlaceLostContentProc --
1229	1229	*
1230	1230	* This function is invoked by Tk whenever some other geometry claims
1231		* control over a slave that used to be managed by us.
	1231	* control over a content window that used to be managed by us.
1232	1232	*
1233	1233	* Results:
1234	1234	* None.
1235	1235	*
1236	1236	* Side effects:
1237		* Forgets all placer-related information about the slave.
	1237	* Forgets all placer-related information about the content window.
1238	1238	*
1239	1239	*--------------------------------------------------------------
1240	1240	*/
1241	1241
1242		/* ARGSUSED */
1243	1242	static void
1244		PlaceLostSlaveProc(
1245		ClientData clientData, /* Slave structure for slave window that was
	1243	PlaceLostContentProc(
	1244	ClientData clientData, /* Content structure for content window that was
1246	1245	* stolen away. */
1247		Tk_Window tkwin) /* Tk's handle for the slave window. */
1248		{
1249		register Slave *slavePtr = clientData;
1250		TkDisplay dispPtr = ((TkWindow ) slavePtr->tkwin)->dispPtr;
1251
1252		if (slavePtr->masterPtr->tkwin != Tk_Parent(slavePtr->tkwin)) {
1253		Tk_UnmaintainGeometry(slavePtr->tkwin, slavePtr->masterPtr->tkwin);
	1246	Tk_Window tkwin) /* Tk's handle for the content window. */
	1247	{
	1248	Content contentPtr = (Content )clientData;
	1249	TkDisplay dispPtr = ((TkWindow ) contentPtr->tkwin)->dispPtr;
	1250
	1251	if (contentPtr->containerPtr->tkwin != Tk_Parent(contentPtr->tkwin)) {
	1252	Tk_UnmaintainGeometry(contentPtr->tkwin, contentPtr->containerPtr->tkwin);
1254	1253	}
1255	1254	Tk_UnmapWindow(tkwin);
1256		UnlinkSlave(slavePtr);
	1255	UnlinkContent(contentPtr);
1257	1256	Tcl_DeleteHashEntry(Tcl_FindHashEntry(&dispPtr->slaveTable,
1258	1257	(char *) tkwin));
1259		Tk_DeleteEventHandler(tkwin, StructureNotifyMask, SlaveStructureProc,
1260		slavePtr);
1261		FreeSlave(slavePtr);
	1258	Tk_DeleteEventHandler(tkwin, StructureNotifyMask, ContentStructureProc,
	1259	contentPtr);
	1260	FreeContent(contentPtr);
1262	1261	}
1263	1262
1264	1263	/*

+30

-0

generic/tkPlatDecls.h less more

81	81	EXTERN void Tk_MacOSXSetupTkNotifier(void);
82	82	/* 10 */
83	83	EXTERN int Tk_MacOSXIsAppInFront(void);
	84	/* 11 */
	85	EXTERN Tk_Window Tk_MacOSXGetTkWindow(void *w);
	86	/* 12 */
	87	EXTERN void * Tk_MacOSXGetCGContextForDrawable(Drawable drawable);
	88	/* 13 */
	89	EXTERN void * Tk_MacOSXGetNSWindowForDrawable(Drawable drawable);
	90	/* Slot 14 is reserved */
	91	/* Slot 15 is reserved */
	92	/* 16 */
	93	EXTERN void TkGenWMConfigureEvent_(Tk_Window tkwin, int x, int y,
	94	int width, int height, int flags);
84	95	#endif /* AQUA */
85	96
86	97	typedef struct TkPlatStubs {

107	118	void * (tkMacOSXGetRootControl) (Drawable drawable); / 8 */
108	119	void (tk_MacOSXSetupTkNotifier) (void); / 9 */
109	120	int (tk_MacOSXIsAppInFront) (void); / 10 */
	121	Tk_Window (tk_MacOSXGetTkWindow) (void w); /* 11 */
	122	void * (tk_MacOSXGetCGContextForDrawable) (Drawable drawable); / 12 */
	123	void * (tk_MacOSXGetNSWindowForDrawable) (Drawable drawable); / 13 */
	124	void (*reserved14)(void);
	125	void (*reserved15)(void);
	126	void (tkGenWMConfigureEvent_) (Tk_Window tkwin, int x, int y, int width, int height, int flags); / 16 */
110	127	#endif /* AQUA */
111	128	} TkPlatStubs;
112	129

159	176	(tkPlatStubsPtr->tk_MacOSXSetupTkNotifier) /* 9 */
160	177	#define Tk_MacOSXIsAppInFront \
161	178	(tkPlatStubsPtr->tk_MacOSXIsAppInFront) /* 10 */
	179	#define Tk_MacOSXGetTkWindow \
	180	(tkPlatStubsPtr->tk_MacOSXGetTkWindow) /* 11 */
	181	#define Tk_MacOSXGetCGContextForDrawable \
	182	(tkPlatStubsPtr->tk_MacOSXGetCGContextForDrawable) /* 12 */
	183	#define Tk_MacOSXGetNSWindowForDrawable \
	184	(tkPlatStubsPtr->tk_MacOSXGetNSWindowForDrawable) /* 13 */
	185	/* Slot 14 is reserved */
	186	/* Slot 15 is reserved */
	187	#define TkGenWMConfigureEvent_ \
	188	(tkPlatStubsPtr->tkGenWMConfigureEvent_) /* 16 */
162	189	#endif /* AQUA */
163	190
164	191	#endif /* defined(USE_TK_STUBS) */

172	199	#undef TCL_STORAGE_CLASS
173	200	#define TCL_STORAGE_CLASS DLLIMPORT
174	201
	202	#undef TkGenWMConfigureEvent_
	203	#define Tk_MacOSXGetNSViewForDrawable TkMacOSXGetRootControl
	204
175	205	#endif /* _TKPLATDECLS */

+4

-44

generic/tkPointer.c less more

25	25	typedef struct {
26	26	TkWindow grabWinPtr; / Window that defines the top of the grab
27	27	* tree in a global grab. */
28		int lastState; /* Last known state flags. */
	28	unsigned lastState; /* Last known state flags. */
29	29	XPoint lastPos; /* Last reported mouse position. */
30	30	TkWindow lastWinPtr; / Last reported mouse window. */
31	31	TkWindow restrictWinPtr; / Window to which all mouse events will be

224	224	TkWindow *targetWinPtr;
225	225	XPoint pos;
226	226	XEvent event;
227		int changes = (state ^ tsdPtr->lastState) & ALL_BUTTONS;
228		int type, b, mask;
	227	unsigned changes = (state ^ tsdPtr->lastState) & ALL_BUTTONS;
	228	int type, b;
	229	unsigned mask;
229	230
230	231	pos.x = x;
231	232	pos.y = y;

593	594	}
594	595
595	596	/*
596		*----------------------------------------------------------------------
597		*
598		* TkGenerateActivateEvents --
599		*
600		* This function is called by the Mac and Windows window manager routines
601		* when a toplevel window is activated or deactivated.
602		* Activate/Deactivate events will be sent to every subwindow of the
603		* toplevel followed by a FocusIn/FocusOut message.
604		*
605		* Results:
606		* None.
607		*
608		* Side effects:
609		* Generates X events.
610		*
611		*----------------------------------------------------------------------
612		*/
613
614		void
615		TkGenerateActivateEvents(
616		TkWindow winPtr, / Toplevel to activate. */
617		int active) /* Non-zero if the window is being activated,
618		* else 0.*/
619		{
620		XEvent event;
621
622		/*
623		* Generate Activate and Deactivate events. This event is sent to every
624		* subwindow in a toplevel window.
625		*/
626
627		event.xany.serial = winPtr->display->request++;
628		event.xany.send_event = False;
629		event.xany.display = winPtr->display;
630		event.xany.window = winPtr->window;
631
632		event.xany.type = active ? ActivateNotify : DeactivateNotify;
633		TkQueueEventForAllChildren(winPtr, &event);
634		}
635
636		/*
637	597	* Local Variables:
638	598	* mode: c
639	599	* c-basic-offset: 4

+5

-7

generic/tkScale.c less more

657	657	}
658	658	}
659	659
660		/*
661		* Several options need special processing, such as parsing the
662		* orientation and creating GCs.
663		*/
664
665		scalePtr->fromValue = TkRoundValueToResolution(scalePtr,
666		scalePtr->fromValue);
	660	/*
	661	* The fromValue shall not be rounded to the resolution, but the
	662	* toValue and tickInterval do.
	663	*/
	664
667	665	scalePtr->toValue = TkRoundValueToResolution(scalePtr, scalePtr->toValue);
668	666	scalePtr->tickInterval = TkRoundIntervalToResolution(scalePtr,
669	667	scalePtr->tickInterval);

+8

-8

generic/tkScrollbar.c less more

126	126	int objc, /* Number of arguments. */
127	127	Tcl_Obj const objv[]) / Argument strings. */
128	128	{
129		Tk_Window tkwin = clientData;
130		register TkScrollbar *scrollPtr;
	129	Tk_Window tkwin = (Tk_Window)clientData;
	130	TkScrollbar *scrollPtr;
131	131	Tk_Window newWin;
132	132
133	133	if (objc < 2) {

222	222	int objc, /* Number of arguments. */
223	223	Tcl_Obj const objv[]) / Argument strings. */
224	224	{
225		register TkScrollbar *scrollPtr = clientData;
	225	TkScrollbar scrollPtr = (TkScrollbar )clientData;
226	226	int result = TCL_OK;
227	227	int length, cmdIndex;
228	228	static const char *const commandNames[] = {

307	307	break;
308	308	}
309	309	case COMMAND_DELTA: {
310		int xDelta, yDelta, pixels, length;
	310	int xDelta, yDelta, pixels;
311	311	double fraction;
312	312
313	313	if (objc != 4) {

336	336	break;
337	337	}
338	338	case COMMAND_FRACTION: {
339		int x, y, pos, length;
	339	int x, y, pos;
340	340	double fraction;
341	341
342	342	if (objc != 4) {

520	520	static int
521	521	ConfigureScrollbar(
522	522	Tcl_Interp interp, / Used for error reporting. */
523		register TkScrollbar *scrollPtr,
	523	TkScrollbar *scrollPtr,
524	524	/* Information about widget; may or may not
525	525	* already have values for some fields. */
526	526	int objc, /* Number of valid entries in argv. */

583	583	ClientData clientData, /* Information about window. */
584	584	XEvent eventPtr) / Information about event. */
585	585	{
586		TkScrollbar *scrollPtr = clientData;
	586	TkScrollbar scrollPtr = (TkScrollbar )clientData;
587	587
588	588	if ((eventPtr->type == Expose) && (eventPtr->xexpose.count == 0)) {
589	589	TkScrollbarEventuallyRedraw(scrollPtr);

648	648	ScrollbarCmdDeletedProc(
649	649	ClientData clientData) /* Pointer to widget record for widget. */
650	650	{
651		TkScrollbar *scrollPtr = clientData;
	651	TkScrollbar scrollPtr = (TkScrollbar )clientData;
652	652	Tk_Window tkwin = scrollPtr->tkwin;
653	653
654	654	/*

+35

-35

generic/tkSelect.c less more

27	27	* chunk. */
28	28	char buffer[4]; /* A buffer to hold part of a UTF character
29	29	* that is split across chunks. */
30		char command[1]; /* Command to invoke. Actual space is
	30	char command[TKFLEXARRAY]; /* Command to invoke. Actual space is
31	31	* allocated as large as necessary. This must
32	32	* be the last entry in the structure. */
33	33	} CommandInfo;

124	124	* listed in the ICCCM will be tolerated
125	125	* (blech). */
126	126	{
127		register TkSelHandler *selPtr;
	127	TkSelHandler *selPtr;
128	128	TkWindow winPtr = (TkWindow ) tkwin;
129	129
130	130	if (winPtr->dispPtr->multipleAtom == None) {

138	138
139	139	for (selPtr = winPtr->selHandlerList; ; selPtr = selPtr->nextPtr) {
140	140	if (selPtr == NULL) {
141		selPtr = ckalloc(sizeof(TkSelHandler));
	141	selPtr = (TkSelHandler *)ckalloc(sizeof(TkSelHandler));
142	142	selPtr->nextPtr = winPtr->selHandlerList;
143	143	winPtr->selHandlerList = selPtr;
144	144	break;

176	176	target = winPtr->dispPtr->utf8Atom;
177	177	for (selPtr = winPtr->selHandlerList; ; selPtr = selPtr->nextPtr) {
178	178	if (selPtr == NULL) {
179		selPtr = ckalloc(sizeof(TkSelHandler));
	179	selPtr = (TkSelHandler *)ckalloc(sizeof(TkSelHandler));
180	180	selPtr->nextPtr = winPtr->selHandlerList;
181	181	winPtr->selHandlerList = selPtr;
182	182	selPtr->selection = selection;

238	238	* removed. */
239	239	{
240	240	TkWindow winPtr = (TkWindow ) tkwin;
241		register TkSelHandler selPtr, prevPtr;
242		register TkSelInProgress *ipPtr;
243		ThreadSpecificData *tsdPtr =
	241	TkSelHandler selPtr, prevPtr;
	242	TkSelInProgress *ipPtr;
	243	ThreadSpecificData tsdPtr = (ThreadSpecificData )
244	244	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
245	245
246	246	/*

352	352	ClientData clientData) /* Arbitrary one-word argument to pass to
353	353	* proc. */
354	354	{
355		register TkWindow winPtr = (TkWindow ) tkwin;
	355	TkWindow winPtr = (TkWindow ) tkwin;
356	356	TkDisplay *dispPtr = winPtr->dispPtr;
357	357	TkSelectionInfo *infoPtr;
358	358	Tk_LostSelProc *clearProc = NULL;

381	381	}
382	382	}
383	383	if (infoPtr == NULL) {
384		infoPtr = ckalloc(sizeof(TkSelectionInfo));
	384	infoPtr = (TkSelectionInfo *)ckalloc(sizeof(TkSelectionInfo));
385	385	infoPtr->selection = selection;
386	386	infoPtr->nextPtr = dispPtr->selectionInfoPtr;
387	387	dispPtr->selectionInfoPtr = infoPtr;

459	459	Tk_Window tkwin, /* Window that selects a display. */
460	460	Atom selection) /* Selection to be cancelled. */
461	461	{
462		register TkWindow winPtr = (TkWindow ) tkwin;
	462	TkWindow winPtr = (TkWindow ) tkwin;
463	463	TkDisplay *dispPtr = winPtr->dispPtr;
464	464	TkSelectionInfo *infoPtr;
465	465	TkSelectionInfo *prevPtr;

555	555	TkWindow winPtr = (TkWindow ) tkwin;
556	556	TkDisplay *dispPtr = winPtr->dispPtr;
557	557	TkSelectionInfo *infoPtr;
558		ThreadSpecificData *tsdPtr =
	558	ThreadSpecificData tsdPtr = (ThreadSpecificData )
559	559	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
560	560
561	561	if (dispPtr->multipleAtom == None) {

576	576	}
577	577	}
578	578	if (infoPtr != NULL) {
579		register TkSelHandler *selPtr;
	579	TkSelHandler *selPtr;
580	580	int offset, result, count;
581	581	char buffer[TK_SEL_BYTES_AT_ONCE+1];
582	582	TkSelInProgress ip;

669	669	int objc, /* Number of arguments. */
670	670	Tcl_Obj const objv[]) / Argument objects. */
671	671	{
672		Tk_Window tkwin = clientData;
	672	Tk_Window tkwin = (Tk_Window)clientData;
673	673	const char *path = NULL;
674	674	Atom selection;
675	675	const char *selName = NULL;

829	829	Atom target, format;
830	830	const char *targetName = NULL;
831	831	const char *formatName = NULL;
832		register CommandInfo *cmdInfoPtr;
	832	CommandInfo *cmdInfoPtr;
833	833	int cmdLength;
834	834	static const char *const handleOptionStrings[] = {
835	835	"-format", "-selection", "-type", NULL

903	903	if (cmdLength == 0) {
904	904	Tk_DeleteSelHandler(tkwin, selection, target);
905	905	} else {
906		cmdInfoPtr = ckalloc(Tk_Offset(CommandInfo, command)
	906	cmdInfoPtr = (CommandInfo *)ckalloc(Tk_Offset(CommandInfo, command)
907	907	+ 1 + cmdLength);
908	908	cmdInfoPtr->interp = interp;
909	909	cmdInfoPtr->charOffset = 0;

918	918	}
919	919
920	920	case SELECTION_OWN: {
921		register LostCommand *lostPtr;
	921	LostCommand *lostPtr;
922	922	Tcl_Obj *commandObj = NULL;
923	923	static const char *const ownOptionStrings[] = {
924	924	"-command", "-displayof", "-selection", NULL

1007	1007	Tk_OwnSelection(tkwin, selection, NULL, NULL);
1008	1008	return TCL_OK;
1009	1009	}
1010		lostPtr = ckalloc(sizeof(LostCommand));
	1010	lostPtr = (LostCommand *)ckalloc(sizeof(LostCommand));
1011	1011	lostPtr->interp = interp;
1012	1012	lostPtr->cmdObj = commandObj;
1013	1013	Tcl_IncrRefCount(commandObj);

1039	1039	TkSelInProgress *
1040	1040	TkSelGetInProgress(void)
1041	1041	{
1042		ThreadSpecificData *tsdPtr =
	1042	ThreadSpecificData tsdPtr = (ThreadSpecificData )
1043	1043	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
1044	1044
1045	1045	return tsdPtr->pendingPtr;

1066	1066	TkSelSetInProgress(
1067	1067	TkSelInProgress *pendingPtr)
1068	1068	{
1069		ThreadSpecificData *tsdPtr =
	1069	ThreadSpecificData tsdPtr = (ThreadSpecificData )
1070	1070	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
1071	1071
1072	1072	tsdPtr->pendingPtr = pendingPtr;

1091	1091
1092	1092	void
1093	1093	TkSelDeadWindow(
1094		register TkWindow winPtr) / Window that's being deleted. */
	1094	TkWindow winPtr) / Window that's being deleted. */
1095	1095	{
1096		register TkSelHandler *selPtr;
1097		register TkSelInProgress *ipPtr;
	1096	TkSelHandler *selPtr;
	1097	TkSelInProgress *ipPtr;
1098	1098	TkSelectionInfo infoPtr, prevPtr, *nextPtr;
1099		ThreadSpecificData *tsdPtr =
	1099	ThreadSpecificData tsdPtr = (ThreadSpecificData )
1100	1100	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
1101	1101
1102	1102	/*

1169	1169	Tk_Window tkwin) /* Window token (used to find display to
1170	1170	* initialize). */
1171	1171	{
1172		register TkDisplay dispPtr = ((TkWindow ) tkwin)->dispPtr;
	1172	TkDisplay dispPtr = ((TkWindow ) tkwin)->dispPtr;
1173	1173
1174	1174	/*
1175	1175	* Fetch commonly-used atoms.

1220	1220	void
1221	1221	TkSelClearSelection(
1222	1222	Tk_Window tkwin, /* Window for which event was targeted. */
1223		register XEvent eventPtr) / X SelectionClear event. */
	1223	XEvent eventPtr) / X SelectionClear event. */
1224	1224	{
1225		register TkWindow winPtr = (TkWindow ) tkwin;
	1225	TkWindow winPtr = (TkWindow ) tkwin;
1226	1226	TkDisplay *dispPtr = winPtr->dispPtr;
1227	1227	TkSelectionInfo *infoPtr;
1228	1228	TkSelectionInfo *prevPtr;

1284	1284	*--------------------------------------------------------------
1285	1285	*/
1286	1286
1287		/* ARGSUSED */
1288	1287	static int
1289	1288	SelGetProc(
1290	1289	ClientData clientData, /* Dynamic string holding partially assembled
1291	1290	* selection. */
1292		Tcl_Interp interp, / Interpreter used for error reporting (not
	1291	TCL_UNUSED(Tcl_Interp ), / Interpreter used for error reporting (not
1293	1292	* used). */
1294	1293	const char portion) / New information to be appended. */
1295	1294	{
1296		Tcl_DStringAppend(clientData, portion, -1);
	1295	Tcl_DStringAppend((Tcl_DString *)clientData, portion, -1);
1297	1296	return TCL_OK;
1298	1297	}
1299	1298

1399	1398	cmdInfoPtr->charOffset += Tcl_NumUtfChars(string, -1);
1400	1399	cmdInfoPtr->buffer[0] = '\0';
1401	1400	} else {
	1401	int ch;
1402	1402	p = string;
1403	1403	string += count;
1404	1404	numChars = 0;
1405	1405	while (p < string) {
1406		p = Tcl_UtfNext(p);
	1406	p += TkUtfToUniChar(p, &ch);
1407	1407	numChars++;
1408	1408	}
1409	1409	cmdInfoPtr->charOffset += numChars;
1410	1410	length = p - string;
1411	1411	if (length > 0) {
1412		strncpy(cmdInfoPtr->buffer, string, (size_t) length);
	1412	strncpy(cmdInfoPtr->buffer, string, length);
1413	1413	}
1414	1414	cmdInfoPtr->buffer[length] = '\0';
1415	1415	}

1468	1468	Atom typePtr) / Store here the type of the selection, for
1469	1469	* use in converting to proper X format. */
1470	1470	{
1471		register TkWindow winPtr = (TkWindow ) infoPtr->owner;
	1471	TkWindow winPtr = (TkWindow ) infoPtr->owner;
1472	1472	TkDisplay *dispPtr = winPtr->dispPtr;
1473	1473
1474	1474	if (target == dispPtr->timestampAtom) {

1481	1481	}
1482	1482
1483	1483	if (target == dispPtr->targetsAtom) {
1484		register TkSelHandler *selPtr;
	1484	TkSelHandler *selPtr;
1485	1485	int length;
1486	1486	Tcl_DString ds;
1487	1487

1507	1507	Tcl_DStringFree(&ds);
1508	1508	return -1;
1509	1509	}
1510		memcpy(buffer, Tcl_DStringValue(&ds), (unsigned) (1+length));
	1510	memcpy(buffer, Tcl_DStringValue(&ds), length + 1);
1511	1511	Tcl_DStringFree(&ds);
1512	1512	*typePtr = XA_ATOM;
1513	1513	return length;

1564	1564	LostSelection(
1565	1565	ClientData clientData) /* Pointer to LostCommand structure. */
1566	1566	{
1567		LostCommand *lostPtr = clientData;
	1567	LostCommand lostPtr = (LostCommand )clientData;
1568	1568	Tcl_Interp *interp = lostPtr->interp;
1569	1569	Tcl_InterpState savedState;
1570	1570	int code;

+154

-8

generic/tkStubInit.c less more

23	23	#if defined(MAC_OSX_TK)
24	24	/* we could have used _TKMACINT */
25	25	#include "tkMacOSXInt.h"
	26	#include "tkMacOSXPrivate.h"
26	27	#endif
27	28
28	29	/* TODO: These ought to come in some other way */

44	45	#undef XGrabServer
45	46	#undef XFree
46	47	#undef XFlush
	48	#define TkUnusedStubEntry 0
	49
	50	#define TkpCmapStressed_ TkpCmapStressed
	51	#define TkpSync_ TkpSync
	52	#define TkUnixContainerId_ TkUnixContainerId
	53	#define TkUnixDoOneXEvent_ TkUnixDoOneXEvent
	54	#define TkUnixSetMenubar_ TkUnixSetMenubar
	55	#define TkWmCleanup_ TkWmCleanup
	56	#define TkSendCleanup_ TkSendCleanup
	57	#define TkpTestsendCmd_ TkpTestsendCmd
	58	#define TkGenWMConfigureEvent_ TkGenWMConfigureEvent
	59	#define TkGenerateActivateEvents_ TkGenerateActivateEvents
	60
	61	#if !defined(MAC_OSX_TK) && defined(MAC_OSX_TCL)
	62	# undef TkpWillDrawWidget
	63	# undef TkpRedrawWidget
	64	static int
	65	doNothing(void)
	66	{
	67	/* dummy implementation, no need to do anything */
	68	return 0;
	69	}
	70	# define TkpWillDrawWidget ((int ()(Tk_Window))(void )doNothing)
	71	# define TkpRedrawWidget ((void ()(Tk_Window))(void )doNothing)
	72	#endif
	73
	74	#if defined(MAC_OSX_TK)
	75	# define Tk_MacOSXGetNSWindowForDrawable TkMacOSXDrawable
	76	# define Tk_MacOSXGetCGContextForDrawable GetCGContextForDrawable
	77	static void *GetCGContextForDrawable(Drawable d) {
	78	return TkMacOSXGetCGContextForDrawable(d);
	79	}
	80	#endif
47	81
48	82	#ifdef _WIN32
49	83

182	216	# define Tk_PointerEvent 0
183	217	# define Tk_TranslateWinEvent 0
184	218	# define TkAlignImageData 0
185		# define TkGenerateActivateEvents 0
186	219	# define TkpGetMS 0
187	220	# define TkpGetCapture 0
188	221	# define TkPointerDeadWindow 0

243	276	* below should be made in the generic/tk.decls script.
244	277	*/
245	278
	279	#ifdef __GNUC__
	280	/*
	281	* The rest of this file shouldn't warn about deprecated functions; they're
	282	* there because we intend them to be so and know that this file is OK to
	283	* touch those fields.
	284	*/
	285	#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
	286	#endif
246	287	/* !BEGIN!: Do not edit below this line. */
247	288
248	289	static const TkIntStubs tkIntStubs = {

460	501	TkUnderlineAngledTextLayout, /* 182 */
461	502	TkIntersectAngledTextLayout, /* 183 */
462	503	TkDrawAngledChars, /* 184 */
	504	#if !defined(_WIN32) && !defined(MAC_OSX_TCL) /* UNIX */
	505	0, /* 185 */
	506	#endif /* UNIX */
	507	#if defined(_WIN32) /* WIN */
	508	0, /* 185 */
	509	#endif /* WIN */
	510	#ifdef MAC_OSX_TCL /* MACOSX */
	511	TkpRedrawWidget, /* 185 */
	512	#endif /* MACOSX */
	513	#if !defined(_WIN32) && !defined(MAC_OSX_TCL) /* UNIX */
	514	0, /* 186 */
	515	#endif /* UNIX */
	516	#if defined(_WIN32) /* WIN */
	517	0, /* 186 */
	518	#endif /* WIN */
	519	#ifdef MAC_OSX_TCL /* MACOSX */
	520	TkpWillDrawWidget, /* 186 */
	521	#endif /* MACOSX */
463	522	};
464	523
465	524	static const TkIntPlatStubs tkIntPlatStubs = {

518	577	#ifdef MAC_OSX_TK /* AQUA */
519	578	TkGenerateActivateEvents, /* 0 */
520	579	0, /* 1 */
521		0, /* 2 */
	580	TkGenerateActivateEvents_, /* 2 */
522	581	TkPointerDeadWindow, /* 3 */
523	582	TkpSetCapture, /* 4 */
524	583	TkpSetCursor, /* 5 */

542	601	TkMacOSXMakeRealWindowExist, /* 23 */
543	602	TkMacOSXMakeStippleMap, /* 24 */
544	603	TkMacOSXMenuClick, /* 25 */
545		TkMacOSXRegisterOffScreenWindow, /* 26 */
	604	0, /* 26 */
546	605	TkMacOSXResizable, /* 27 */
547	606	TkMacOSXSetHelpMenuItemCount, /* 28 */
548	607	TkMacOSXSetScrollbarGrow, /* 29 */
549	608	TkMacOSXSetUpClippingRgn, /* 30 */
550	609	TkMacOSXSetUpGraphicsPort, /* 31 */
551	610	TkMacOSXUpdateClipRgn, /* 32 */
552		TkMacOSXUnregisterMacWindow, /* 33 */
	611	0, /* 33 */
553	612	TkMacOSXUseMenuID, /* 34 */
554	613	TkMacOSXVisableClipRgn, /* 35 */
555	614	TkMacOSXWinBounds, /* 36 */

576	635	#if !(defined(_WIN32) \|\| defined(__CYGWIN__) \|\| defined(MAC_OSX_TK)) /* X11 */
577	636	TkCreateXEventSource, /* 0 */
578	637	0, /* 1 */
579		0, /* 2 */
	638	TkGenerateActivateEvents, /* 2 */
580	639	TkpCmapStressed, /* 3 */
581	640	TkpSync, /* 4 */
582	641	TkUnixContainerId, /* 5 */

588	647	0, /* 11 */
589	648	TkpWmSetState, /* 12 */
590	649	TkpTestsendCmd, /* 13 */
	650	0, /* 14 */
	651	0, /* 15 */
	652	0, /* 16 */
	653	0, /* 17 */
	654	0, /* 18 */
	655	0, /* 19 */
	656	0, /* 20 */
	657	0, /* 21 */
	658	0, /* 22 */
	659	0, /* 23 */
	660	0, /* 24 */
	661	0, /* 25 */
	662	0, /* 26 */
	663	0, /* 27 */
	664	0, /* 28 */
	665	0, /* 29 */
	666	0, /* 30 */
	667	0, /* 31 */
	668	0, /* 32 */
	669	0, /* 33 */
	670	0, /* 34 */
	671	0, /* 35 */
	672	0, /* 36 */
	673	0, /* 37 */
	674	TkpCmapStressed_, /* 38 */
	675	TkpSync_, /* 39 */
	676	TkUnixContainerId_, /* 40 */
	677	TkUnixDoOneXEvent_, /* 41 */
	678	TkUnixSetMenubar_, /* 42 */
	679	TkWmCleanup_, /* 43 */
	680	TkSendCleanup_, /* 44 */
	681	TkpTestsendCmd_, /* 45 */
591	682	#endif /* X11 */
592	683	};
593	684

733	824	XDrawPoints, /* 135 */
734	825	XReparentWindow, /* 136 */
735	826	XPutImage, /* 137 */
	827	0, /* 138 */
	828	0, /* 139 */
	829	0, /* 140 */
	830	0, /* 141 */
	831	0, /* 142 */
	832	0, /* 143 */
	833	0, /* 144 */
	834	0, /* 145 */
	835	0, /* 146 */
	836	0, /* 147 */
	837	0, /* 148 */
	838	0, /* 149 */
	839	0, /* 150 */
	840	0, /* 151 */
	841	0, /* 152 */
	842	0, /* 153 */
	843	0, /* 154 */
	844	0, /* 155 */
	845	0, /* 156 */
	846	0, /* 157 */
	847	TkUnusedStubEntry, /* 158 */
736	848	#endif /* WIN */
737	849	#ifdef MAC_OSX_TK /* AQUA */
738	850	XSetDashes, /* 0 */

841	953	0, /* 103 */
842	954	0, /* 104 */
843	955	0, /* 105 */
844		0, /* 106 */
	956	XSetClipRectangles, /* 106 */
845	957	XFlush, /* 107 */
846	958	XGrabServer, /* 108 */
847	959	XUngrabServer, /* 109 */

855	967	0, /* 117 */
856	968	0, /* 118 */
857	969	0, /* 119 */
858		0, /* 120 */
	970	XOffsetRegion, /* 120 */
859	971	0, /* 121 */
860	972	0, /* 122 */
861	973	0, /* 123 */

864	976	0, /* 126 */
865	977	0, /* 127 */
866	978	0, /* 128 */
867		0, /* 129 */
	979	XLowerWindow, /* 129 */
868	980	0, /* 130 */
869	981	0, /* 131 */
870	982	0, /* 132 */

873	985	0, /* 135 */
874	986	0, /* 136 */
875	987	XPutImage, /* 137 */
	988	0, /* 138 */
	989	0, /* 139 */
	990	0, /* 140 */
	991	0, /* 141 */
	992	0, /* 142 */
	993	0, /* 143 */
	994	XDestroyIC, /* 144 */
	995	XCreatePixmapCursor, /* 145 */
	996	XCreateGlyphCursor, /* 146 */
	997	0, /* 147 */
	998	0, /* 148 */
	999	0, /* 149 */
	1000	0, /* 150 */
	1001	0, /* 151 */
	1002	0, /* 152 */
	1003	0, /* 153 */
	1004	0, /* 154 */
	1005	0, /* 155 */
	1006	0, /* 156 */
	1007	XkbKeycodeToKeysym, /* 157 */
	1008	TkUnusedStubEntry, /* 158 */
876	1009	#endif /* AQUA */
877	1010	};
878	1011

899	1032	TkMacOSXGetRootControl, /* 8 */
900	1033	Tk_MacOSXSetupTkNotifier, /* 9 */
901	1034	Tk_MacOSXIsAppInFront, /* 10 */
	1035	Tk_MacOSXGetTkWindow, /* 11 */
	1036	Tk_MacOSXGetCGContextForDrawable, /* 12 */
	1037	Tk_MacOSXGetNSWindowForDrawable, /* 13 */
	1038	0, /* 14 */
	1039	0, /* 15 */
	1040	TkGenWMConfigureEvent_, /* 16 */
902	1041	#endif /* AQUA */
903	1042	};
904	1043

1186	1325	Tk_Interp, /* 271 */
1187	1326	Tk_CreateOldImageType, /* 272 */
1188	1327	Tk_CreateOldPhotoImageFormat, /* 273 */
	1328	0, /* 274 */
	1329	0, /* 275 */
	1330	0, /* 276 */
	1331	0, /* 277 */
	1332	0, /* 278 */
	1333	0, /* 279 */
	1334	TkUnusedStubEntry, /* 280 */
1189	1335	};
1190	1336
1191	1337	/* !END!: Do not edit above this line. */

+40

-43

generic/tkStyle.c less more

177	177
178	178	void
179	179	TkStylePkgInit(
180		TkMainInfo mainPtr) / The application being created. */
181		{
182		ThreadSpecificData *tsdPtr =
	180	TCL_UNUSED(TkMainInfo )) / The application being created. */
	181	{
	182	ThreadSpecificData tsdPtr = (ThreadSpecificData )
183	183	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
184	184
185	185	if (tsdPtr->nbInit != 0) {

232	232
233	233	void
234	234	TkStylePkgFree(
235		TkMainInfo mainPtr) / The application being deleted. */
236		{
237		ThreadSpecificData *tsdPtr =
	235	TCL_UNUSED(TkMainInfo )) / The application being deleted. */
	236	{
	237	ThreadSpecificData tsdPtr = (ThreadSpecificData )
238	238	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
239	239	Tcl_HashSearch search;
240	240	Tcl_HashEntry *entryPtr;

263	263
264	264	entryPtr = Tcl_FirstHashEntry(&tsdPtr->engineTable, &search);
265	265	while (entryPtr != NULL) {
266		enginePtr = Tcl_GetHashValue(entryPtr);
	266	enginePtr = (StyleEngine *)Tcl_GetHashValue(entryPtr);
267	267	FreeStyleEngine(enginePtr);
268	268	ckfree(enginePtr);
269	269	entryPtr = Tcl_NextHashEntry(&search);

306	306	Tk_StyleEngine parent) /* The engine's parent. NULL means the default
307	307	* system engine. */
308	308	{
309		ThreadSpecificData *tsdPtr =
	309	ThreadSpecificData tsdPtr = (ThreadSpecificData )
310	310	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
311	311	Tcl_HashEntry *entryPtr;
312	312	int newEntry;

330	330	* Allocate and intitialize a new engine.
331	331	*/
332	332
333		enginePtr = ckalloc(sizeof(StyleEngine));
334		InitStyleEngine(enginePtr, Tcl_GetHashKey(&tsdPtr->engineTable, entryPtr),
	333	enginePtr = (StyleEngine *)ckalloc(sizeof(StyleEngine));
	334	InitStyleEngine(enginePtr, (const char *)Tcl_GetHashKey(&tsdPtr->engineTable, entryPtr),
335	335	(StyleEngine *) parent);
336	336	Tcl_SetHashValue(entryPtr, enginePtr);
337	337

363	363	StyleEngine parentPtr) / The engine's parent. NULL means the default
364	364	* system engine. */
365	365	{
366		ThreadSpecificData *tsdPtr =
	366	ThreadSpecificData tsdPtr = (ThreadSpecificData )
367	367	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
368	368	int elementId;
369	369

388	388	*/
389	389
390	390	if (tsdPtr->nbElements > 0) {
391		enginePtr->elements = ckalloc(
	391	enginePtr->elements = (StyledElement *)ckalloc(
392	392	sizeof(StyledElement) * tsdPtr->nbElements);
393	393	for (elementId = 0; elementId < tsdPtr->nbElements; elementId++) {
394	394	InitStyledElement(enginePtr->elements+elementId);

418	418	FreeStyleEngine(
419	419	StyleEngine enginePtr) / The style engine to free. */
420	420	{
421		ThreadSpecificData *tsdPtr =
	421	ThreadSpecificData tsdPtr = (ThreadSpecificData )
422	422	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
423	423	int elementId;
424	424

453	453	const char name) / Name of the engine to retrieve. NULL or
454	454	* empty means the default system engine. */
455	455	{
456		ThreadSpecificData *tsdPtr =
	456	ThreadSpecificData tsdPtr = (ThreadSpecificData )
457	457	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
458	458	Tcl_HashEntry *entryPtr;
459	459

466	466	return NULL;
467	467	}
468	468
469		return Tcl_GetHashValue(entryPtr);
	469	return (Tk_StyleEngine)Tcl_GetHashValue(entryPtr);
470	470	}
471	471
472	472	/*

520	520
521	521	static void
522	522	FreeElement(
523		Element elementPtr) / The element to free. */
	523	TCL_UNUSED(Element )) / The element to free. */
524	524	{
525	525	/* Nothing to do. */
526	526	}

603	603	* created explicitly (being registered) or
604	604	* implicitly (by a derived element). */
605	605	{
606		ThreadSpecificData *tsdPtr =
	606	ThreadSpecificData tsdPtr = (ThreadSpecificData )
607	607	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
608	608	Tcl_HashEntry entryPtr, engineEntryPtr;
609	609	Tcl_HashSearch search;
610	610	int newEntry, elementId, genericId = -1;
611		char *dot;
	611	const char *dot;
612	612	StyleEngine *enginePtr;
613	613
614	614	/*

641	641	* Reallocate element table.
642	642	*/
643	643
644		tsdPtr->elements = ckrealloc(tsdPtr->elements,
	644	tsdPtr->elements = (Element *)ckrealloc(tsdPtr->elements,
645	645	sizeof(Element) * tsdPtr->nbElements);
646	646	InitElement(tsdPtr->elements+elementId,
647		Tcl_GetHashKey(&tsdPtr->elementTable, entryPtr), elementId,
	647	(const char *)Tcl_GetHashKey(&tsdPtr->elementTable, entryPtr), elementId,
648	648	genericId, create);
649	649
650	650	/*

653	653
654	654	engineEntryPtr = Tcl_FirstHashEntry(&tsdPtr->engineTable, &search);
655	655	while (engineEntryPtr != NULL) {
656		enginePtr = Tcl_GetHashValue(engineEntryPtr);
657
658		enginePtr->elements = ckrealloc(enginePtr->elements,
	656	enginePtr = (StyleEngine *)Tcl_GetHashValue(engineEntryPtr);
	657
	658	enginePtr->elements = (StyledElement *)ckrealloc(enginePtr->elements,
659	659	sizeof(StyledElement) * tsdPtr->nbElements);
660	660	InitStyledElement(enginePtr->elements+elementId);
661	661

685	685	Tk_GetElementId(
686	686	const char name) / Name of the element. */
687	687	{
688		ThreadSpecificData *tsdPtr =
	688	ThreadSpecificData tsdPtr = (ThreadSpecificData )
689	689	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
690	690	Tcl_HashEntry *entryPtr;
691	691	int genericId = -1;
692		char *dot;
	692	const char *dot;
693	693
694	694	/*
695	695	* Find the element Id.

758	758	StyledElement *elementPtr;
759	759	Tk_ElementSpec *specPtr;
760	760	int nbOptions;
761		register Tk_ElementOptionSpec srcOptions, dstOptions;
	761	Tk_ElementOptionSpec srcOptions, dstOptions;
762	762
763	763	if (templatePtr->version != TK_STYLE_VERSION_1) {
764	764	/*

785	785
786	786	elementPtr = ((StyleEngine *) engine)->elements+elementId;
787	787
788		specPtr = ckalloc(sizeof(Tk_ElementSpec));
	788	specPtr = (Tk_ElementSpec *)ckalloc(sizeof(Tk_ElementSpec));
789	789	specPtr->version = templatePtr->version;
790		specPtr->name = ckalloc(strlen(templatePtr->name)+1);
	790	specPtr->name = (char *)ckalloc(strlen(templatePtr->name)+1);
791	791	strcpy(specPtr->name, templatePtr->name);
792	792	nbOptions = 0;
793	793	for (nbOptions = 0, srcOptions = templatePtr->options;
794	794	srcOptions->name != NULL; nbOptions++, srcOptions++) {
795	795	/* empty body */
796	796	}
797		specPtr->options =
	797	specPtr->options = (Tk_ElementOptionSpec *)
798	798	ckalloc(sizeof(Tk_ElementOptionSpec) * (nbOptions+1));
799	799	for (srcOptions = templatePtr->options, dstOptions = specPtr->options;
800	800	/* End condition within loop */; srcOptions++, dstOptions++) {

803	803	break;
804	804	}
805	805
806		dstOptions->name = ckalloc(strlen(srcOptions->name)+1);
	806	dstOptions->name = (char *)ckalloc(strlen(srcOptions->name)+1);
807	807	strcpy(dstOptions->name, srcOptions->name);
808	808	dstOptions->type = srcOptions->type;
809	809	}

843	843	int elementId) /* Unique element ID */
844	844	{
845	845	StyledElement *elementPtr;
846		ThreadSpecificData *tsdPtr =
	846	ThreadSpecificData tsdPtr = (ThreadSpecificData )
847	847	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
848	848	StyleEngine *enginePtr2;
849	849

923	923	*/
924	924
925	925	widgetSpecPtr->optionsPtr =
926		ckalloc(sizeof(Tk_OptionSpec ) nbOptions);
	926	(const Tk_OptionSpec *)ckalloc(sizeof(Tk_OptionSpec ) * nbOptions);
927	927	for (i = 0, elementOptionPtr = elementPtr->specPtr->options;
928	928	i < nbOptions; i++, elementOptionPtr++) {
929	929	widgetOptionPtr = TkGetOptionSpec(elementOptionPtr->name, optionTable);

1007	1007	*/
1008	1008
1009	1009	i = elementPtr->nbWidgetSpecs++;
1010		elementPtr->widgetSpecs = ckrealloc(elementPtr->widgetSpecs,
	1010	elementPtr->widgetSpecs = (StyledWidgetSpec *)ckrealloc(elementPtr->widgetSpecs,
1011	1011	sizeof(StyledWidgetSpec) * elementPtr->nbWidgetSpecs);
1012	1012	widgetSpecPtr = elementPtr->widgetSpecs+i;
1013	1013	InitWidgetSpec(widgetSpecPtr, elementPtr, optionTable);

1228	1228	Tk_StyleEngine engine, /* The style engine. */
1229	1229	ClientData clientData) /* Private data passed as is to engine code. */
1230	1230	{
1231		ThreadSpecificData *tsdPtr =
	1231	ThreadSpecificData tsdPtr = (ThreadSpecificData )
1232	1232	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
1233	1233	Tcl_HashEntry *entryPtr;
1234	1234	int newEntry;

1252	1252	* Allocate and intitialize a new style.
1253	1253	*/
1254	1254
1255		stylePtr = ckalloc(sizeof(Style));
1256		InitStyle(stylePtr, Tcl_GetHashKey(&tsdPtr->styleTable, entryPtr),
	1255	stylePtr = (Style *)ckalloc(sizeof(Style));
	1256	InitStyle(stylePtr, (const char *)Tcl_GetHashKey(&tsdPtr->styleTable, entryPtr),
1257	1257	(engine!=NULL ? (StyleEngine*) engine : tsdPtr->defaultEnginePtr),
1258	1258	clientData);
1259	1259	Tcl_SetHashValue(entryPtr, stylePtr);

1343	1343	const char name) / Name of the style to retrieve. NULL or empty
1344	1344	* means the default system style. */
1345	1345	{
1346		ThreadSpecificData *tsdPtr =
	1346	ThreadSpecificData tsdPtr = (ThreadSpecificData )
1347	1347	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
1348	1348	Tcl_HashEntry *entryPtr;
1349		Style *stylePtr;
1350	1349
1351	1350	/*
1352	1351	* Search for a corresponding entry in the style table.

1361	1360	}
1362	1361	return NULL;
1363	1362	}
1364		stylePtr = Tcl_GetHashValue(entryPtr);
1365
1366		return (Tk_Style) stylePtr;
	1363	return (Tk_Style)Tcl_GetHashValue(entryPtr);
1367	1364	}
1368	1365
1369	1366	/*

1378	1375
1379	1376	void
1380	1377	Tk_FreeStyle(
1381		Tk_Style style)
	1378	TCL_UNUSED(Tk_Style))
1382	1379	{
1383	1380	}
1384	1381

1455	1452	*/
1456	1453	void
1457	1454	Tk_FreeStyleFromObj(
1458		Tcl_Obj *objPtr)
	1455	TCL_UNUSED(Tcl_Obj *))
1459	1456	{
1460	1457	}
1461	1458

+115

-122

generic/tkTest.c less more

30	30	#if defined(MAC_OSX_TK)
31	31	#include "tkMacOSXInt.h"
32	32	#include "tkScrollbar.h"
33		#define LOG_DISPLAY TkTestLogDisplay()
	33	#define LOG_DISPLAY(drawable) TkTestLogDisplay(drawable)
34	34	#else
35		#define LOG_DISPLAY 1
	35	#define LOG_DISPLAY(drawable) 1
36	36	#endif
37	37
38	38	#ifdef __UNIX__

49	49	#define TCL_STORAGE_CLASS DLLEXPORT
50	50	EXTERN int Tktest_Init(Tcl_Interp *interp);
51	51	/*
52		* The following data structure represents the master for a test image:
53		*/
54
55		typedef struct TImageMaster {
56		Tk_ImageMaster master; /* Tk's token for image master. */
	52	* The following data structure represents the model for a test image:
	53	*/
	54
	55	typedef struct TImageModel {
	56	Tk_ImageModel model; /* Tk's token for image model. */
57	57	Tcl_Interp interp; / Interpreter for application. */
58	58	int width, height; /* Dimensions of image. */
59	59	char imageName; / Name of image (malloc-ed). */
60	60	char varName; / Name of variable in which to log events for
61	61	* image (malloc-ed). */
62		} TImageMaster;
	62	} TImageModel;
63	63
64	64	/*
65	65	* The following data structure represents a particular use of a particular

67	67	*/
68	68
69	69	typedef struct TImageInstance {
70		TImageMaster masterPtr; / Pointer to master for image. */
	70	TImageModel modelPtr; / Pointer to model for image. */
71	71	XColor fg; / Foreground color for drawing in image. */
72	72	GC gc; /* Graphics context for drawing in image. */
	73	Bool displayFailed; /* macOS display attempted out of drawRect. */
	74	char buffer[200 + TCL_INTEGER_SPACE * 6]; /* message to log on display. */
73	75	} TImageInstance;
74	76
75	77	/*

78	80
79	81	static int ImageCreate(Tcl_Interp *interp,
80	82	const char name, int argc, Tcl_Obj const objv[],
81		const Tk_ImageType *typePtr, Tk_ImageMaster master,
	83	const Tk_ImageType *typePtr, Tk_ImageModel model,
82	84	ClientData *clientDataPtr);
83	85	static ClientData ImageGet(Tk_Window tkwin, ClientData clientData);
84	86	static void ImageDisplay(ClientData clientData,

241	243	*/
242	244
243	245	if (Tcl_PkgProvideEx(interp, "Tktest", TK_PATCH_LEVEL, NULL) == TCL_ERROR) {
244		return TCL_ERROR;
	246	return TCL_ERROR;
245	247	}
246	248
247	249	Tcl_CreateObjCommand(interp, "square", SquareObjCmd, NULL, NULL);

321	323	*----------------------------------------------------------------------
322	324	*/
323	325
324		/* ARGSUSED */
325	326	static int
326	327	TestbitmapObjCmd(
327		ClientData clientData, /* Main window for application. */
	328	TCL_UNUSED(void ), / Main window for application. */
328	329	Tcl_Interp interp, / Current interpreter. */
329	330	int objc, /* Number of arguments. */
330	331	Tcl_Obj const objv[]) / Argument objects. */

356	357	*----------------------------------------------------------------------
357	358	*/
358	359
359		/* ARGSUSED */
360	360	static int
361	361	TestborderObjCmd(
362		ClientData clientData, /* Main window for application. */
	362	TCL_UNUSED(ClientData), /* Main window for application. */
363	363	Tcl_Interp interp, / Current interpreter. */
364	364	int objc, /* Number of arguments. */
365	365	Tcl_Obj const objv[]) / Argument objects. */

391	391	*----------------------------------------------------------------------
392	392	*/
393	393
394		/* ARGSUSED */
395	394	static int
396	395	TestcolorObjCmd(
397		ClientData clientData, /* Main window for application. */
	396	TCL_UNUSED(void ), / Main window for application. */
398	397	Tcl_Interp interp, / Current interpreter. */
399	398	int objc, /* Number of arguments. */
400	399	Tcl_Obj const objv[]) / Argument objects. */

425	424	*----------------------------------------------------------------------
426	425	*/
427	426
428		/* ARGSUSED */
429	427	static int
430	428	TestcursorObjCmd(
431		ClientData clientData, /* Main window for application. */
	429	TCL_UNUSED(void ), / Main window for application. */
432	430	Tcl_Interp interp, / Current interpreter. */
433	431	int objc, /* Number of arguments. */
434	432	Tcl_Obj const objv[]) / Argument objects. */

454	452	* A standard Tcl result.
455	453	*
456	454	* Side effects:
457		* All the intepreters created by previous calls to "testnewapp" get
	455	* All the interpreters created by previous calls to "testnewapp" get
458	456	* deleted.
459	457	*
460	458	*----------------------------------------------------------------------
461	459	*/
462	460
463		/* ARGSUSED */
464	461	static int
465	462	TestdeleteappsObjCmd(
466		ClientData clientData, /* Main window for application. */
467		Tcl_Interp interp, / Current interpreter. */
468		int objc, /* Number of arguments. */
469		Tcl_Obj const objv[]) / Argument strings. */
	463	TCL_UNUSED(void ), / Main window for application. */
	464	TCL_UNUSED(Tcl_Interp ), / Current interpreter. */
	465	TCL_UNUSED(int), /* Number of arguments. */
	466	TCL_UNUSED(Tcl_Obj const )) /* Argument strings. */
470	467	{
471	468	NewApp *nextPtr;
472	469

497	494	*----------------------------------------------------------------------
498	495	*/
499	496
500		/* ARGSUSED */
501	497	static int
502	498	TestobjconfigObjCmd(
503	499	ClientData clientData, /* Main window for application. */

636	632	{TK_OPTION_END, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0}
637	633	};
638	634	Tk_OptionTable optionTable;
639		Tk_Window tkwin;
640	635
641	636	optionTable = Tk_CreateOptionTable(interp, typesSpecs);
642	637	tables[index] = optionTable;

647	642	}
648	643	Tk_SetClass(tkwin, "Test");
649	644
650		recordPtr = ckalloc(sizeof(TypesRecord));
	645	recordPtr = (TypesRecord *)ckalloc(sizeof(TypesRecord));
651	646	recordPtr->header.interp = interp;
652	647	recordPtr->header.optionTable = optionTable;
653	648	recordPtr->header.tkwin = tkwin;

692	687
693	688	case CHAIN1: {
694	689	ExtensionWidgetRecord *recordPtr;
695		Tk_Window tkwin;
696	690	Tk_OptionTable optionTable;
697	691
698	692	tkwin = Tk_CreateWindowFromPath(interp, (Tk_Window) clientData,

704	698	optionTable = Tk_CreateOptionTable(interp, baseSpecs);
705	699	tables[index] = optionTable;
706	700
707		recordPtr = ckalloc(sizeof(ExtensionWidgetRecord));
	701	recordPtr = (ExtensionWidgetRecord *)ckalloc(sizeof(ExtensionWidgetRecord));
708	702	recordPtr->header.interp = interp;
709	703	recordPtr->header.optionTable = optionTable;
710	704	recordPtr->header.tkwin = tkwin;

745	739	{TK_OPTION_END, NULL, NULL, NULL, NULL, 0, -1, 0,
746	740	(ClientData) baseSpecs, 0}
747	741	};
748		Tk_Window tkwin;
749	742	Tk_OptionTable optionTable;
750	743
751	744	tkwin = Tk_CreateWindowFromPath(interp, (Tk_Window) clientData,

757	750	optionTable = Tk_CreateOptionTable(interp, extensionSpecs);
758	751	tables[index] = optionTable;
759	752
760		recordPtr = ckalloc(sizeof(ExtensionWidgetRecord));
	753	recordPtr = (ExtensionWidgetRecord *)ckalloc(sizeof(ExtensionWidgetRecord));
761	754	recordPtr->header.interp = interp;
762	755	recordPtr->header.optionTable = optionTable;
763	756	recordPtr->header.tkwin = tkwin;

914	907	{TK_OPTION_END, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0}
915	908	};
916	909	Tk_OptionTable optionTable;
917		Tk_Window tkwin;
918	910
919	911	optionTable = Tk_CreateOptionTable(interp, internalSpecs);
920	912	tables[index] = optionTable;

1059	1051	}
1060	1052
1061	1053	case TWO_WINDOWS: {
1062		typedef struct SlaveRecord {
	1054	typedef struct ContentRecord {
1063	1055	TrivialCommandHeader header;
1064	1056	Tcl_Obj *windowPtr;
1065		} SlaveRecord;
1066		SlaveRecord *recordPtr;
1067		static const Tk_OptionSpec slaveSpecs[] = {
	1057	} ContentRecord;
	1058	ContentRecord *recordPtr;
	1059	static const Tk_OptionSpec contentSpecs[] = {
1068	1060	{TK_OPTION_WINDOW, "-window", "window", "Window", ".bar",
1069		Tk_Offset(SlaveRecord, windowPtr), -1, TK_CONFIG_NULL_OK, NULL, 0},
	1061	Tk_Offset(ContentRecord, windowPtr), -1, TK_CONFIG_NULL_OK, NULL, 0},
1070	1062	{TK_OPTION_END, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0}
1071	1063	};
1072		Tk_Window tkwin = Tk_CreateWindowFromPath(interp,
	1064	tkwin = Tk_CreateWindowFromPath(interp,
1073	1065	(Tk_Window) clientData, Tcl_GetString(objv[2]), NULL);
1074	1066
1075	1067	if (tkwin == NULL) {

1077	1069	}
1078	1070	Tk_SetClass(tkwin, "Test");
1079	1071
1080		recordPtr = ckalloc(sizeof(SlaveRecord));
	1072	recordPtr = (ContentRecord *)ckalloc(sizeof(ContentRecord));
1081	1073	recordPtr->header.interp = interp;
1082	1074	recordPtr->header.optionTable = Tk_CreateOptionTable(interp,
1083		slaveSpecs);
	1075	contentSpecs);
1084	1076	tables[index] = recordPtr->header.optionTable;
1085	1077	recordPtr->header.tkwin = tkwin;
1086	1078	recordPtr->windowPtr = NULL;

1130	1122	*----------------------------------------------------------------------
1131	1123	*/
1132	1124
1133		/* ARGSUSED */
1134	1125	static int
1135	1126	TrivialConfigObjCmd(
1136	1127	ClientData clientData, /* Main window for application. */

1242	1233	TrivialCmdDeletedProc(
1243	1234	ClientData clientData) /* Pointer to widget record for widget. */
1244	1235	{
1245		TrivialCommandHeader headerPtr = (TrivialCommandHeader ) clientData;
	1236	TrivialCommandHeader headerPtr = (TrivialCommandHeader )clientData;
1246	1237	Tk_Window tkwin = headerPtr->tkwin;
1247	1238
1248	1239	if (tkwin != NULL) {

1254	1245	* here.
1255	1246	*/
1256	1247
1257		Tk_FreeConfigOptions((char *) clientData,
1258		headerPtr->optionTable, (Tk_Window) NULL);
	1248	Tk_FreeConfigOptions((char *)clientData,
	1249	headerPtr->optionTable, NULL);
1259	1250	Tcl_EventuallyFree(clientData, TCL_DYNAMIC);
1260	1251	}
1261	1252	}

1281	1272	ClientData clientData, /* Information about window. */
1282	1273	XEvent eventPtr) / Information about event. */
1283	1274	{
1284		TrivialCommandHeader headerPtr = (TrivialCommandHeader ) clientData;
	1275	TrivialCommandHeader headerPtr = (TrivialCommandHeader )clientData;
1285	1276
1286	1277	if (eventPtr->type == DestroyNotify) {
1287	1278	if (headerPtr->tkwin != NULL) {
1288		Tk_FreeConfigOptions((char *) clientData,
	1279	Tk_FreeConfigOptions((char *)clientData,
1289	1280	headerPtr->optionTable, headerPtr->tkwin);
1290	1281	headerPtr->optionTable = NULL;
1291	1282	headerPtr->tkwin = NULL;

1313	1304	*----------------------------------------------------------------------
1314	1305	*/
1315	1306
1316		/* ARGSUSED */
1317	1307	static int
1318	1308	TestfontObjCmd(
1319	1309	ClientData clientData, /* Main window for application. */

1327	1317	Tk_Window tkwin;
1328	1318	Tk_Font tkfont;
1329	1319
1330		tkwin = (Tk_Window) clientData;
	1320	tkwin = (Tk_Window)clientData;
1331	1321
1332	1322	if (objc < 3) {
1333	1323	Tcl_WrongNumArgs(interp, 1, objv, "option fontName");

1373	1363	*----------------------------------------------------------------------
1374	1364	*/
1375	1365
1376		/* ARGSUSED */
1377	1366	static int
1378	1367	ImageCreate(
1379	1368	Tcl_Interp interp, / Interpreter for application containing

1382	1371	int objc, /* Number of arguments. */
1383	1372	Tcl_Obj const objv[], / Argument strings for options (doesn't
1384	1373	* include image name or type). */
1385		const Tk_ImageType typePtr, / Pointer to our type record (not used). */
1386		Tk_ImageMaster master, /* Token for image, to be used by us in later
	1374	TCL_UNUSED(const Tk_ImageType ), / Pointer to our type record (not used). */
	1375	Tk_ImageModel model, /* Token for image, to be used by us in later
1387	1376	* callbacks. */
1388	1377	ClientData clientDataPtr) / Store manager's token for image here; it
1389	1378	* will be returned in later callbacks. */
1390	1379	{
1391		TImageMaster *timPtr;
	1380	TImageModel *timPtr;
1392	1381	const char *varName;
1393	1382	int i;
1394	1383

1407	1396	varName = Tcl_GetString(objv[i+1]);
1408	1397	}
1409	1398
1410		timPtr = ckalloc(sizeof(TImageMaster));
1411		timPtr->master = master;
	1399	timPtr = (TImageModel *)ckalloc(sizeof(TImageModel));
	1400	timPtr->model = model;
1412	1401	timPtr->interp = interp;
1413	1402	timPtr->width = 30;
1414	1403	timPtr->height = 15;
1415		timPtr->imageName = ckalloc(strlen(name) + 1);
	1404	timPtr->imageName = (char *)ckalloc(strlen(name) + 1);
1416	1405	strcpy(timPtr->imageName, name);
1417		timPtr->varName = ckalloc(strlen(varName) + 1);
	1406	timPtr->varName = (char *)ckalloc(strlen(varName) + 1);
1418	1407	strcpy(timPtr->varName, varName);
1419	1408	Tcl_CreateObjCommand(interp, name, ImageObjCmd, timPtr, NULL);
1420	1409	*clientDataPtr = timPtr;
1421		Tk_ImageChanged(master, 0, 0, 30, 15, 30, 15);
	1410	Tk_ImageChanged(model, 0, 0, 30, 15, 30, 15);
1422	1411	return TCL_OK;
1423	1412	}
1424	1413

1439	1428	*----------------------------------------------------------------------
1440	1429	*/
1441	1430
1442		/* ARGSUSED */
1443	1431	static int
1444	1432	ImageObjCmd(
1445	1433	ClientData clientData, /* Main window for application. */

1447	1435	int objc, /* Number of arguments. */
1448	1436	Tcl_Obj const objv[]) / Argument strings. */
1449	1437	{
1450		TImageMaster timPtr = (TImageMaster ) clientData;
	1438	TImageModel timPtr = (TImageModel )clientData;
1451	1439	int x, y, width, height;
1452	1440
1453	1441	if (objc < 2) {

1468	1456	\|\| (Tcl_GetIntFromObj(interp, objv[7], &timPtr->height) != TCL_OK)) {
1469	1457	return TCL_ERROR;
1470	1458	}
1471		Tk_ImageChanged(timPtr->master, x, y, width, height, timPtr->width,
	1459	Tk_ImageChanged(timPtr->model, x, y, width, height, timPtr->width,
1472	1460	timPtr->height);
1473	1461	} else {
1474	1462	Tcl_AppendResult(interp, "bad option \"", Tcl_GetString(objv[1]),

1500	1488	ImageGet(
1501	1489	Tk_Window tkwin, /* Token for window in which image will be
1502	1490	* used. */
1503		ClientData clientData) /* Pointer to TImageMaster for image. */
1504		{
1505		TImageMaster timPtr = (TImageMaster ) clientData;
	1491	ClientData clientData) /* Pointer to TImageModel for image. */
	1492	{
	1493	TImageModel timPtr = (TImageModel )clientData;
1506	1494	TImageInstance *instPtr;
1507	1495	char buffer[100];
1508	1496	XGCValues gcValues;

1511	1499	Tcl_SetVar2(timPtr->interp, timPtr->varName, NULL, buffer,
1512	1500	TCL_GLOBAL_ONLY\|TCL_APPEND_VALUE\|TCL_LIST_ELEMENT);
1513	1501
1514		instPtr = ckalloc(sizeof(TImageInstance));
1515		instPtr->masterPtr = timPtr;
	1502	instPtr = (TImageInstance *)ckalloc(sizeof(TImageInstance));
	1503	instPtr->modelPtr = timPtr;
1516	1504	instPtr->fg = Tk_GetColor(timPtr->interp, tkwin, "#ff0000");
1517	1505	gcValues.foreground = instPtr->fg->pixel;
1518	1506	instPtr->gc = Tk_GetGC(tkwin, GCForeground, &gcValues);
	1507	instPtr->displayFailed = False;
1519	1508	return instPtr;
1520	1509	}
1521	1510

1549	1538	/* Coordinates in drawable corresponding to
1550	1539	* imageX and imageY. */
1551	1540	{
1552		TImageInstance instPtr = (TImageInstance ) clientData;
1553		char buffer[200 + TCL_INTEGER_SPACE * 6];
	1541	TImageInstance instPtr = (TImageInstance )clientData;
1554	1542
1555	1543	/*
1556	1544	* The purpose of the test image type is to track the calls to an image
1557		* display proc and record the parameters passed in each call. On macOS
1558		* a display proc must be run inside of the drawRect method of an NSView
1559		* in order for the graphics operations to have any effect. To deal with
	1545	* display proc and record the parameters passed in each call. On macOS a
	1546	* display proc must be run inside of the drawRect method of an NSView in
	1547	* order for the graphics operations to have any effect. To deal with
1560	1548	* this, whenever a display proc is called outside of any drawRect method
1561		* it schedules a redraw of the NSView by calling [view setNeedsDisplay:YES].
1562		* This will trigger a later call to the view's drawRect method which will
1563		* run the display proc a second time.
	1549	* it schedules a redraw of the NSView.
1564	1550	*
1565		* This complicates testing, since it can result in more calls to the display
1566		* proc than are expected by the test. It can also result in an inconsistent
1567		* number of calls unless the test waits until the call to drawRect actually
1568		* occurs before validating its results.
1569		*
1570		* In an attempt to work around this, this display proc only logs those
1571		* calls which occur within a drawRect method. This means that tests must
1572		* be written so as to ensure that the drawRect method is run before
1573		* results are validated. In practice it usually suffices to run update
1574		* idletasks (to run the display proc the first time) followed by update
1575		* (to run the display proc in drawRect).
1576		*
1577		* This also has the consequence that the image changed command will log
1578		* different results on Aqua than on other systems, because when the image
1579		* is redisplayed in the drawRect method the entire image will be drawn,
1580		* not just the changed portion. Tests must account for this.
	1551	* In an attempt to work around this, each image instance maintains it own
	1552	* copy of the log message which gets written on the first call to the
	1553	* display proc. This usually means that the message created on macOS is
	1554	* the same as that created on other platforms. However it is possible
	1555	* for the messages to differ for other reasons, namely differences in
	1556	* how damage regions are computed.
1581	1557	*/
1582	1558
1583		if (LOG_DISPLAY) {
1584		sprintf(buffer, "%s display %d %d %d %d",
1585		instPtr->masterPtr->imageName, imageX, imageY, width, height);
1586		Tcl_SetVar2(instPtr->masterPtr->interp, instPtr->masterPtr->varName,
1587		NULL, buffer, TCL_GLOBAL_ONLY\|TCL_APPEND_VALUE\|TCL_LIST_ELEMENT);
1588		}
1589		if (width > (instPtr->masterPtr->width - imageX)) {
1590		width = instPtr->masterPtr->width - imageX;
1591		}
1592		if (height > (instPtr->masterPtr->height - imageY)) {
1593		height = instPtr->masterPtr->height - imageY;
	1559	if (LOG_DISPLAY(drawable)) {
	1560	if (instPtr->displayFailed == False) {
	1561
	1562	/*
	1563	* Drawing is possible on the first call to DisplayImage.
	1564	* Log the message.
	1565	*/
	1566
	1567	sprintf(instPtr->buffer, "%s display %d %d %d %d",
	1568	instPtr->modelPtr->imageName, imageX, imageY, width, height);
	1569	}
	1570	Tcl_SetVar2(instPtr->modelPtr->interp, instPtr->modelPtr->varName,
	1571	NULL, instPtr->buffer,
	1572	TCL_GLOBAL_ONLY\|TCL_APPEND_VALUE\|TCL_LIST_ELEMENT);
	1573	instPtr->displayFailed = False;
	1574	} else {
	1575
	1576	/*
	1577	* Drawing is not possible on the first call to DisplayImage.
	1578	* Save the message, but do not log it until the actual display.
	1579	*/
	1580
	1581	if (instPtr->displayFailed == False) {
	1582	sprintf(instPtr->buffer, "%s display %d %d %d %d",
	1583	instPtr->modelPtr->imageName, imageX, imageY, width, height);
	1584	}
	1585	instPtr->displayFailed = True;
	1586	}
	1587	if (width > (instPtr->modelPtr->width - imageX)) {
	1588	width = instPtr->modelPtr->width - imageX;
	1589	}
	1590	if (height > (instPtr->modelPtr->height - imageY)) {
	1591	height = instPtr->modelPtr->height - imageY;
1594	1592	}
1595	1593
1596	1594	XDrawRectangle(display, drawable, instPtr->gc, drawableX, drawableY,

1624	1622	ClientData clientData, /* Pointer to TImageInstance for instance. */
1625	1623	Display display) / Display where image was to be drawn. */
1626	1624	{
1627		TImageInstance instPtr = (TImageInstance ) clientData;
	1625	TImageInstance instPtr = (TImageInstance )clientData;
1628	1626	char buffer[200];
1629	1627
1630		sprintf(buffer, "%s free", instPtr->masterPtr->imageName);
1631		Tcl_SetVar2(instPtr->masterPtr->interp, instPtr->masterPtr->varName, NULL,
	1628	sprintf(buffer, "%s free", instPtr->modelPtr->imageName);
	1629	Tcl_SetVar2(instPtr->modelPtr->interp, instPtr->modelPtr->varName, NULL,
1632	1630	buffer, TCL_GLOBAL_ONLY\|TCL_APPEND_VALUE\|TCL_LIST_ELEMENT);
1633	1631	Tk_FreeColor(instPtr->fg);
1634	1632	Tk_FreeGC(display, instPtr->gc);

1654	1652
1655	1653	static void
1656	1654	ImageDelete(
1657		ClientData clientData) /* Pointer to TImageMaster for image. When
	1655	ClientData clientData) /* Pointer to TImageModel for image. When
1658	1656	* this function is called, no more instances
1659	1657	* exist. */
1660	1658	{
1661		TImageMaster timPtr = (TImageMaster ) clientData;
	1659	TImageModel timPtr = (TImageModel )clientData;
1662	1660	char buffer[100];
1663	1661
1664	1662	sprintf(buffer, "%s delete", timPtr->imageName);

1689	1687	*----------------------------------------------------------------------
1690	1688	*/
1691	1689
1692		/* ARGSUSED */
1693	1690	static int
1694	1691	TestmakeexistObjCmd(
1695	1692	ClientData clientData, /* Main window for application. */

1697	1694	int objc, /* Number of arguments. */
1698	1695	Tcl_Obj const objv[]) / Argument strings. */
1699	1696	{
1700		Tk_Window mainWin = (Tk_Window) clientData;
	1697	Tk_Window mainWin = (Tk_Window)clientData;
1701	1698	int i;
1702	1699	Tk_Window tkwin;
1703	1700

1730	1727	*----------------------------------------------------------------------
1731	1728	*/
1732	1729
1733		/* ARGSUSED */
1734	1730	#if !(defined(_WIN32) \|\| defined(MAC_OSX_TK) \|\| defined(__CYGWIN__))
1735	1731	static int
1736	1732	TestmenubarObjCmd(

1740	1736	Tcl_Obj const objv[]) / Argument strings. */
1741	1737	{
1742	1738	#ifdef __UNIX__
1743		Tk_Window mainWin = (Tk_Window) clientData;
	1739	Tk_Window mainWin = (Tk_Window)clientData;
1744	1740	Tk_Window tkwin, menubar;
1745	1741
1746	1742	if (objc < 2) {

1800	1796	#if defined(_WIN32)
1801	1797	static int
1802	1798	TestmetricsObjCmd(
1803		ClientData clientData, /* Main window for application. */
	1799	TCL_UNUSED(void ), / Main window for application. */
1804	1800	Tcl_Interp interp, / Current interpreter. */
1805	1801	int objc, /* Number of arguments. */
1806	1802	Tcl_Obj const objv[]) / Argument strings. */

1845	1841	*----------------------------------------------------------------------
1846	1842	*/
1847	1843
1848		/* ARGSUSED */
1849	1844	static int
1850	1845	TestpropObjCmd(
1851	1846	ClientData clientData, /* Main window for application. */

1853	1848	int objc, /* Number of arguments. */
1854	1849	Tcl_Obj const objv[]) / Argument strings. */
1855	1850	{
1856		Tk_Window mainWin = (Tk_Window) clientData;
	1851	Tk_Window mainWin = (Tk_Window)clientData;
1857	1852	int result, actualFormat;
1858	1853	unsigned long bytesAfter, length, value;
1859	1854	Atom actualType, propName;

1924	1919	*----------------------------------------------------------------------
1925	1920	*/
1926	1921
1927		/* ARGSUSED */
1928	1922	static int
1929	1923	TestwrapperObjCmd(
1930	1924	ClientData clientData, /* Main window for application. */

1940	1934	return TCL_ERROR;
1941	1935	}
1942	1936
1943		tkwin = (Tk_Window) clientData;
	1937	tkwin = (Tk_Window)clientData;
1944	1938	winPtr = (TkWindow *) Tk_NameToWindow(interp, Tcl_GetString(objv[1]), tkwin);
1945	1939	if (winPtr == NULL) {
1946	1940	return TCL_ERROR;

1977	1971	* CustomOptionSet Sets option value to new setting.
1978	1972	* CustomOptionGet Creates a new Tcl_Obj.
1979	1973	* CustomOptionRestore Resets option value to original value.
1980		* CustomOptionFree Free storage for internal rep of
1981		* option.
	1974	* CustomOptionFree Free storage for internal rep of option.
1982	1975	*
1983	1976	*----------------------------------------------------------------------
1984	1977	*/
1985	1978
1986	1979	static int
1987	1980	CustomOptionSet(
1988		ClientData clientData,
	1981	TCL_UNUSED(void *),
1989	1982	Tcl_Interp *interp,
1990		Tk_Window tkwin,
	1983	TCL_UNUSED(Tk_Window),
1991	1984	Tcl_Obj **value,
1992	1985	char *recordPtr,
1993	1986	int internalOffset,

2032	2025	if (internalPtr != NULL) {
2033	2026	if (*value != NULL) {
2034	2027	string = Tcl_GetString(*value);
2035		newStr = ckalloc((*value)->length + 1);
	2028	newStr = (char )ckalloc((value)->length + 1);
2036	2029	strcpy(newStr, string);
2037	2030	} else {
2038	2031	newStr = NULL;

2046	2039
2047	2040	static Tcl_Obj *
2048	2041	CustomOptionGet(
2049		ClientData clientData,
2050		Tk_Window tkwin,
	2042	TCL_UNUSED(void *),
	2043	TCL_UNUSED(Tk_Window),
2051	2044	char *recordPtr,
2052	2045	int internalOffset)
2053	2046	{

+73

-85

generic/tkText.c less more

13	13	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
14	14	*/
15	15
16		#include "default.h"
17	16	#include "tkInt.h"
18	17	#include "tkUndo.h"
	18	#include "default.h"
19	19
20	20	#if defined(MAC_OSX_TK)
21	21	#define Style TkStyle

460	460	int objc, /* Number of arguments. */
461	461	Tcl_Obj const objv[]) / Argument objects. */
462	462	{
463		Tk_Window tkwin = clientData;
	463	Tk_Window tkwin = (Tk_Window)clientData;
464	464
465	465	if (objc < 2) {
466	466	Tcl_WrongNumArgs(interp, 1, objv, "pathName ?-option value ...?");

501	501	int objc, /* Number of arguments. */
502	502	Tcl_Obj const objv[]) / Argument objects. */
503	503	{
504		register TkText *textPtr;
	504	TkText *textPtr;
505	505	Tk_OptionTable optionTable;
506	506	TkTextIndex startIndex;
507	507	Tk_Window newWin;

522	522	* and 'insert', 'current' mark pointers are all NULL to start.
523	523	*/
524	524
525		textPtr = ckalloc(sizeof(TkText));
	525	textPtr = (TkText *)ckalloc(sizeof(TkText));
526	526	memset(textPtr, 0, sizeof(TkText));
527	527
528	528	textPtr->tkwin = newWin;

533	533	textPtr, TextCmdDeletedProc);
534	534
535	535	if (sharedPtr == NULL) {
536		sharedPtr = ckalloc(sizeof(TkSharedText));
	536	sharedPtr = (TkSharedText *)ckalloc(sizeof(TkSharedText));
537	537	memset(sharedPtr, 0, sizeof(TkSharedText));
538	538
539	539	sharedPtr->refCount = 0;

631	631	*/
632	632
633	633	textPtr->selTagPtr = TkTextCreateTag(textPtr, "sel", NULL);
634		textPtr->selTagPtr->reliefString =
	634	textPtr->selTagPtr->reliefString = (char *)
635	635	ckalloc(sizeof(DEF_TEXT_SELECT_RELIEF));
636	636	strcpy(textPtr->selTagPtr->reliefString, DEF_TEXT_SELECT_RELIEF);
637	637	Tk_GetRelief(interp, DEF_TEXT_SELECT_RELIEF, &textPtr->selTagPtr->relief);

698	698	int objc, /* Number of arguments. */
699	699	Tcl_Obj const objv[]) / Argument objects. */
700	700	{
701		register TkText *textPtr = clientData;
	701	TkText textPtr = (TkText )clientData;
702	702	int result = TCL_OK;
703		int index;
	703	int idx;
704	704
705	705	static const char *const optionStrings[] = {
706	706	"bbox", "cget", "compare", "configure", "count", "debug", "delete",

723	723	}
724	724
725	725	if (Tcl_GetIndexFromObjStruct(interp, objv[1], optionStrings,
726		sizeof(char *), "option", 0, &index) != TCL_OK) {
	726	sizeof(char *), "option", 0, &idx) != TCL_OK) {
727	727	return TCL_ERROR;
728	728	}
729	729	textPtr->refCount++;
730	730
731		switch ((enum options) index) {
	731	switch ((enum options) idx) {
732	732	case TEXT_BBOX: {
733	733	int x, y, width, height;
734	734	const TkTextIndex *indexPtr;

863	863
864	864	for (i = 2; i < objc-2; i++) {
865	865	int value;
866		size_t length;
867		const char *option = Tcl_GetString(objv[i]);
	866	int length;
	867	const char *option = Tcl_GetStringFromObj(objv[i], &length);
868	868	char c;
869	869
870		length = objv[i]->length;
871	870	if (length < 2 \|\| option[0] != '-') {
872	871	goto badOption;
873	872	}

1125	1124
1126	1125	objc -= 2;
1127	1126	objv += 2;
1128		indices = ckalloc((objc + 1) * sizeof(TkTextIndex));
	1127	indices = (TkTextIndex )ckalloc((objc + 1) sizeof(TkTextIndex));
1129	1128
1130	1129	/*
1131	1130	* First pass verifies that all indices are valid.

1153	1152	COUNT_INDICES);
1154	1153	objc++;
1155	1154	}
1156		useIdx = ckalloc(objc);
1157		memset(useIdx, 0, (size_t) objc);
	1155	useIdx = (char *)ckalloc(objc);
	1156	memset(useIdx, 0, objc);
1158	1157
1159	1158	/*
1160	1159	* Do a decreasing order sort so that we delete the end ranges

1259	1258	Tcl_Obj *objPtr = NULL;
1260	1259	int i, found = 0, visible = 0;
1261	1260	const char *name;
1262		size_t length;
	1261	int length;
1263	1262
1264	1263	if (objc < 3) {
1265	1264	Tcl_WrongNumArgs(interp, 2, objv,

1275	1274
1276	1275	i = 2;
1277	1276	if (objc > 3) {
1278		name = Tcl_GetString(objv[i]);
1279		length = objv[i]->length;
	1277	name = Tcl_GetStringFromObj(objv[i], &length);
1280	1278	if (length > 1 && name[0] == '-') {
1281	1279	if (strncmp("-displaychars", name, length) == 0) {
1282	1280	i++;
1283	1281	visible = 1;
1284		name = Tcl_GetString(objv[i]);
1285		length = objv[i]->length;
	1282	name = Tcl_GetStringFromObj(objv[i], &length);
1286	1283	}
1287	1284	if ((i < objc-1) && (length == 2) && !strcmp("--", name)) {
1288	1285	i++;

1609	1606	int objc, /* Number of arguments. */
1610	1607	Tcl_Obj const objv[]) / Argument objects. */
1611	1608	{
1612		register TkSharedText *sharedPtr = clientData;
	1609	TkSharedText sharedPtr = (TkSharedText )clientData;
1613	1610	int result = TCL_OK;
1614	1611	int index;
1615	1612

1979	1976	for (hPtr = Tcl_FirstHashEntry(&sharedTextPtr->windowTable, &search);
1980	1977	hPtr != NULL; hPtr = Tcl_NextHashEntry(&search)) {
1981	1978	TkTextEmbWindowClient *loop;
1982		TkTextSegment *ewPtr = Tcl_GetHashValue(hPtr);
	1979	TkTextSegment ewPtr = (TkTextSegment )Tcl_GetHashValue(hPtr);
1983	1980
1984	1981	loop = ewPtr->body.ew.clients;
1985	1982	if (loop->textPtr == textPtr) {

2011	2008
2012	2009	for (hPtr = Tcl_FirstHashEntry(&sharedTextPtr->tagTable, &search);
2013	2010	hPtr != NULL; hPtr = Tcl_NextHashEntry(&search)) {
2014		tagPtr = Tcl_GetHashValue(hPtr);
	2011	tagPtr = (TkTextTag *)Tcl_GetHashValue(hPtr);
2015	2012
2016	2013	/*
2017	2014	* No need to use 'TkTextDeleteTag' since we've already removed

2077	2074	static int
2078	2075	ConfigureText(
2079	2076	Tcl_Interp interp, / Used for error reporting. */
2080		register TkText textPtr, / Information about widget; may or may not
	2077	TkText textPtr, / Information about widget; may or may not
2081	2078	* already have values for some fields. */
2082	2079	int objc, /* Number of arguments. */
2083	2080	Tcl_Obj const objv[]) / Argument objects. */

2380	2377	TextWorldChangedCallback(
2381	2378	ClientData instanceData) /* Information about widget. */
2382	2379	{
2383		TkText *textPtr = instanceData;
	2380	TkText textPtr = (TkText )instanceData;
2384	2381
2385	2382	TextWorldChanged(textPtr, TK_TEXT_LINE_GEOMETRY);
2386	2383	}

2469	2466	static void
2470	2467	TextEventProc(
2471	2468	ClientData clientData, /* Information about window. */
2472		register XEvent eventPtr) / Information about event. */
	2469	XEvent eventPtr) / Information about event. */
2473	2470	{
2474		register TkText *textPtr = clientData;
	2471	TkText textPtr = (TkText )clientData;
2475	2472	TkTextIndex index, index2;
2476	2473
2477	2474	if (eventPtr->type == Expose) {

2580	2577	TextCmdDeletedProc(
2581	2578	ClientData clientData) /* Pointer to widget record for widget. */
2582	2579	{
2583		TkText *textPtr = clientData;
	2580	TkText textPtr = (TkText )clientData;
2584	2581	Tk_Window tkwin = textPtr->tkwin;
2585	2582
2586	2583	/*

2633	2630	int viewUpdate) /* Update the view if set. */
2634	2631	{
2635	2632	int lineIndex;
2636		size_t length;
	2633	int length;
2637	2634	TkText *tPtr;
2638	2635	int *lineAndByteIndex;
2639	2636	int resetViewCount;
2640	2637	int pixels[2*PIXEL_CLIENTS];
2641		const char *string = Tcl_GetString(stringPtr);
2642
2643		length = stringPtr->length;
	2638	const char *string = Tcl_GetStringFromObj(stringPtr, &length);
	2639
2644	2640	if (sharedTextPtr == NULL) {
2645	2641	sharedTextPtr = textPtr->sharedTextPtr;
2646	2642	}

2666	2662
2667	2663	resetViewCount = 0;
2668	2664	if (sharedTextPtr->refCount > PIXEL_CLIENTS) {
2669		lineAndByteIndex = ckalloc(sizeof(int) * 2 * sharedTextPtr->refCount);
	2665	lineAndByteIndex = (int )ckalloc(sizeof(int) 2 * sharedTextPtr->refCount);
2670	2666	} else {
2671	2667	lineAndByteIndex = pixels;
2672	2668	}

2915	2911	Tcl_Obj objPtr) / Arguments of a command to be handled by the
2916	2912	* shared text data structure. */
2917	2913	{
2918		TkSharedText *sharedPtr = clientData;
	2914	TkSharedText sharedPtr = (TkSharedText )clientData;
2919	2915	int res, objc;
2920	2916	Tcl_Obj **objv;
2921	2917	TkText *textPtr;

3127	3123	line2 = TkBTreeLinesTo(textPtr, index2.linePtr);
3128	3124	if (line2 == TkBTreeNumLines(sharedTextPtr->tree, textPtr)) {
3129	3125	TkTextTag **arrayPtr;
3130		int arraySize, i;
	3126	int arraySize;
3131	3127	TkTextIndex oldIndex2;
3132	3128
3133	3129	oldIndex2 = index2;

3154	3150
3155	3151	for (i=0, hPtr=Tcl_FirstHashEntry(&sharedTextPtr->tagTable, &search);
3156	3152	hPtr != NULL; i++, hPtr = Tcl_NextHashEntry(&search)) {
3157		TkTextTag *tagPtr = Tcl_GetHashValue(hPtr);
3158
3159		TkBTreeTag(&index1, &index2, tagPtr, 0);
	3153	TkBTreeTag(&index1, &index2, (TkTextTag *)Tcl_GetHashValue(hPtr), 0);
3160	3154	}
3161	3155
3162	3156	/*

3190	3184
3191	3185	resetViewCount = 0;
3192	3186	if (sharedTextPtr->refCount > PIXEL_CLIENTS) {
3193		lineAndByteIndex = ckalloc(sizeof(int) * 2 * sharedTextPtr->refCount);
	3187	lineAndByteIndex = (int )ckalloc(sizeof(int) 2 * sharedTextPtr->refCount);
3194	3188	} else {
3195	3189	lineAndByteIndex = pixels;
3196	3190	}

3379	3373	* not including terminating NULL
3380	3374	* character. */
3381	3375	{
3382		register TkText *textPtr = clientData;
	3376	TkText textPtr = (TkText )clientData;
3383	3377	TkTextIndex eof;
3384	3378	int count, chunkSize, offsetInSeg;
3385	3379	TkTextSearch search;

3463	3457	if ((segPtr->typePtr == &tkTextCharType)
3464	3458	&& !TkTextIsElided(textPtr, &textPtr->selIndex, NULL)) {
3465	3459	memcpy(buffer, segPtr->body.chars + offsetInSeg,
3466		(size_t) chunkSize);
	3460	chunkSize);
3467	3461	buffer += chunkSize;
3468	3462	maxBytes -= chunkSize;
3469	3463	count += chunkSize;

3510	3504	TkTextLostSelection(
3511	3505	ClientData clientData) /* Information about text widget. */
3512	3506	{
3513		register TkText *textPtr = clientData;
	3507	TkText textPtr = (TkText )clientData;
3514	3508
3515	3509	if (TkpAlwaysShowSelection(textPtr->tkwin)) {
3516	3510	TkTextIndex start, end;

3595	3589	TextBlinkProc(
3596	3590	ClientData clientData) /* Pointer to record describing text. */
3597	3591	{
3598		register TkText *textPtr = clientData;
	3592	TkText textPtr = (TkText )clientData;
3599	3593	TkTextIndex index;
3600	3594	int x, y, w, h, charWidth;
3601	3595

3975	3969	{
3976	3970	const TkTextIndex *indexPtr;
3977	3971	int line;
3978		TkText *textPtr = searchSpecPtr->clientData;
	3972	TkText textPtr = (TkText )searchSpecPtr->clientData;
3979	3973
3980	3974	indexPtr = TkTextGetIndexFromObj(interp, textPtr, objPtr);
3981	3975	if (indexPtr == NULL) {

4040	4034	TkTextSegment *segPtr;
4041	4035	TkTextIndex curIndex;
4042	4036	int index, leftToScan;
4043		TkText *textPtr = searchSpecPtr->clientData;
	4037	TkText textPtr = (TkText )searchSpecPtr->clientData;
4044	4038
4045	4039	index = 0;
4046	4040	curIndex.tree = textPtr->sharedTextPtr->tree;

4110	4104	TkTextLine linePtr, thisLinePtr;
4111	4105	TkTextIndex curIndex;
4112	4106	TkTextSegment *segPtr;
4113		TkText *textPtr = searchSpecPtr->clientData;
	4107	TkText textPtr = (TkText )searchSpecPtr->clientData;
4114	4108	int nothingYet = 1;
4115	4109
4116	4110	/*

4232	4226	TkTextIndex curIndex, foundIndex;
4233	4227	TkTextSegment *segPtr;
4234	4228	TkTextLine *linePtr;
4235		TkText *textPtr = searchSpecPtr->clientData;
	4229	TkText textPtr = (TkText )searchSpecPtr->clientData;
4236	4230
4237	4231	if (lineNum == searchSpecPtr->stopLine) {
4238	4232	/*

4283	4277	* reached the end of the match or we have reached the end of the line.
4284	4278	*/
4285	4279
4286		linePtr = clientData;
	4280	linePtr = (TkTextLine *)clientData;
4287	4281	if (linePtr == NULL) {
4288	4282	linePtr = TkBTreeFindLine(textPtr->sharedTextPtr->tree, textPtr,
4289	4283	lineNum);

4493	4487	* Parse the elements of the list one at a time to fill in the array.
4494	4488	*/
4495	4489
4496		tabArrayPtr = ckalloc(sizeof(TkTextTabArray)
4497		+ (count - 1) * sizeof(TkTextTab));
	4490	tabArrayPtr = (TkTextTabArray *)ckalloc(Tk_Offset(TkTextTabArray, tabs)
	4491	+ count * sizeof(TkTextTab));
4498	4492	tabArrayPtr->numTabs = 0;
4499	4493	prevStop = 0.0;
4500	4494	lastStop = 0.0;

4620	4614
4621	4615	static int
4622	4616	TextDumpCmd(
4623		register TkText textPtr, / Information about text widget. */
	4617	TkText textPtr, / Information about text widget. */
4624	4618	Tcl_Interp interp, / Current interpreter. */
4625	4619	int objc, /* Number of arguments. */
4626	4620	Tcl_Obj const objv[]) / Argument objects. Someone else has already

4707	4701	if (objc == arg) {
4708	4702	TkTextIndexForwChars(NULL, &index1, 1, &index2, COUNT_INDICES);
4709	4703	} else {
4710		size_t length;
	4704	int length;
4711	4705	const char *str;
4712	4706
4713	4707	if (TkTextGetObjIndex(interp, textPtr, objv[arg], &index2) != TCL_OK) {
4714	4708	return TCL_ERROR;
4715	4709	}
4716		str = Tcl_GetString(objv[arg]);
4717		length = objv[arg]->length;
	4710	str = Tcl_GetStringFromObj(objv[arg], &length);
4718	4711	if (strncmp(str, "end", length) == 0) {
4719	4712	atEnd = 1;
4720	4713	}

4858	4851	*/
4859	4852
4860	4853	int length = last - first;
4861		char *range = ckalloc(length + 1);
	4854	char range = (char )ckalloc(length + 1);
4862	4855
4863	4856	memcpy(range, segPtr->body.chars + first, length);
4864	4857	range[length] = '\0';

4889	4882	name = NULL;
4890	4883	lineChanged = 0;
4891	4884	} else {
4892		name = Tcl_GetHashKey(&textPtr->sharedTextPtr->markTable,
	4885	name = (const char *)Tcl_GetHashKey(&textPtr->sharedTextPtr->markTable,
4893	4886	markPtr->hPtr);
4894	4887	}
4895	4888	if (name != NULL) {

5015	5008	const char value, / Segment value. */
5016	5009	Tcl_Obj command, / Script callback. */
5017	5010	const TkTextIndex index, / index with line/byte position info. */
5018		int what) /* Look for TK_DUMP_INDEX bit. */
	5011	TCL_UNUSED(int)) /* Look for TK_DUMP_INDEX bit. */
5019	5012	{
5020	5013	char buffer[TK_POS_CHARS];
5021	5014	Tcl_Obj values[3], tuple;

5038	5031	Tcl_DStringAppend(&buf, Tcl_GetString(command), -1);
5039	5032	Tcl_DStringAppend(&buf, " ", -1);
5040	5033	Tcl_DStringAppend(&buf, Tcl_GetString(tuple), -1);
5041		code = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), -1, 0);
	5034	code = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), -1, TCL_EVAL_GLOBAL);
5042	5035	Tcl_DStringFree(&buf);
5043	5036	if (code != TCL_OK) {
5044	5037	Tcl_AddErrorInfo(interp,

5319	5312	* Tcl_AppendToObj more carefully (e.g. if we know we are going to be
5320	5313	* appending several thousand lines, we could attempt to pre-allocate a
5321	5314	* larger space).
5322		*
5323		* Also the result is built up as a utf-8 string, but, if we knew we
5324		* wanted it as Unicode, we could potentially save a huge conversion by
5325		* building it up as Unicode directly. This could be as simple as
5326		* replacing Tcl_NewObj by Tcl_NewUnicodeObj.
5327	5315	*
5328	5316	* Results:
5329	5317	* Tcl_Obj of string type containing the specified text. If the

5522	5510	TkTextRunAfterSyncCmd(
5523	5511	ClientData clientData) /* Information about text widget. */
5524	5512	{
5525		register TkText textPtr = (TkText ) clientData;
	5513	TkText textPtr = (TkText )clientData;
5526	5514	int code;
5527	5515
5528	5516	if ((textPtr->tkwin == NULL) \|\| (textPtr->flags & DESTROYED)) {

5596	5584
5597	5585	if (toPtr != NULL) {
5598	5586	const TkTextIndex indexToPtr, indexFromPtr;
5599		TkText *textPtr = searchSpecPtr->clientData;
	5587	TkText textPtr = (TkText )searchSpecPtr->clientData;
5600	5588
5601	5589	indexToPtr = TkTextGetIndexFromObj(interp, textPtr, toPtr);
5602	5590	if (indexToPtr == NULL) {

5677	5665	* they are Unicode char offsets.
5678	5666	*/
5679	5667
5680		int firstOffset, lastOffset, matchOffset, matchLength;
	5668	int firstOffset, lastOffset;
	5669	int matchOffset, matchLength;
5681	5670	int passes;
5682	5671	int lineNum = searchSpecPtr->startLine;
5683	5672	int code = TCL_OK;

5750	5739	* it has dual purpose.
5751	5740	*/
5752	5741
5753		pattern = Tcl_GetString(patObj);
5754		matchLength = patObj->length;
	5742	pattern = Tcl_GetStringFromObj(patObj, &matchLength);
5755	5743	nl = strchr(pattern, '\n');
5756	5744
5757	5745	/*

5920	5908	}
5921	5909	while (p >= startOfLine + firstOffset) {
5922	5910	if (matchLength == 0 \|\| (p[0] == c && !strncmp(
5923		p, pattern, (size_t) matchLength))) {
	5911	p, pattern, matchLength))) {
5924	5912	goto backwardsMatch;
5925	5913	}
5926	5914	p--;

5949	5937	*/
5950	5938
5951	5939	p = startOfLine + lastOffset - firstNewLine - 1;
5952		if (strncmp(p, pattern, (unsigned) firstNewLine + 1)) {
	5940	if (strncmp(p, pattern, firstNewLine + 1)) {
5953	5941	/*
5954	5942	* No match.
5955	5943	*/

6015	6003	* result.
6016	6004	*/
6017	6005
6018		if (strncmp(p,pattern,(size_t)matchLength)) {
	6006	if (strncmp(p, pattern, matchLength)) {
6019	6007	p = NULL;
6020	6008	}
6021	6009	break;

6263	6251	*/
6264	6252
6265	6253	if ((match &&
6266		firstOffset+info.matches[0].end != lastTotal &&
6267		firstOffset+info.matches[0].end < prevFullLine)
	6254	firstOffset + info.matches[0].end != lastTotal &&
	6255	firstOffset + info.matches[0].end < prevFullLine)
6268	6256	\|\| info.extendStart < 0) {
6269	6257	break;
6270	6258	}

6333	6321	* Possible overlap or enclosure.
6334	6322	*/
6335	6323
6336		if (thisOffset-lastNonOverlap >=
6337		lastBackwardsMatchOffset+matchLength){
	6324	if (thisOffset - lastNonOverlap >=
	6325	lastBackwardsMatchOffset + matchLength){
6338	6326	/*
6339	6327	* Totally encloses previous match, so
6340	6328	* forget the previous match.

6438	6426	* matches on the heap.
6439	6427	*/
6440	6428
6441		int *newArray =
	6429	int newArray = (int )
6442	6430	ckalloc(4 * matchNum * sizeof(int));
6443	6431	memcpy(newArray, storeMatch, matchNum*sizeof(int));
6444	6432	memcpy(newArray + 2*matchNum, storeLength,

6699	6687
6700	6688	static Tcl_Obj *
6701	6689	GetLineStartEnd(
6702		ClientData clientData,
6703		Tk_Window tkwin,
	6690	TCL_UNUSED(void *),
	6691	TCL_UNUSED(Tk_Window),
6704	6692	char recordPtr, / Pointer to widget record. */
6705	6693	int internalOffset) /* Offset within *recordPtr containing the
6706	6694	* line value. */

6734	6722
6735	6723	static int
6736	6724	SetLineStartEnd(
6737		ClientData clientData,
	6725	TCL_UNUSED(void *),
6738	6726	Tcl_Interp interp, / Current interp; may be used for errors. */
6739		Tk_Window tkwin, /* Window for which option is being set. */
	6727	TCL_UNUSED(Tk_Window), /* Window for which option is being set. */
6740	6728	Tcl_Obj *value, / Pointer to the pointer to the value object.
6741	6729	* We use a pointer to the pointer because we
6742	6730	* may need to return a value (NULL). */

6793	6781
6794	6782	static void
6795	6783	RestoreLineStartEnd(
6796		ClientData clientData,
6797		Tk_Window tkwin,
	6784	TCL_UNUSED(void *),
	6785	TCL_UNUSED(Tk_Window),
6798	6786	char internalPtr, / Pointer to storage for value. */
6799	6787	char oldInternalPtr) / Pointer to old value. */
6800	6788	{

6852	6840
6853	6841	int
6854	6842	TkpTesttextCmd(
6855		ClientData clientData, /* Main window for application. */
	6843	TCL_UNUSED(void ), / Main window for application. */
6856	6844	Tcl_Interp interp, / Current interpreter. */
6857	6845	int objc, /* Number of arguments. */
6858	6846	Tcl_Obj const objv[]) / Argument strings. */

6871	6859	if (Tcl_GetCommandInfo(interp, Tcl_GetString(objv[1]), &info) == 0) {
6872	6860	return TCL_ERROR;
6873	6861	}
6874		textPtr = info.objClientData;
	6862	textPtr = (TkText *)info.objClientData;
6875	6863	len = strlen(Tcl_GetString(objv[2]));
6876	6864	if (strncmp(Tcl_GetString(objv[2]), "byteindex", len) == 0) {
6877	6865	if (objc != 5) {

+2

-2

generic/tkText.h less more

167	167	int size; /* Size of this segment (# of bytes of index
168	168	* space it occupies). */
169	169	union {
170		char chars[2]; /* Characters that make up character info.
	170	char chars[TKFLEXARRAY]; /* Characters that make up character info.
171	171	* Actual length varies to hold as many
172	172	* characters as needed.*/
173	173	TkTextToggle toggle; /* Information about tag toggle. */

488	488	double tabIncrement; /* The accurate fractional pixel increment
489	489	* between interpolated tabs we have to create
490	490	* when we exceed numTabs. */
491		TkTextTab tabs[1]; /* Array of tabs. The actual size will be
	491	TkTextTab tabs[TKFLEXARRAY];/* Array of tabs. The actual size will be
492	492	* numTabs. THIS FIELD MUST BE THE LAST IN THE
493	493	* STRUCTURE. */
494	494	} TkTextTabArray;

+151

-162

generic/tkTextBTree.c less more

139	139	* Macros that determine how much space to allocate for new segments:
140	140	*/
141	141
142		#define CSEG_SIZE(chars) ((unsigned) (Tk_Offset(TkTextSegment, body) \
	142	#define CSEG_SIZE(chars) ((unsigned)(Tk_Offset(TkTextSegment, body) \
143	143	+ 1 + (chars)))
144		#define TSEG_SIZE ((unsigned) (Tk_Offset(TkTextSegment, body) \
	144	#define TSEG_SIZE ((unsigned)(Tk_Offset(TkTextSegment, body) \
145	145	+ sizeof(TkTextToggle)))
146	146
147	147	/*

260	260	TkBTreeCreate(
261	261	TkSharedText *sharedTextPtr)
262	262	{
263		register BTree *treePtr;
264		register Node *rootPtr;
265		register TkTextLine linePtr, linePtr2;
266		register TkTextSegment *segPtr;
	263	BTree *treePtr;
	264	Node *rootPtr;
	265	TkTextLine linePtr, linePtr2;
	266	TkTextSegment *segPtr;
267	267
268	268	/*
269	269	* The tree will initially have two empty lines. The second line isn't

272	272	* of the tree.
273	273	*/
274	274
275		rootPtr = ckalloc(sizeof(Node));
276		linePtr = ckalloc(sizeof(TkTextLine));
277		linePtr2 = ckalloc(sizeof(TkTextLine));
	275	rootPtr = (Node *)ckalloc(sizeof(Node));
	276	linePtr = (TkTextLine *)ckalloc(sizeof(TkTextLine));
	277	linePtr2 = (TkTextLine *)ckalloc(sizeof(TkTextLine));
278	278
279	279	rootPtr->parentPtr = NULL;
280	280	rootPtr->nextPtr = NULL;

295	295
296	296	linePtr->parentPtr = rootPtr;
297	297	linePtr->nextPtr = linePtr2;
298		segPtr = ckalloc(CSEG_SIZE(1));
	298	segPtr = (TkTextSegment *)ckalloc(CSEG_SIZE(1));
299	299	linePtr->segPtr = segPtr;
300	300	segPtr->typePtr = &tkTextCharType;
301	301	segPtr->nextPtr = NULL;

305	305
306	306	linePtr2->parentPtr = rootPtr;
307	307	linePtr2->nextPtr = NULL;
308		segPtr = ckalloc(CSEG_SIZE(1));
	308	segPtr = (TkTextSegment *)ckalloc(CSEG_SIZE(1));
309	309	linePtr2->segPtr = segPtr;
310	310	segPtr->typePtr = &tkTextCharType;
311	311	segPtr->nextPtr = NULL;

313	313	segPtr->body.chars[0] = '\n';
314	314	segPtr->body.chars[1] = 0;
315	315
316		treePtr = ckalloc(sizeof(BTree));
	316	treePtr = (BTree *)ckalloc(sizeof(BTree));
317	317	treePtr->sharedTextPtr = sharedTextPtr;
318	318	treePtr->rootPtr = rootPtr;
319	319	treePtr->clients = 0;

365	365	int defaultHeight) /* Default line height for the new client, or
366	366	* -1 if no pixel heights are to be kept. */
367	367	{
368		register BTree treePtr = (BTree ) tree;
	368	BTree treePtr = (BTree ) tree;
369	369
370	370	if (treePtr == NULL) {
371	371	Tcl_Panic("NULL treePtr in TkBTreeAddClient");

631	631	i++;
632	632	}
633	633	treePtr->startEndCount = count;
634		treePtr->startEnd = ckrealloc(treePtr->startEnd,
	634	treePtr->startEnd = (TkTextLine **)ckrealloc(treePtr->startEnd,
635	635	sizeof(TkTextLine ) count);
636		treePtr->startEndRef = ckrealloc(treePtr->startEndRef,
	636	treePtr->startEndRef = (TkText **)ckrealloc(treePtr->startEndRef,
637	637	sizeof(TkText ) count);
638	638	}
639	639	if ((action & TEXT_ADD_REFS)

649	649
650	650	count = treePtr->startEndCount;
651	651
652		treePtr->startEnd = ckrealloc(treePtr->startEnd,
	652	treePtr->startEnd = (TkTextLine **)ckrealloc(treePtr->startEnd,
653	653	sizeof(TkTextLine ) count);
654		treePtr->startEndRef = ckrealloc(treePtr->startEndRef,
	654	treePtr->startEndRef = (TkText **)ckrealloc(treePtr->startEndRef,
655	655	sizeof(TkText ) count);
656	656
657	657	if (textPtr->start != NULL) {

724	724	loopPtr = loopPtr->nextPtr;
725	725	}
726	726	} else {
727		register TkTextLine *linePtr = nodePtr->children.linePtr;
	727	TkTextLine *linePtr = nodePtr->children.linePtr;
728	728
729	729	while (linePtr != NULL) {
730	730	if (!*counting && (linePtr == start)) {

734	734	*counting = 0;
735	735	}
736	736	if (newPixelReferences != treePtr->pixelReferences) {
737		linePtr->pixels = ckrealloc(linePtr->pixels,
	737	linePtr->pixels = (int *)ckrealloc(linePtr->pixels,
738	738	sizeof(int) * 2 * newPixelReferences);
739	739	}
740	740

751	751	}
752	752	}
753	753	if (newPixelReferences != treePtr->pixelReferences) {
754		nodePtr->numPixels = ckrealloc(nodePtr->numPixels,
	754	nodePtr->numPixels = (int *)ckrealloc(nodePtr->numPixels,
755	755	sizeof(int) * newPixelReferences);
756	756	}
757	757	nodePtr->numPixels[useReference] = pixelCount;

801	801	ckfree(nodePtr->numPixels);
802	802	nodePtr->numPixels = NULL;
803	803	} else {
804		nodePtr->numPixels = ckrealloc(nodePtr->numPixels,
	804	nodePtr->numPixels = (int *)ckrealloc(nodePtr->numPixels,
805	805	sizeof(int) * (treePtr->pixelReferences - 1));
806	806	}
807	807	if (nodePtr->level != 0) {

811	811	nodePtr = nodePtr->nextPtr;
812	812	}
813	813	} else {
814		register TkTextLine *linePtr = nodePtr->children.linePtr;
	814	TkTextLine *linePtr = nodePtr->children.linePtr;
815	815	while (linePtr != NULL) {
816	816	if (overwriteWithLast != -1) {
817	817	linePtr->pixels[2*overwriteWithLast] =

822	822	if (treePtr->pixelReferences == 1) {
823	823	linePtr->pixels = NULL;
824	824	} else {
825		linePtr->pixels = ckrealloc(linePtr->pixels,
	825	linePtr->pixels = (int *)ckrealloc(linePtr->pixels,
826	826	sizeof(int) * 2 * (treePtr->pixelReferences-1));
827	827	}
828	828	linePtr = linePtr->nextPtr;

849	849
850	850	static void
851	851	DestroyNode(
852		register Node nodePtr) / Destroy from this node downwards. */
	852	Node nodePtr) / Destroy from this node downwards. */
853	853	{
854	854	if (nodePtr->level == 0) {
855	855	TkTextLine *linePtr;

867	867	ckfree(linePtr);
868	868	}
869	869	} else {
870		register Node *childPtr;
	870	Node *childPtr;
871	871
872	872	while (nodePtr->children.nodePtr != NULL) {
873	873	childPtr = nodePtr->children.nodePtr;

899	899
900	900	static void
901	901	DeleteSummaries(
902		register Summary *summaryPtr)
	902	Summary *summaryPtr)
903	903	/* First in list of node's tag summaries. */
904	904	{
905		register Summary *nextPtr;
	905	Summary *nextPtr;
906	906
907	907	while (summaryPtr != NULL) {
908	908	nextPtr = summaryPtr->nextPtr;

931	931	int
932	932	TkBTreeAdjustPixelHeight(
933	933	const TkText textPtr, / Client of the B-tree. */
934		register TkTextLine *linePtr,
	934	TkTextLine *linePtr,
935	935	/* The logical line to update. */
936	936	int newPixelHeight, /* The line's known height in pixels. */
937	937	int mergedLogicalLines) /* The number of extra logical lines which

941	941	* height associated with the given
942	942	* linePtr. */
943	943	{
944		register Node *nodePtr;
	944	Node *nodePtr;
945	945	int changeToPixelCount; /* Counts change to total number of pixels in
946	946	* file. */
947	947	int pixelReference = textPtr->pixelReference;

1000	1000	void
1001	1001	TkBTreeInsertChars(
1002	1002	TkTextBTree tree, /* Tree to insert into. */
1003		register TkTextIndex *indexPtr,
	1003	TkTextIndex *indexPtr,
1004	1004	/* Indicates where to insert text. When the
1005	1005	* function returns, this index is no longer
1006	1006	* valid because of changes to the segment

1008	1008	const char string) / Pointer to bytes to insert (may contain
1009	1009	* newlines, must be null-terminated). */
1010	1010	{
1011		register Node *nodePtr;
1012		register TkTextSegment *prevPtr;
	1011	Node *nodePtr;
	1012	TkTextSegment *prevPtr;
1013	1013	/* The segment just before the first new
1014	1014	* segment (NULL means new segment is at
1015	1015	* beginning of line). */

1018	1018	* insert at beginning of line. */
1019	1019	TkTextLine linePtr; / Current line (new segments are added to
1020	1020	* this line). */
1021		register TkTextSegment *segPtr;
	1021	TkTextSegment *segPtr;
1022	1022	TkTextLine *newLinePtr;
1023	1023	int chunkSize; /* # characters in current chunk. */
1024		register const char eol; / Pointer to character just after last one in
	1024	const char eol; / Pointer to character just after last one in
1025	1025	* current chunk. */
1026	1026	int changeToLineCount; /* Counts change to total number of lines in
1027	1027	* file. */

1043	1043
1044	1044	changeToLineCount = 0;
1045	1045	if (treePtr->pixelReferences > PIXEL_CLIENTS) {
1046		changeToPixelCount = ckalloc(sizeof(int) * treePtr->pixelReferences);
	1046	changeToPixelCount = (int )ckalloc(sizeof(int) treePtr->pixelReferences);
1047	1047	} else {
1048	1048	changeToPixelCount = pixels;
1049	1049	}

1059	1059	}
1060	1060	}
1061	1061	chunkSize = eol-string;
1062		segPtr = ckalloc(CSEG_SIZE(chunkSize));
	1062	segPtr = (TkTextSegment *)ckalloc(CSEG_SIZE(chunkSize));
1063	1063	segPtr->typePtr = &tkTextCharType;
1064	1064	if (curPtr == NULL) {
1065	1065	segPtr->nextPtr = linePtr->segPtr;

1069	1069	curPtr->nextPtr = segPtr;
1070	1070	}
1071	1071	segPtr->size = chunkSize;
1072		memcpy(segPtr->body.chars, string, (size_t) chunkSize);
	1072	memcpy(segPtr->body.chars, string, chunkSize);
1073	1073	segPtr->body.chars[chunkSize] = 0;
1074	1074
1075	1075	if (eol[-1] != '\n') {

1081	1081	* the remainder of the old line to it.
1082	1082	*/
1083	1083
1084		newLinePtr = ckalloc(sizeof(TkTextLine));
1085		newLinePtr->pixels =
	1084	newLinePtr = (TkTextLine *)ckalloc(sizeof(TkTextLine));
	1085	newLinePtr->pixels = (int *)
1086	1086	ckalloc(sizeof(int) * 2 * treePtr->pixelReferences);
1087	1087
1088	1088	newLinePtr->parentPtr = linePtr->parentPtr;

1311	1311	void
1312	1312	TkBTreeDeleteIndexRange(
1313	1313	TkTextBTree tree, /* Tree to delete from. */
1314		register TkTextIndex *index1Ptr,
	1314	TkTextIndex *index1Ptr,
1315	1315	/* Indicates first character that is to be
1316	1316	* deleted. */
1317		register TkTextIndex *index2Ptr)
	1317	TkTextIndex *index2Ptr)
1318	1318	/* Indicates character just after the last one
1319	1319	* that is to be deleted. */
1320	1320	{

1595	1595	int line) /* Index of desired line. */
1596	1596	{
1597	1597	BTree treePtr = (BTree ) tree;
1598		register Node *nodePtr;
1599		register TkTextLine *linePtr;
	1598	Node *nodePtr;
	1599	TkTextLine *linePtr;
1600	1600
1601	1601	if (treePtr == NULL) {
1602	1602	treePtr = (BTree *) textPtr->sharedTextPtr->tree;

1685	1685	int pixelOffset) / Used to return offset. */
1686	1686	{
1687	1687	BTree treePtr = (BTree ) tree;
1688		register Node *nodePtr;
1689		register TkTextLine *linePtr;
	1688	Node *nodePtr;
	1689	TkTextLine *linePtr;
1690	1690	int pixelReference = textPtr->pixelReference;
1691	1691
1692	1692	nodePtr = treePtr->rootPtr;

1754	1754	TkTextLine *
1755	1755	TkBTreeNextLine(
1756	1756	const TkText textPtr, / Next line in the context of this client. */
1757		register TkTextLine *linePtr)
	1757	TkTextLine *linePtr)
1758	1758	/* Pointer to existing line in B-tree. */
1759	1759	{
1760		register Node *nodePtr;
	1760	Node *nodePtr;
1761	1761
1762	1762	if (linePtr->nextPtr != NULL) {
1763	1763	if (textPtr != NULL && (linePtr == textPtr->end)) {

1810	1810	TkTextLine *
1811	1811	TkBTreePreviousLine(
1812	1812	TkText textPtr, / Relative to this client of the B-tree. */
1813		register TkTextLine *linePtr)
	1813	TkTextLine *linePtr)
1814	1814	/* Pointer to existing line in B-tree. */
1815	1815	{
1816		register Node *nodePtr;
1817		register Node *node2Ptr;
1818		register TkTextLine *prevPtr;
	1816	Node *nodePtr;
	1817	Node *node2Ptr;
	1818	TkTextLine *prevPtr;
1819	1819
1820	1820	if (textPtr != NULL && textPtr->start == linePtr) {
1821	1821	return NULL;

1894	1894	const TkText textPtr, / Relative to this client of the B-tree. */
1895	1895	TkTextLine linePtr) / Pointer to existing line in B-tree. */
1896	1896	{
1897		register TkTextLine *linePtr2;
1898		register Node nodePtr, parentPtr;
	1897	TkTextLine *linePtr2;
	1898	Node nodePtr, parentPtr;
1899	1899	int index;
1900	1900	int pixelReference = textPtr->pixelReference;
1901	1901

1920	1920
1921	1921	for (parentPtr = nodePtr->parentPtr ; parentPtr != NULL;
1922	1922	nodePtr = parentPtr, parentPtr = parentPtr->parentPtr) {
1923		register Node *nodePtr2;
	1923	Node *nodePtr2;
1924	1924
1925	1925	for (nodePtr2 = parentPtr->children.nodePtr; nodePtr2 != nodePtr;
1926	1926	nodePtr2 = nodePtr2->nextPtr) {

1956	1956	const TkText textPtr, / Relative to this client of the B-tree. */
1957	1957	TkTextLine linePtr) / Pointer to existing line in B-tree. */
1958	1958	{
1959		register TkTextLine *linePtr2;
1960		register Node nodePtr, parentPtr, *nodePtr2;
	1959	TkTextLine *linePtr2;
	1960	Node nodePtr, parentPtr, *nodePtr2;
1961	1961	int index;
1962	1962
1963	1963	/*

2036	2036	*----------------------------------------------------------------------
2037	2037	*/
2038	2038
2039		/* ARGSUSED */
2040	2039	void
2041	2040	TkBTreeLinkSegment(
2042	2041	TkTextSegment segPtr, / Pointer to new segment to be added to

2045	2044	TkTextIndex indexPtr) / Where to add segment: it gets linked in
2046	2045	* just before the segment indicated here. */
2047	2046	{
2048		register TkTextSegment *prevPtr;
	2047	TkTextSegment *prevPtr;
2049	2048
2050	2049	prevPtr = SplitSeg(indexPtr);
2051	2050	if (prevPtr == NULL) {

2079	2078	*----------------------------------------------------------------------
2080	2079	*/
2081	2080
2082		/* ARGSUSED */
2083	2081	void
2084	2082	TkBTreeUnlinkSegment(
2085	2083	TkTextSegment segPtr, / Segment to be unlinked. */
2086	2084	TkTextLine linePtr) / Line that currently contains segment. */
2087	2085	{
2088		register TkTextSegment *prevPtr;
	2086	TkTextSegment *prevPtr;
2089	2087
2090	2088	if (linePtr->segPtr == segPtr) {
2091	2089	linePtr->segPtr = segPtr->nextPtr;

2134	2132
2135	2133	int
2136	2134	TkBTreeTag(
2137		register TkTextIndex *index1Ptr,
	2135	TkTextIndex *index1Ptr,
2138	2136	/* Indicates first character in range. */
2139		register TkTextIndex *index2Ptr,
	2137	TkTextIndex *index2Ptr,
2140	2138	/* Indicates character just after the last one
2141	2139	* in range. */
2142	2140	TkTextTag tagPtr, / Tag to add or remove. */

2156	2154
2157	2155	oldState = TkBTreeCharTagged(index1Ptr, tagPtr);
2158	2156	if ((add != 0) ^ oldState) {
2159		segPtr = ckalloc(TSEG_SIZE);
	2157	segPtr = (TkTextSegment *)ckalloc(TSEG_SIZE);
2160	2158	segPtr->typePtr = (add) ? &tkTextToggleOnType : &tkTextToggleOffType;
2161	2159	prevPtr = SplitSeg(index1Ptr);
2162	2160	if (prevPtr == NULL) {

2227	2225	}
2228	2226	}
2229	2227	if ((add != 0) ^ oldState) {
2230		segPtr = ckalloc(TSEG_SIZE);
	2228	segPtr = (TkTextSegment *)ckalloc(TSEG_SIZE);
2231	2229	segPtr->typePtr = (add) ? &tkTextToggleOffType : &tkTextToggleOnType;
2232	2230	prevPtr = SplitSeg(index2Ptr);
2233	2231	if (prevPtr == NULL) {

2284	2282
2285	2283	static void
2286	2284	ChangeNodeToggleCount(
2287		register Node nodePtr, / Node whose toggle count for a tag must be
	2285	Node nodePtr, / Node whose toggle count for a tag must be
2288	2286	* changed. */
2289	2287	TkTextTag tagPtr, / Information about tag. */
2290	2288	int delta) /* Amount to add to current toggle count for
2291	2289	* tag (may be negative). */
2292	2290	{
2293		register Summary summaryPtr, prevPtr;
2294		register Node *node2Ptr;
	2291	Summary summaryPtr, prevPtr;
	2292	Node *node2Ptr;
2295	2293	int rootLevel; /* Level of original tag root. */
2296	2294
2297	2295	tagPtr->toggleCount += delta;

2371	2369
2372	2370	Node *rootNodePtr = tagPtr->tagRootPtr;
2373	2371
2374		summaryPtr = ckalloc(sizeof(Summary));
	2372	summaryPtr = (Summary *)ckalloc(sizeof(Summary));
2375	2373	summaryPtr->tagPtr = tagPtr;
2376	2374	summaryPtr->toggleCount = tagPtr->toggleCount - delta;
2377	2375	summaryPtr->nextPtr = rootNodePtr->summaryPtr;

2380	2378	rootLevel = rootNodePtr->level;
2381	2379	tagPtr->tagRootPtr = rootNodePtr;
2382	2380	}
2383		summaryPtr = ckalloc(sizeof(Summary));
	2381	summaryPtr = (Summary *)ckalloc(sizeof(Summary));
2384	2382	summaryPtr->tagPtr = tagPtr;
2385	2383	summaryPtr->toggleCount = delta;
2386	2384	summaryPtr->nextPtr = nodePtr->summaryPtr;

2470	2468	TkTextTag tagPtr, / Tag to search for. */
2471	2469	TkTextIndex indexPtr) / Return - index information. */
2472	2470	{
2473		register Node *nodePtr;
2474		register TkTextLine *linePtr;
2475		register TkTextSegment *segPtr;
2476		register Summary *summaryPtr;
	2471	Node *nodePtr;
	2472	TkTextLine *linePtr;
	2473	TkTextSegment *segPtr;
	2474	Summary *summaryPtr;
2477	2475	int offset;
2478	2476
2479	2477	nodePtr = tagPtr->tagRootPtr;

2555	2553	TkTextTag tagPtr, / Tag to search for. */
2556	2554	TkTextIndex indexPtr) / Return - index information. */
2557	2555	{
2558		register Node nodePtr, lastNodePtr;
2559		register TkTextLine linePtr ,lastLinePtr;
2560		register TkTextSegment segPtr, lastSegPtr, *last2SegPtr;
2561		register Summary *summaryPtr;
	2556	Node nodePtr, lastNodePtr;
	2557	TkTextLine linePtr ,lastLinePtr;
	2558	TkTextSegment segPtr, lastSegPtr, *last2SegPtr;
	2559	Summary *summaryPtr;
2562	2560	int lastoffset, lastoffset2, offset;
2563	2561
2564	2562	nodePtr = tagPtr->tagRootPtr;

2651	2649	* position will be returned. */
2652	2650	TkTextTag tagPtr, / Tag to search for. NULL means search for
2653	2651	* any tag. */
2654		register TkTextSearch *searchPtr)
	2652	TkTextSearch *searchPtr)
2655	2653	/* Where to store information about search's
2656	2654	* progress. */
2657	2655	{

2747	2745	* position will be returned. */
2748	2746	TkTextTag tagPtr, / Tag to search for. NULL means search for
2749	2747	* any tag. */
2750		register TkTextSearch *searchPtr)
	2748	TkTextSearch *searchPtr)
2751	2749	/* Where to store information about search's
2752	2750	* progress. */
2753	2751	{

2848	2846
2849	2847	int
2850	2848	TkBTreeNextTag(
2851		register TkTextSearch *searchPtr)
	2849	TkTextSearch *searchPtr)
2852	2850	/* Information about search in progress; must
2853	2851	* have been set up by call to
2854	2852	* TkBTreeStartSearch. */
2855	2853	{
2856		register TkTextSegment *segPtr;
2857		register Node *nodePtr;
2858		register Summary *summaryPtr;
	2854	TkTextSegment *segPtr;
	2855	Node *nodePtr;
	2856	Summary *summaryPtr;
2859	2857
2860	2858	if (searchPtr->linesLeft <= 0) {
2861	2859	goto searchOver;

3013	3011
3014	3012	int
3015	3013	TkBTreePrevTag(
3016		register TkTextSearch *searchPtr)
	3014	TkTextSearch *searchPtr)
3017	3015	/* Information about search in progress; must
3018	3016	* have been set up by call to
3019	3017	* TkBTreeStartSearch. */
3020	3018	{
3021		register TkTextSegment segPtr, prevPtr;
3022		register TkTextLine linePtr, prevLinePtr;
3023		register Node nodePtr, node2Ptr, *prevNodePtr;
3024		register Summary *summaryPtr;
	3019	TkTextSegment segPtr, prevPtr;
	3020	TkTextLine linePtr, prevLinePtr;
	3021	Node nodePtr, node2Ptr, *prevNodePtr;
	3022	Summary *summaryPtr;
3025	3023	int byteIndex, linesSkipped;
3026	3024	int pastLast; /* Saw last marker during scan. */
3027	3025

3231	3229	* check for a tag. */
3232	3230	TkTextTag tagPtr) / Tag of interest. */
3233	3231	{
3234		register Node *nodePtr;
3235		register TkTextLine *siblingLinePtr;
3236		register TkTextSegment *segPtr;
	3232	Node *nodePtr;
	3233	TkTextLine *siblingLinePtr;
	3234	TkTextSegment *segPtr;
3237	3235	TkTextSegment *toggleSegPtr;
3238	3236	int toggles, index;
3239	3237

3287	3285	toggles = 0;
3288	3286	for (nodePtr = indexPtr->linePtr->parentPtr; nodePtr->parentPtr != NULL;
3289	3287	nodePtr = nodePtr->parentPtr) {
3290		register Node *siblingPtr;
3291		register Summary *summaryPtr;
	3288	Node *siblingPtr;
	3289	Summary *summaryPtr;
3292	3290
3293	3291	for (siblingPtr = nodePtr->parentPtr->children.nodePtr;
3294	3292	siblingPtr != nodePtr; siblingPtr = siblingPtr->nextPtr) {

3335	3333	*----------------------------------------------------------------------
3336	3334	*/
3337	3335
3338		/* ARGSUSED */
3339	3336	TkTextTag **
3340	3337	TkBTreeGetTags(
3341	3338	const TkTextIndex indexPtr,/ Indicates a particular position in the

3346	3343	int numTagsPtr) / Store number of tags found at this
3347	3344	* location. */
3348	3345	{
3349		register Node *nodePtr;
3350		register TkTextLine *siblingLinePtr;
3351		register TkTextSegment *segPtr;
	3346	Node *nodePtr;
	3347	TkTextLine *siblingLinePtr;
	3348	TkTextSegment *segPtr;
3352	3349	TkTextLine *linePtr;
3353	3350	int src, dst, index;
3354	3351	TagInfo tagInfo;

3356	3353
3357	3354	tagInfo.numTags = 0;
3358	3355	tagInfo.arraySize = NUM_TAG_INFOS;
3359		tagInfo.tagPtrs = ckalloc(NUM_TAG_INFOS * sizeof(TkTextTag *));
3360		tagInfo.counts = ckalloc(NUM_TAG_INFOS * sizeof(int));
	3356	tagInfo.tagPtrs = (TkTextTag *)ckalloc(NUM_TAG_INFOS sizeof(TkTextTag *));
	3357	tagInfo.counts = (int )ckalloc(NUM_TAG_INFOS sizeof(int));
3361	3358
3362	3359	/*
3363	3360	* Record tag toggles within the line of indexPtr but preceding indexPtr.

3409	3406
3410	3407	for (nodePtr = indexPtr->linePtr->parentPtr; nodePtr->parentPtr != NULL;
3411	3408	nodePtr = nodePtr->parentPtr) {
3412		register Node *siblingPtr;
3413		register Summary *summaryPtr;
	3409	Node *siblingPtr;
	3410	Summary *summaryPtr;
3414	3411
3415	3412	for (siblingPtr = nodePtr->parentPtr->children.nodePtr;
3416	3413	siblingPtr != nodePtr; siblingPtr = siblingPtr->nextPtr) {

3481	3478	*----------------------------------------------------------------------
3482	3479	*/
3483	3480
3484		/* ARGSUSED */
3485	3481	int
3486	3482	TkTextIsElided(
3487	3483	const TkText textPtr, / Overall information about text widget. */

3491	3487	* indexPtr's elide state will be stored and
3492	3488	* returned. */
3493	3489	{
3494		register Node *nodePtr;
3495		register TkTextLine *siblingLinePtr;
3496		register TkTextSegment *segPtr;
3497		register TkTextTag *tagPtr = NULL;
3498		register int i, index;
3499		register TkTextElideInfo *infoPtr;
	3490	Node *nodePtr;
	3491	TkTextLine *siblingLinePtr;
	3492	TkTextSegment *segPtr;
	3493	TkTextTag *tagPtr = NULL;
	3494	int i, index;
	3495	TkTextElideInfo *infoPtr;
3500	3496	TkTextLine *linePtr;
3501	3497	int elide;
3502	3498
3503	3499	if (elideInfo == NULL) {
3504		infoPtr = ckalloc(sizeof(TkTextElideInfo));
	3500	infoPtr = (TkTextElideInfo *)ckalloc(sizeof(TkTextElideInfo));
3505	3501	} else {
3506	3502	infoPtr = elideInfo;
3507	3503	}

3516	3512	*/
3517	3513
3518	3514	if (LOTSA_TAGS < infoPtr->numTags) {
3519		infoPtr->tagCnts = ckalloc(sizeof(int) * infoPtr->numTags);
3520		infoPtr->tagPtrs = ckalloc(sizeof(TkTextTag ) infoPtr->numTags);
	3515	infoPtr->tagCnts = (int )ckalloc(sizeof(int) infoPtr->numTags);
	3516	infoPtr->tagPtrs = (TkTextTag *)ckalloc(sizeof(TkTextTag ) * infoPtr->numTags);
3521	3517	}
3522	3518
3523	3519	for (i=0; i<infoPtr->numTags; i++) {

3590	3586
3591	3587	for (nodePtr = indexPtr->linePtr->parentPtr; nodePtr->parentPtr != NULL;
3592	3588	nodePtr = nodePtr->parentPtr) {
3593		register Node *siblingPtr;
3594		register Summary *summaryPtr;
	3589	Node *siblingPtr;
	3590	Summary *summaryPtr;
3595	3591
3596	3592	for (siblingPtr = nodePtr->parentPtr->children.nodePtr;
3597	3593	siblingPtr != nodePtr; siblingPtr = siblingPtr->nextPtr) {

3696	3692	TagInfo tagInfoPtr) / Holds cumulative information about tags;
3697	3693	* increment count here. */
3698	3694	{
3699		register TkTextTag **tagPtrPtr;
	3695	TkTextTag **tagPtrPtr;
3700	3696	int count;
3701	3697
3702	3698	for (tagPtrPtr = tagInfoPtr->tagPtrs, count = tagInfoPtr->numTags;

3717	3713	int *newCounts, newSize;
3718	3714
3719	3715	newSize = 2 * tagInfoPtr->arraySize;
3720		newTags = ckalloc(newSize * sizeof(TkTextTag *));
	3716	newTags = (TkTextTag *)ckalloc(newSize sizeof(TkTextTag *));
3721	3717	memcpy(newTags, tagInfoPtr->tagPtrs,
3722	3718	tagInfoPtr->arraySize * sizeof(TkTextTag *));
3723	3719	ckfree(tagInfoPtr->tagPtrs);
3724	3720	tagInfoPtr->tagPtrs = newTags;
3725		newCounts = ckalloc(newSize * sizeof(int));
	3721	newCounts = (int )ckalloc(newSize sizeof(int));
3726	3722	memcpy(newCounts, tagInfoPtr->counts,
3727	3723	tagInfoPtr->arraySize * sizeof(int));
3728	3724	ckfree(tagInfoPtr->counts);

3758	3754	TkTextBTree tree) /* Tree to check. */
3759	3755	{
3760	3756	BTree treePtr = (BTree ) tree;
3761		register Summary *summaryPtr;
3762		register Node *nodePtr;
3763		register TkTextLine *linePtr;
3764		register TkTextSegment *segPtr;
3765		register TkTextTag *tagPtr;
	3757	Summary *summaryPtr;
	3758	Node *nodePtr;
	3759	TkTextLine *linePtr;
	3760	TkTextSegment *segPtr;
	3761	TkTextTag *tagPtr;
3766	3762	Tcl_HashEntry *entryPtr;
3767	3763	Tcl_HashSearch search;
3768	3764	int count;

3773	3769
3774	3770	for (entryPtr=Tcl_FirstHashEntry(&treePtr->sharedTextPtr->tagTable,&search);
3775	3771	entryPtr != NULL ; entryPtr = Tcl_NextHashEntry(&search)) {
3776		tagPtr = Tcl_GetHashValue(entryPtr);
	3772	tagPtr = (TkTextTag *)Tcl_GetHashValue(entryPtr);
3777	3773	nodePtr = tagPtr->tagRootPtr;
3778	3774	if (nodePtr == NULL) {
3779	3775	if (tagPtr->toggleCount != 0) {

3897	3893
3898	3894	static void
3899	3895	CheckNodeConsistency(
3900		register Node nodePtr, / Node whose subtree should be checked. */
	3896	Node nodePtr, / Node whose subtree should be checked. */
3901	3897	int references) /* Number of referring widgets which have
3902	3898	* pixel counts. */
3903	3899	{
3904		register Node *childNodePtr;
3905		register Summary summaryPtr, summaryPtr2;
3906		register TkTextLine *linePtr;
3907		register TkTextSegment *segPtr;
	3900	Node *childNodePtr;
	3901	Summary summaryPtr, summaryPtr2;
	3902	TkTextLine *linePtr;
	3903	TkTextSegment *segPtr;
3908	3904	int numChildren, numLines, toggleCount, minChildren, i;
3909	3905	int *numPixels;
3910	3906	int pixels[PIXEL_CLIENTS];

3925	3921	numChildren = 0;
3926	3922	numLines = 0;
3927	3923	if (references > PIXEL_CLIENTS) {
3928		numPixels = ckalloc(sizeof(int) * references);
	3924	numPixels = (int )ckalloc(sizeof(int) references);
3929	3925	} else {
3930	3926	numPixels = pixels;
3931	3927	}

4086	4082	static void
4087	4083	Rebalance(
4088	4084	BTree treePtr, / Tree that is being rebalanced. */
4089		register Node nodePtr) / Node that may be out of balance. */
	4085	Node nodePtr) / Node that may be out of balance. */
4090	4086	{
4091	4087	/*
4092	4088	* Loop over the entire ancestral chain of the node, working up through

4094	4090	*/
4095	4091
4096	4092	for ( ; nodePtr != NULL; nodePtr = nodePtr->parentPtr) {
4097		register Node newPtr, childPtr;
4098		register TkTextLine *linePtr;
	4093	Node newPtr, childPtr;
	4094	TkTextLine *linePtr;
4099	4095	int i;
4100	4096
4101	4097	/*

4113	4109	*/
4114	4110
4115	4111	if (nodePtr->parentPtr == NULL) {
4116		newPtr = ckalloc(sizeof(Node));
	4112	newPtr = (Node *)ckalloc(sizeof(Node));
4117	4113	newPtr->parentPtr = NULL;
4118	4114	newPtr->nextPtr = NULL;
4119	4115	newPtr->summaryPtr = NULL;

4121	4117	newPtr->children.nodePtr = nodePtr;
4122	4118	newPtr->numChildren = 1;
4123	4119	newPtr->numLines = nodePtr->numLines;
4124		newPtr->numPixels =
	4120	newPtr->numPixels = (int *)
4125	4121	ckalloc(sizeof(int) * treePtr->pixelReferences);
4126	4122	for (i=0; i<treePtr->pixelReferences; i++) {
4127	4123	newPtr->numPixels[i] = nodePtr->numPixels[i];

4129	4125	RecomputeNodeCounts(treePtr, newPtr);
4130	4126	treePtr->rootPtr = newPtr;
4131	4127	}
4132		newPtr = ckalloc(sizeof(Node));
4133		newPtr->numPixels =
	4128	newPtr = (Node *)ckalloc(sizeof(Node));
	4129	newPtr->numPixels = (int *)
4134	4130	ckalloc(sizeof(int) * treePtr->pixelReferences);
4135	4131	for (i=0; i<treePtr->pixelReferences; i++) {
4136	4132	newPtr->numPixels[i] = 0;

4169	4165	}
4170	4166
4171	4167	while (nodePtr->numChildren < MIN_CHILDREN) {
4172		register Node *otherPtr;
	4168	Node *otherPtr;
4173	4169	Node halfwayNodePtr = NULL; / Initialization needed only */
4174	4170	TkTextLine halfwayLinePtr = NULL; / to prevent cc warnings. */
4175		int totalChildren, firstChildren, i;
	4171	int totalChildren, firstChildren;
4176	4172
4177	4173	/*
4178	4174	* Too few children for this node. If this is the root then, it's

4233	4229	otherPtr->children.linePtr = NULL;
4234	4230	}
4235	4231	if (nodePtr->level == 0) {
4236		register TkTextLine *linePtr;
4237
4238	4232	for (linePtr = nodePtr->children.linePtr, i = 1;
4239	4233	linePtr->nextPtr != NULL;
4240	4234	linePtr = linePtr->nextPtr, i++) {

4249	4243	i++;
4250	4244	}
4251	4245	} else {
4252		register Node *childPtr;
4253
4254	4246	for (childPtr = nodePtr->children.nodePtr, i = 1;
4255	4247	childPtr->nextPtr != NULL;
4256	4248	childPtr = childPtr->nextPtr, i++) {

4325	4317
4326	4318	static void
4327	4319	RecomputeNodeCounts(
4328		register BTree treePtr, / The whole B-tree. */
4329		register Node nodePtr) / Node whose tag summary information must be
	4320	BTree treePtr, / The whole B-tree. */
	4321	Node nodePtr) / Node whose tag summary information must be
4330	4322	* recomputed. */
4331	4323	{
4332		register Summary summaryPtr, summaryPtr2;
4333		register Node *childPtr;
4334		register TkTextLine *linePtr;
4335		register TkTextSegment *segPtr;
	4324	Summary summaryPtr, summaryPtr2;
	4325	Node *childPtr;
	4326	TkTextLine *linePtr;
	4327	TkTextSegment *segPtr;
4336	4328	TkTextTag *tagPtr;
4337	4329	int ref;
4338	4330

4376	4368	for (summaryPtr = nodePtr->summaryPtr; ;
4377	4369	summaryPtr = summaryPtr->nextPtr) {
4378	4370	if (summaryPtr == NULL) {
4379		summaryPtr = ckalloc(sizeof(Summary));
	4371	summaryPtr = (Summary *)ckalloc(sizeof(Summary));
4380	4372	summaryPtr->tagPtr = tagPtr;
4381	4373	summaryPtr->toggleCount = 1;
4382	4374	summaryPtr->nextPtr = nodePtr->summaryPtr;

4404	4396	for (summaryPtr = nodePtr->summaryPtr; ;
4405	4397	summaryPtr = summaryPtr->nextPtr) {
4406	4398	if (summaryPtr == NULL) {
4407		summaryPtr = ckalloc(sizeof(Summary));
	4399	summaryPtr = (Summary *)ckalloc(sizeof(Summary));
4408	4400	summaryPtr->tagPtr = summaryPtr2->tagPtr;
4409	4401	summaryPtr->toggleCount = summaryPtr2->toggleCount;
4410	4402	summaryPtr->nextPtr = nodePtr->summaryPtr;

4557	4549	{
4558	4550	TkTextSegment newPtr1, newPtr2;
4559	4551
4560		newPtr1 = ckalloc(CSEG_SIZE(index));
4561		newPtr2 = ckalloc(CSEG_SIZE(segPtr->size - index));
	4552	newPtr1 = (TkTextSegment *)ckalloc(CSEG_SIZE(index));
	4553	newPtr2 = (TkTextSegment *)ckalloc(CSEG_SIZE(segPtr->size - index));
4562	4554	newPtr1->typePtr = &tkTextCharType;
4563	4555	newPtr1->nextPtr = newPtr2;
4564	4556	newPtr1->size = index;
4565		memcpy(newPtr1->body.chars, segPtr->body.chars, (size_t) index);
	4557	memcpy(newPtr1->body.chars, segPtr->body.chars, index);
4566	4558	newPtr1->body.chars[index] = 0;
4567	4559	newPtr2->typePtr = &tkTextCharType;
4568	4560	newPtr2->nextPtr = segPtr->nextPtr;

4591	4583	*--------------------------------------------------------------
4592	4584	*/
4593	4585
4594		/* ARGSUSED */
4595	4586	static TkTextSegment *
4596	4587	CharCleanupProc(
4597	4588	TkTextSegment segPtr, / Pointer to first of two adjacent segments
4598	4589	* to join. */
4599		TkTextLine linePtr) / Line containing segments (not used). */
	4590	TCL_UNUSED(TkTextLine )) / Line containing segments (not used). */
4600	4591	{
4601	4592	TkTextSegment segPtr2, newPtr;
4602	4593

4604	4595	if ((segPtr2 == NULL) \|\| (segPtr2->typePtr != &tkTextCharType)) {
4605	4596	return segPtr;
4606	4597	}
4607		newPtr = ckalloc(CSEG_SIZE(segPtr->size + segPtr2->size));
	4598	newPtr = (TkTextSegment *)ckalloc(CSEG_SIZE(segPtr->size + segPtr2->size));
4608	4599	newPtr->typePtr = &tkTextCharType;
4609	4600	newPtr->nextPtr = segPtr2->nextPtr;
4610	4601	newPtr->size = segPtr->size + segPtr2->size;

4632	4623	*--------------------------------------------------------------
4633	4624	*/
4634	4625
4635		/* ARGSUSED */
4636	4626	static int
4637	4627	CharDeleteProc(
4638	4628	TkTextSegment segPtr, / Segment to delete. */
4639		TkTextLine linePtr, / Line containing segment. */
4640		int treeGone) /* Non-zero means the entire tree is being
	4629	TCL_UNUSED(TkTextLine ), / Line containing segment. */
	4630	TCL_UNUSED(int)) /* Non-zero means the entire tree is being
4641	4631	* deleted, so everything must get cleaned
4642	4632	* up. */
4643	4633	{

4662	4652	*--------------------------------------------------------------
4663	4653	*/
4664	4654
4665		/* ARGSUSED */
4666	4655	static void
4667	4656	CharCheckProc(
4668	4657	TkTextSegment segPtr, / Segment to check. */
4669		TkTextLine linePtr) / Line containing segment. */
	4658	TCL_UNUSED(TkTextLine )) / Line containing segment. */
4670	4659	{
4671	4660	/*
4672	4661	* Make sure that the segment contains the number of characters indicated

4678	4667	if (segPtr->size <= 0) {
4679	4668	Tcl_Panic("CharCheckProc: segment has size <= 0");
4680	4669	}
4681		if (strlen(segPtr->body.chars) != (size_t) segPtr->size) {
	4670	if (strlen(segPtr->body.chars) != (size_t)segPtr->size) {
4682	4671	Tcl_Panic("CharCheckProc: segment has wrong size");
4683	4672	}
4684	4673	if (segPtr->nextPtr == NULL) {

4857	4846	TkTextSegment segPtr, / Segment to check. */
4858	4847	TkTextLine linePtr) / Line containing segment. */
4859	4848	{
4860		register Summary *summaryPtr;
	4849	Summary *summaryPtr;
4861	4850	int needSummary;
4862	4851
4863	4852	if (segPtr->size != 0) {

+106

-104

generic/tkTextDisp.c less more

19	19	#include "tkWinInt.h"
20	20	#elif defined(__CYGWIN__)
21	21	#include "tkUnixInt.h"
	22	#elif defined(MAC_OSX_TK)
	23	#include "tkMacOSXInt.h"
	24	#define OK_TO_LOG (!TkpWillDrawWidget(textPtr->tkwin))
22	25	#endif
23	26
24		#ifdef MAC_OSX_TK
25		#include "tkMacOSXInt.h"
26		#define OK_TO_LOG (!TkpAppIsDrawing())
27		#define FORCE_DISPLAY(winPtr) TkpDisplayWindow(winPtr)
28		#else
	27	#if !defined(MAC_OSX_TK)
29	28	#define OK_TO_LOG 1
30		#define FORCE_DISPLAY(winPtr)
31	29	#endif
32	30
33	31	/*

445	443
446	444	typedef struct CharInfo {
447	445	int numBytes; /* Number of bytes to display. */
448		char chars[1]; /* UTF characters to display. Actual size will
449		* be numBytes, not 1. THIS MUST BE THE LAST
	446	char chars[TKFLEXARRAY]; /* UTF characters to display.
	447	* Allocated as large as necessary. THIS MUST BE THE LAST
450	448	* FIELD IN THE STRUCTURE. */
451	449	} CharInfo;
452	450

659	657	TkTextCreateDInfo(
660	658	TkText textPtr) / Overall information for text widget. */
661	659	{
662		register TextDInfo *dInfoPtr;
	660	TextDInfo *dInfoPtr;
663	661	XGCValues gcValues;
664	662
665		dInfoPtr = ckalloc(sizeof(TextDInfo));
	663	dInfoPtr = (TextDInfo *)ckalloc(sizeof(TextDInfo));
666	664	Tcl_InitHashTable(&dInfoPtr->styleTable, sizeof(StyleValues)/sizeof(int));
667	665	dInfoPtr->dLinePtr = NULL;
668	666	dInfoPtr->copyGC = NULL;

718	716	TkTextFreeDInfo(
719	717	TkText textPtr) / Overall information for text widget. */
720	718	{
721		register TextDInfo *dInfoPtr = textPtr->dInfoPtr;
	719	TextDInfo *dInfoPtr = textPtr->dInfoPtr;
722	720
723	721	/*
724	722	* Be careful to free up styleTable after freeing up all the DLines, so

774	772	* information is wanted. */
775	773	{
776	774	TkTextTag **tagPtrs;
777		register TkTextTag *tagPtr;
	775	TkTextTag *tagPtr;
778	776	StyleValues styleValues;
779	777	TextStyle *stylePtr;
780	778	Tcl_HashEntry *hPtr;

1003	1001	hPtr = Tcl_CreateHashEntry(&textPtr->dInfoPtr->styleTable,
1004	1002	(char *) &styleValues, &isNew);
1005	1003	if (!isNew) {
1006		stylePtr = Tcl_GetHashValue(hPtr);
	1004	stylePtr = (TextStyle *)Tcl_GetHashValue(hPtr);
1007	1005	stylePtr->refCount++;
1008	1006	return stylePtr;
1009	1007	}

1012	1010	* No existing style matched. Make a new one.
1013	1011	*/
1014	1012
1015		stylePtr = ckalloc(sizeof(TextStyle));
	1013	stylePtr = (TextStyle *)ckalloc(sizeof(TextStyle));
1016	1014	stylePtr->refCount = 1;
1017	1015	if (styleValues.border != NULL) {
1018	1016	gcValues.foreground = Tk_3DBorderColor(styleValues.border)->pixel;

1070	1068	static void
1071	1069	FreeStyle(
1072	1070	TkText textPtr, / Information about overall widget. */
1073		register TextStyle *stylePtr)
	1071	TextStyle *stylePtr)
1074	1072	/* Information about style to free. */
1075	1073	{
1076		stylePtr->refCount--;
1077		if (stylePtr->refCount == 0) {
	1074	if (stylePtr->refCount-- <= 1) {
1078	1075	if (stylePtr->bgGC != NULL) {
1079	1076	Tk_FreeGC(textPtr->display, stylePtr->bgGC);
1080	1077	}

1133	1130	* necessarily point to a character
1134	1131	* segment. */
1135	1132	{
1136		register DLine dlPtr; / New display line. */
	1133	DLine dlPtr; / New display line. */
1137	1134	TkTextSegment segPtr; / Current segment in text. */
1138	1135	TkTextDispChunk *lastChunkPtr;
1139	1136	/* Last chunk allocated so far for line. */

1187	1184	* Create and initialize a new DLine structure.
1188	1185	*/
1189	1186
1190		dlPtr = ckalloc(sizeof(DLine));
	1187	dlPtr = (DLine *)ckalloc(sizeof(DLine));
1191	1188	dlPtr->index = *indexPtr;
1192	1189	dlPtr->byteCount = 0;
1193	1190	dlPtr->y = 0;

1368	1365	* expectations in the rest of the code, but we are able to skip
1369	1366	* elided portions of the line quickly.
1370	1367	*
1371		* If current chunk is elided and last chunk was too, coalese.
	1368	* If current chunk is elided and last chunk was too, coalesce.
1372	1369	*
1373	1370	* This also means that each logical line which is entirely elided
1374	1371	* still gets laid out into a DLine, but with zero height. This isn't

1436	1433	continue;
1437	1434	}
1438	1435	if (chunkPtr == NULL) {
1439		chunkPtr = ckalloc(sizeof(TkTextDispChunk));
	1436	chunkPtr = (TkTextDispChunk *)ckalloc(sizeof(TkTextDispChunk));
1440	1437	chunkPtr->nextPtr = NULL;
1441	1438	chunkPtr->clientData = NULL;
1442	1439	}

1834	1831	UpdateDisplayInfo(
1835	1832	TkText textPtr) / Text widget to update. */
1836	1833	{
1837		register TextDInfo *dInfoPtr = textPtr->dInfoPtr;
1838		register DLine dlPtr, prevPtr;
	1834	TextDInfo *dInfoPtr = textPtr->dInfoPtr;
	1835	DLine dlPtr, prevPtr;
1839	1836	TkTextIndex index;
1840	1837	TkTextLine *lastLinePtr;
1841	1838	int y, maxY, xPixelOffset, maxOffset, lineHeight;

1872	1869	y = dInfoPtr->y - dInfoPtr->newTopPixelOffset;
1873	1870	maxY = dInfoPtr->maxY;
1874	1871	while (1) {
1875		register DLine *newPtr;
	1872	DLine *newPtr;
1876	1873
1877	1874	if (index.linePtr == lastLinePtr) {
1878	1875	break;

1983	1980	*/
1984	1981
1985	1982	if (index.linePtr != prevPtr->index.linePtr) {
1986		register DLine *nextPtr;
	1983	DLine *nextPtr;
1987	1984
1988	1985	nextPtr = dlPtr;
1989	1986	while ((nextPtr != NULL)

2352	2349	static void
2353	2350	FreeDLines(
2354	2351	TkText textPtr, / Information about overall text widget. */
2355		register DLine firstPtr, / Pointer to first DLine to free up. */
	2352	DLine firstPtr, / Pointer to first DLine to free up. */
2356	2353	DLine lastPtr, / Pointer to DLine just after last one to
2357	2354	* free (NULL means everything starting with
2358	2355	* firstPtr). */

2365	2362	* we shouldn't invalidate anything for the
2366	2363	* overall widget. */
2367	2364	{
2368		register TkTextDispChunk chunkPtr, nextChunkPtr;
2369		register DLine *nextDLinePtr;
	2365	TkTextDispChunk chunkPtr, nextChunkPtr;
	2366	DLine *nextDLinePtr;
2370	2367
2371	2368	if (action == DLINE_FREE_TEMP) {
2372	2369	lineHeightsRecalculated++;

2385	2382	if (textPtr->dInfoPtr->dLinePtr == firstPtr) {
2386	2383	textPtr->dInfoPtr->dLinePtr = lastPtr;
2387	2384	} else {
2388		register DLine *prevPtr;
	2385	DLine *prevPtr;
2389	2386
2390	2387	for (prevPtr = textPtr->dInfoPtr->dLinePtr;
2391	2388	prevPtr->nextPtr != firstPtr; prevPtr = prevPtr->nextPtr) {

2433	2430	static void
2434	2431	DisplayDLine(
2435	2432	TkText textPtr, / Text widget in which to draw line. */
2436		register DLine dlPtr, / Information about line to draw. */
	2433	DLine dlPtr, / Information about line to draw. */
2437	2434	DLine prevPtr, / Line just before one to draw, or NULL if
2438	2435	* dlPtr is the top line. */
2439	2436	Pixmap pixmap) /* Pixmap to use for double-buffering. Caller
2440	2437	* must make sure it's large enough to hold
2441	2438	* line. */
2442	2439	{
2443		register TkTextDispChunk *chunkPtr;
	2440	TkTextDispChunk *chunkPtr;
2444	2441	TextDInfo *dInfoPtr = textPtr->dInfoPtr;
2445	2442	Display *display;
2446	2443	int height, y_off;

2612	2609	static void
2613	2610	DisplayLineBackground(
2614	2611	TkText textPtr, / Text widget containing line. */
2615		register DLine dlPtr, / Information about line to draw. */
	2612	DLine dlPtr, / Information about line to draw. */
2616	2613	DLine prevPtr, / Line just above dlPtr, or NULL if dlPtr is
2617	2614	* the top-most line in the window. */
2618	2615	Pixmap pixmap) /* Pixmap to use for double-buffering. Caller

3008	3005	AsyncUpdateLineMetrics(
3009	3006	ClientData clientData) /* Information about widget. */
3010	3007	{
3011		register TkText *textPtr = clientData;
	3008	TkText textPtr = (TkText )clientData;
3012	3009	TextDInfo *dInfoPtr = textPtr->dInfoPtr;
3013	3010	int lineNum;
3014	3011

3156	3153	*/
3157	3154
3158	3155	if (!tkTextDebug) {
3159		FORCE_DISPLAY(textPtr->tkwin);
	3156	TkpRedrawWidget(textPtr->tkwin);
3160	3157	}
3161	3158
3162	3159	if (NewSyncState != OldSyncState) {

3165	3162	} else {
3166	3163	textPtr->dInfoPtr->flags \|= OUT_OF_SYNC;
3167	3164	}
3168		TkSendVirtualEvent(textPtr->tkwin, "WidgetViewSync",
3169		Tcl_NewBooleanObj(NewSyncState));
	3165	TkSendVirtualEvent(textPtr->tkwin, "WidgetViewSync",
	3166	Tcl_NewBooleanObj(NewSyncState));
3170	3167	}
3171	3168	}
3172	3169

4165	4162	DisplayText(
4166	4163	ClientData clientData) /* Information about widget. */
4167	4164	{
4168		register TkText *textPtr = clientData;
	4165	TkText textPtr = (TkText )clientData;
4169	4166	TextDInfo *dInfoPtr = textPtr->dInfoPtr;
4170		register DLine *dlPtr;
	4167	DLine *dlPtr;
4171	4168	DLine *prevPtr;
4172	4169	Pixmap pixmap;
4173	4170	int maxHeight, borders;

4175	4172	* warnings. */
4176	4173	Tcl_Interp *interp;
4177	4174
	4175
	4176	if ((textPtr->tkwin == NULL) \|\| (textPtr->flags & DESTROYED)) {
	4177	/*
	4178	* The widget has been deleted. Don't do anything.
	4179	*/
	4180
	4181	return;
	4182	}
	4183
4178	4184	#ifdef MAC_OSX_TK
4179	4185	/*
4180		* If drawing is disabled, all we need to do is
4181		* clear the REDRAW_PENDING flag.
4182		*/
	4186	* If the toplevel is being resized it would be dangerous to try redrawing
	4187	* the widget. But we can just clear the REDRAW_PENDING flag and return.
	4188	* This display proc will be called again after the widget has been
	4189	* reconfigured.
	4190	*/
	4191
4183	4192	TkWindow winPtr = (TkWindow )(textPtr->tkwin);
4184	4193	MacDrawable *macWin = winPtr->privatePtr;
4185	4194	if (macWin && (macWin->flags & TK_DO_NOT_DRAW)){

4188	4197	}
4189	4198	#endif
4190	4199
4191		if ((textPtr->tkwin == NULL) \|\| (textPtr->flags & DESTROYED)) {
4192		/*
4193		* The widget has been deleted. Don't do anything.
4194		*/
4195
4196		return;
4197		}
4198
4199	4200	interp = textPtr->interp;
4200	4201	Tcl_Preserve(interp);
4201	4202

4251	4252	*/
4252	4253
4253	4254	for (dlPtr = dInfoPtr->dLinePtr; dlPtr != NULL; dlPtr = dlPtr->nextPtr) {
4254		register DLine *dlPtr2;
	4255	DLine *dlPtr2;
4255	4256	int offset, height, y, oldY;
4256	4257	TkRegion damageRgn;
4257	4258

4549	4550	* proc of embedded windows only.
4550	4551	*/
4551	4552	#endif
4552		register TkTextDispChunk *chunkPtr;
	4553	TkTextDispChunk *chunkPtr;
4553	4554
4554	4555	for (chunkPtr = dlPtr->chunkPtr; (chunkPtr != NULL);
4555	4556	chunkPtr = chunkPtr->nextPtr) {

4751	4752	TkText textPtr, / Widget record for text widget. */
4752	4753	TkRegion region) /* Region of area to redraw. */
4753	4754	{
4754		register DLine *dlPtr;
	4755	DLine *dlPtr;
4755	4756	TextDInfo *dInfoPtr = textPtr->dInfoPtr;
4756	4757	int maxY, inset;
4757	4758	XRectangle rect;

5009	5010	int withTag) /* 1 means redraw characters that have the
5010	5011	* tag, 0 means redraw those without. */
5011	5012	{
5012		register DLine *dlPtr;
	5013	DLine *dlPtr;
5013	5014	DLine *endPtr;
5014	5015	int tagOn;
5015	5016	TkTextSearch search;

5272	5273
5273	5274	/*
5274	5275	* Invalidate cached scrollbar positions, so that scrollbars sliders will
5275		* be udpated.
	5276	* be updated.
5276	5277	*/
5277	5278
5278	5279	dInfoPtr->xScrollFirst = dInfoPtr->xScrollLast = -1;

5349	5350	* are to be off the top of the screen. */
5350	5351	{
5351	5352	TextDInfo *dInfoPtr = textPtr->dInfoPtr;
5352		register DLine *dlPtr;
	5353	DLine *dlPtr;
5353	5354	int bottomY, close, lineIndex;
5354	5355	TkTextIndex tmpIndex, rounded;
5355	5356	int lineHeight;

6177	6178
6178	6179	pickPlace = 0;
6179	6180	if (Tcl_GetString(objv[2])[0] == '-') {
6180		register const char *switchStr =
	6181	const char *switchStr =
6181	6182	Tcl_GetStringFromObj(objv[2], &switchLength);
6182	6183
6183	6184	if ((switchLength >= 2) && (strncmp(switchStr, "-pickplace",

6355	6356
6356	6357	int
6357	6358	TkTextScanCmd(
6358		register TkText textPtr, / Information about text widget. */
	6359	TkText textPtr, / Information about text widget. */
6359	6360	Tcl_Interp interp, / Current interpreter. */
6360	6361	int objc, /* Number of arguments. */
6361	6362	Tcl_Obj const objv[]) / Argument objects. Someone else has already

6524	6525	Tcl_DStringAppend(&buf, textPtr->xScrollCmd, -1);
6525	6526	Tcl_DStringAppend(&buf, buf1, -1);
6526	6527	Tcl_DStringAppend(&buf, buf2, -1);
6527		code = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), -1, 0);
	6528	code = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), -1, TCL_EVAL_GLOBAL);
6528	6529	Tcl_DStringFree(&buf);
6529	6530	if (code != TCL_OK) {
6530	6531	Tcl_AddErrorInfo(interp,

6809	6810	Tcl_DStringAppend(&buf, textPtr->yScrollCmd, -1);
6810	6811	Tcl_DStringAppend(&buf, buf1, -1);
6811	6812	Tcl_DStringAppend(&buf, buf2, -1);
6812		code = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), -1, 0);
	6813	code = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), -1, TCL_EVAL_GLOBAL);
6813	6814	Tcl_DStringFree(&buf);
6814	6815	if (code != TCL_OK) {
6815	6816	Tcl_AddErrorInfo(interp,

6841	6842	AsyncUpdateYScrollbar(
6842	6843	ClientData clientData) /* Information about widget. */
6843	6844	{
6844		register TkText *textPtr = clientData;
	6845	TkText textPtr = (TkText )clientData;
6845	6846
6846	6847	textPtr->dInfoPtr->scrollbarTimer = NULL;
6847	6848

6876	6877	static DLine *
6877	6878	FindDLine(
6878	6879	TkText textPtr, / Widget record for text widget. */
6879		register DLine dlPtr, / Pointer to first in list of DLines to
	6880	DLine dlPtr, / Pointer to first in list of DLines to
6880	6881	* search. */
6881	6882	const TkTextIndex indexPtr)/ Index of desired character. */
6882	6883	{

7046	7047	* border of the widget). */
7047	7048	{
7048	7049	TextDInfo *dInfoPtr = textPtr->dInfoPtr;
7049		register DLine dlPtr, validDlPtr;
	7050	DLine dlPtr, validDlPtr;
7050	7051	int nearby = 0;
7051	7052
7052	7053	/*

7148	7149	* the character nearest to x. */
7149	7150	{
7150	7151	TextDInfo *dInfoPtr = textPtr->dInfoPtr;
7151		register TkTextDispChunk *chunkPtr;
	7152	TkTextDispChunk *chunkPtr;
7152	7153
7153	7154	/*
7154	7155	* Scan through the line's chunks to find the one that contains the

7276	7277	int byteIndex) /* The byte index for which we want the
7277	7278	* coordinate. */
7278	7279	{
7279		register TkTextDispChunk *chunkPtr = dlPtr->chunkPtr;
	7280	TkTextDispChunk *chunkPtr = dlPtr->chunkPtr;
7280	7281	int x = 0;
7281	7282
7282	7283	if (byteIndex == 0 \|\| chunkPtr == NULL) {

7346	7347	{
7347	7348	TextDInfo *dInfoPtr = textPtr->dInfoPtr;
7348	7349	DLine *dlPtr;
7349		register TkTextDispChunk *chunkPtr;
	7350	TkTextDispChunk *chunkPtr;
7350	7351	int byteCount;
7351	7352
7352	7353	/*

7538	7539
7539	7540	static void
7540	7541	ElideBboxProc(
7541		TkText *textPtr,
	7542	TCL_UNUSED(TkText *),
7542	7543	TkTextDispChunk chunkPtr, / Chunk containing desired char. */
7543		int index, /* Index of desired character within the
	7544	TCL_UNUSED(int), /* Index of desired character within the
7544	7545	* chunk. */
7545	7546	int y, /* Topmost pixel in area allocated for this
7546	7547	* line. */
7547		int lineHeight, /* Height of line, in pixels. */
7548		int baseline, /* Location of line's baseline, in pixels
	7548	TCL_UNUSED(int), /* Height of line, in pixels. */
	7549	TCL_UNUSED(int), /* Location of line's baseline, in pixels
7549	7550	* measured down from y. */
7550	7551	int xPtr, int yPtr, /* Gets filled in with coords of character's
7551	7552	* upper-left pixel. X-coord is in same

7566	7567
7567	7568	static int
7568	7569	ElideMeasureProc(
7569		TkTextDispChunk chunkPtr, / Chunk containing desired coord. */
7570		int x) /* X-coordinate, in same coordinate system as
	7570	TCL_UNUSED(TkTextDispChunk ), / Chunk containing desired coord. */
	7571	TCL_UNUSED(int)) /* X-coordinate, in same coordinate system as
7571	7572	* chunkPtr->x. */
7572	7573	{
7573	7574	return 0 /chunkPtr->numBytes - 1/;

7596	7597
7597	7598	int
7598	7599	TkTextCharLayoutProc(
7599		TkText textPtr, / Text widget being layed out. */
7600		TkTextIndex indexPtr, / Index of first character to lay out
	7600	TCL_UNUSED(TkText ), / Text widget being layed out. */
	7601	TCL_UNUSED(TkTextIndex ), / Index of first character to lay out
7601	7602	* (corresponds to segPtr and offset). */
7602	7603	TkTextSegment segPtr, / Segment being layed out. */
7603	7604	int byteOffset, /* Byte offset within segment of first

7611	7612	TkWrapMode wrapMode, /* How to handle line wrapping:
7612	7613	* TEXT_WRAPMODE_CHAR, TEXT_WRAPMODE_NONE, or
7613	7614	* TEXT_WRAPMODE_WORD. */
7614		register TkTextDispChunk *chunkPtr)
	7615	TkTextDispChunk *chunkPtr)
7615	7616	/* Structure to fill in with information about
7616	7617	* this chunk. The x field has already been
7617	7618	* set by the caller. */

7762	7763	chunkPtr->breakIndex = -1;
7763	7764
7764	7765	#if !TK_LAYOUT_WITH_BASE_CHUNKS
7765		ciPtr = ckalloc((Tk_Offset(CharInfo, chars) + 1) + bytesThatFit);
	7766	ciPtr = (CharInfo *)ckalloc((Tk_Offset(CharInfo, chars) + 1) + bytesThatFit);
7766	7767	chunkPtr->clientData = ciPtr;
7767		memcpy(ciPtr->chars, p, (unsigned) bytesThatFit);
	7768	memcpy(ciPtr->chars, p, bytesThatFit);
7768	7769	#endif /* TK_LAYOUT_WITH_BASE_CHUNKS */
7769	7770
7770	7771	ciPtr->numBytes = bytesThatFit;

7875	7876	* here. */
7876	7877	{
7877	7878	Tk_Font tkfont = chunkPtr->stylePtr->sValuePtr->tkfont;
7878		CharInfo *ciPtr = chunkPtr->clientData;
	7879	CharInfo ciPtr = (CharInfo )chunkPtr->clientData;
7879	7880
7880	7881	#if !TK_LAYOUT_WITH_BASE_CHUNKS
7881	7882	if (chars == NULL) {

7950	7951
7951	7952	static void
7952	7953	CharDisplayProc(
7953		TkText *textPtr,
	7954	TCL_UNUSED(TkText *),
7954	7955	TkTextDispChunk chunkPtr, / Chunk that is to be drawn. */
7955	7956	int x, /* X-position in dst at which to draw this
7956	7957	* chunk (may differ from the x-position in
7957	7958	* the chunk because of scrolling). */
7958	7959	int y, /* Y-position at which to draw this chunk in
7959	7960	* dst. */
7960		int height, /* Total height of line. */
	7961	TCL_UNUSED(int), /* Total height of line. */
7961	7962	int baseline, /* Offset of baseline from y. */
7962	7963	Display display, / Display to use for drawing. */
7963	7964	Drawable dst, /* Pixmap or window in which to draw chunk. */
7964		int screenY) /* Y-coordinate in text window that
	7965	TCL_UNUSED(int)) /* Y-coordinate in text window that
7965	7966	* corresponds to y. */
7966	7967	{
7967		CharInfo *ciPtr = chunkPtr->clientData;
	7968	CharInfo ciPtr = (CharInfo )chunkPtr->clientData;
7968	7969	const char *string;
7969	7970	TextStyle *stylePtr;
7970	7971	StyleValues *sValuePtr;

8112	8113
8113	8114	static void
8114	8115	CharUndisplayProc(
8115		TkText textPtr, / Overall information about text widget. */
	8116	TCL_UNUSED(TkText ), / Overall information about text widget. */
8116	8117	TkTextDispChunk chunkPtr) / Chunk that is about to be freed. */
8117	8118	{
8118		CharInfo *ciPtr = chunkPtr->clientData;
	8119	CharInfo ciPtr = (CharInfo )chunkPtr->clientData;
8119	8120
8120	8121	if (ciPtr) {
8121	8122	#if TK_LAYOUT_WITH_BASE_CHUNKS

8201	8202
8202	8203	static void
8203	8204	CharBboxProc(
8204		TkText *textPtr,
	8205	TCL_UNUSED(TkText *),
8205	8206	TkTextDispChunk chunkPtr, / Chunk containing desired char. */
8206	8207	int byteIndex, /* Byte offset of desired character within the
8207	8208	* chunk. */
8208	8209	int y, /* Topmost pixel in area allocated for this
8209	8210	* line. */
8210		int lineHeight, /* Height of line, in pixels. */
	8211	TCL_UNUSED(int), /* Height of line, in pixels. */
8211	8212	int baseline, /* Location of line's baseline, in pixels
8212	8213	* measured down from y. */
8213	8214	int xPtr, int yPtr, /* Gets filled in with coords of character's

8218	8219	int heightPtr) / Gets filled in with height of character, in
8219	8220	* pixels. */
8220	8221	{
8221		CharInfo *ciPtr = chunkPtr->clientData;
	8222	CharInfo ciPtr = (CharInfo )chunkPtr->clientData;
8222	8223	int maxX;
8223	8224
8224	8225	maxX = chunkPtr->width + chunkPtr->x;

8381	8382	if (chunkPtr2->displayProc != CharDisplayProc) {
8382	8383	continue;
8383	8384	}
8384		ciPtr = chunkPtr2->clientData;
	8385	ciPtr = (CharInfo *)chunkPtr2->clientData;
8385	8386	for (p = ciPtr->chars, i = 0; i < ciPtr->numBytes; p++, i++) {
8386	8387	if (isdigit(UCHAR(*p))) {
8387	8388	gotDigit = 1;

8402	8403	if (decimalChunkPtr != NULL) {
8403	8404	int curX;
8404	8405
8405		ciPtr = decimalChunkPtr->clientData;
	8406	ciPtr = (CharInfo *)decimalChunkPtr->clientData;
8406	8407	CharChunkMeasureChars(decimalChunkPtr, NULL, 0, 0, decimal,
8407	8408	decimalChunkPtr->x, -1, 0, &curX);
8408	8409	desired = tabX - (curX - x);

8673	8674	int curX, width, ch;
8674	8675	const char special, end, *start;
8675	8676
8676		ch = 0; /* lint. */
	8677	ch = 0;
8677	8678	curX = startX;
8678	8679	start = source + rangeStart;
8679	8680	end = start + rangeLength;

8808	8809	}
8809	8810	switch ((enum viewUnits) index) {
8810	8811	case VIEW_SCROLL_PAGES:
8811		if (Tcl_GetIntFromObj(interp, objv[3], intPtr) != TCL_OK) {
8812		return TKTEXT_SCROLL_ERROR;
8813		}
8814		return TKTEXT_SCROLL_PAGES;
	8812	if (Tcl_GetIntFromObj(interp, objv[3], intPtr) == TCL_OK) {
	8813	return TKTEXT_SCROLL_PAGES;
	8814	}
	8815	break;
8815	8816	case VIEW_SCROLL_PIXELS:
8816	8817	if (Tk_GetPixelsFromObj(interp, textPtr->tkwin, objv[3],
8817		intPtr) != TCL_OK) {
8818		return TKTEXT_SCROLL_ERROR;
8819		}
8820		return TKTEXT_SCROLL_PIXELS;
	8818	intPtr) == TCL_OK) {
	8819	return TKTEXT_SCROLL_PIXELS;
	8820	}
	8821	break;
8821	8822	case VIEW_SCROLL_UNITS:
8822		if (Tcl_GetIntFromObj(interp, objv[3], intPtr) != TCL_OK) {
8823		return TKTEXT_SCROLL_ERROR;
8824		}
8825		return TKTEXT_SCROLL_UNITS;
8826		}
8827		}
8828		Tcl_Panic("unexpected switch fallthrough");
	8823	if (Tcl_GetIntFromObj(interp, objv[3], intPtr) == TCL_OK) {
	8824	return TKTEXT_SCROLL_UNITS;
	8825	}
	8826	break;
	8827	default:
	8828	Tcl_Panic("unexpected switch fallthrough");
	8829	}
	8830	}
8829	8831	return TKTEXT_SCROLL_ERROR;
8830	8832	}
8831	8833

+44

-44

generic/tkTextImage.c less more

17	17	*/
18	18
19	19	#define EI_SEG_SIZE \
20		((unsigned) (Tk_Offset(TkTextSegment, body) + sizeof(TkTextEmbImage)))
	20	((unsigned)(Tk_Offset(TkTextSegment, body) + sizeof(TkTextEmbImage)))
21	21
22	22	/*
23	23	* Prototypes for functions defined in this file:

116	116
117	117	int
118	118	TkTextImageCmd(
119		register TkText textPtr, / Information about text widget. */
	119	TkText textPtr, / Information about text widget. */
120	120	Tcl_Interp interp, / Current interpreter. */
121	121	int objc, /* Number of arguments. */
122	122	Tcl_Obj const objv[]) / Argument objects. Someone else has already

124	124	* objv[1] is "image". */
125	125	{
126	126	int idx;
127		register TkTextSegment *eiPtr;
	127	TkTextSegment *eiPtr;
128	128	TkTextIndex index;
129	129	static const char *const optionStrings[] = {
130	130	"cget", "configure", "create", "names", NULL

160	160	Tcl_SetErrorCode(interp, "TK", "TEXT", "NO_IMAGE", NULL);
161	161	return TCL_ERROR;
162	162	}
163		objPtr = Tk_GetOptionValue(interp, (char *) &eiPtr->body.ei,
	163	objPtr = Tk_GetOptionValue(interp, (char *)&eiPtr->body.ei,
164	164	eiPtr->body.ei.optionTable, objv[4], textPtr->tkwin);
165	165	if (objPtr == NULL) {
166	166	return TCL_ERROR;

187	187	}
188	188	if (objc <= 5) {
189	189	Tcl_Obj *objPtr = Tk_GetOptionInfo(interp,
190		(char *) &eiPtr->body.ei, eiPtr->body.ei.optionTable,
	190	(char *)&eiPtr->body.ei, eiPtr->body.ei.optionTable,
191	191	(objc == 5) ? objv[4] : NULL, textPtr->tkwin);
192	192
193	193	if (objPtr == NULL) {

241	241	* Create the new image segment and initialize it.
242	242	*/
243	243
244		eiPtr = ckalloc(EI_SEG_SIZE);
	244	eiPtr = (TkTextSegment *)ckalloc(EI_SEG_SIZE);
245	245	eiPtr->typePtr = &tkTextEmbImageType;
246	246	eiPtr->size = 1;
247	247	eiPtr->body.ei.sharedTextPtr = textPtr->sharedTextPtr;

278	278	Tcl_HashEntry *hPtr;
279	279	Tcl_Obj *resultObj;
280	280
281		if (objc != 3) {
282		Tcl_WrongNumArgs(interp, 3, objv, NULL);
283		return TCL_ERROR;
284		}
285		resultObj = Tcl_NewObj();
286		for (hPtr = Tcl_FirstHashEntry(&textPtr->sharedTextPtr->imageTable,
287		&search); hPtr != NULL; hPtr = Tcl_NextHashEntry(&search)) {
288		Tcl_ListObjAppendElement(NULL, resultObj, Tcl_NewStringObj(
289		Tcl_GetHashKey(&textPtr->sharedTextPtr->markTable, hPtr),
290		-1));
291		}
292		Tcl_SetObjResult(interp, resultObj);
293		return TCL_OK;
	281	if (objc == 3) {
	282	resultObj = Tcl_NewObj();
	283	for (hPtr = Tcl_FirstHashEntry(&textPtr->sharedTextPtr->imageTable,
	284	&search); hPtr != NULL; hPtr = Tcl_NextHashEntry(&search)) {
	285	Tcl_ListObjAppendElement(NULL, resultObj, Tcl_NewStringObj(
	286	Tcl_GetHashKey(&textPtr->sharedTextPtr->markTable, hPtr), -1));
	287	}
	288	Tcl_SetObjResult(interp, resultObj);
	289	return TCL_OK;
	290	}
	291	Tcl_WrongNumArgs(interp, 3, objv, NULL);
	292	break;
294	293	}
295	294	default:
296	295	Tcl_Panic("unexpected switch fallthrough");

336	335	int conflict = 0; /* True if we have a name conflict */
337	336	size_t len; /* length of image name */
338	337
339		if (Tk_SetOptions(textPtr->interp, (char *) &eiPtr->body.ei,
	338	if (Tk_SetOptions(textPtr->interp, (char *)&eiPtr->body.ei,
340	339	eiPtr->body.ei.optionTable,
341	340	objc, objv, textPtr->tkwin, NULL, NULL) != TCL_OK) {
342	341	return TCL_ERROR;

388	387	len = strlen(name);
389	388	for (hPtr = Tcl_FirstHashEntry(&textPtr->sharedTextPtr->imageTable,
390	389	&search); hPtr != NULL; hPtr = Tcl_NextHashEntry(&search)) {
391		char *haveName =
	390	char haveName = (char )
392	391	Tcl_GetHashKey(&textPtr->sharedTextPtr->imageTable, hPtr);
393	392
394	393	if (strncmp(name, haveName, len) == 0) {

418	417	&dummy);
419	418	Tcl_SetHashValue(hPtr, eiPtr);
420	419	Tcl_SetObjResult(textPtr->interp, Tcl_NewStringObj(name, -1));
421		eiPtr->body.ei.name = ckalloc(Tcl_DStringLength(&newName) + 1);
	420	eiPtr->body.ei.name = (char *)ckalloc(Tcl_DStringLength(&newName) + 1);
422	421	strcpy(eiPtr->body.ei.name, name);
423	422	Tcl_DStringFree(&newName);
424	423

443	442	*--------------------------------------------------------------
444	443	*/
445	444
446		/* ARGSUSED */
447	445	static int
448	446	EmbImageDeleteProc(
449	447	TkTextSegment eiPtr, / Segment being deleted. */
450		TkTextLine linePtr, / Line containing segment. */
451		int treeGone) /* Non-zero means the entire tree is being
	448	TCL_UNUSED(TkTextLine ), / Line containing segment. */
	449	TCL_UNUSED(int)) /* Non-zero means the entire tree is being
452	450	* deleted, so everything must get cleaned
453	451	* up. */
454	452	{

526	524	*--------------------------------------------------------------
527	525	*/
528	526
529		/ARGSUSED/
530	527	static int
531	528	EmbImageLayoutProc(
532	529	TkText textPtr, / Text widget being layed out. */
533		TkTextIndex indexPtr, / Identifies first character in chunk. */
	530	TCL_UNUSED(TkTextIndex ), / Identifies first character in chunk. */
534	531	TkTextSegment eiPtr, / Segment corresponding to indexPtr. */
535	532	int offset, /* Offset within segPtr corresponding to
536	533	* indexPtr (always 0). */
537	534	int maxX, /* Chunk must not occupy pixels at this
538	535	* position or higher. */
539		int maxChars, /* Chunk must not include more than this many
	536	TCL_UNUSED(int), /* Chunk must not include more than this many
540	537	* characters. */
541	538	int noCharsYet, /* Non-zero means no characters have been
542	539	* assigned to this line yet. */
543		TkWrapMode wrapMode, /* Wrap mode to use for line:
	540	TCL_UNUSED(TkWrapMode), /* Wrap mode to use for line:
544	541	* TEXT_WRAPMODE_CHAR, TEXT_WRAPMODE_NONE, or
545	542	* TEXT_WRAPMODE_WORD. */
546		register TkTextDispChunk *chunkPtr)
	543	TkTextDispChunk *chunkPtr)
547	544	/* Structure to fill in with information about
548	545	* this chunk. The x field has already been
549	546	* set by the caller. */

618	615	static void
619	616	EmbImageCheckProc(
620	617	TkTextSegment eiPtr, / Segment to check. */
621		TkTextLine linePtr) / Line containing segment. */
	618	TCL_UNUSED(TkTextLine )) / Line containing segment. */
622	619	{
623	620	if (eiPtr->nextPtr == NULL) {
624	621	Tcl_Panic("EmbImageCheckProc: embedded image is last segment in line");

659	656	* (x-position is in the chunk itself). */
660	657	int lineHeight, /* Total height of line. */
661	658	int baseline, /* Offset of baseline from y. */
662		Display display, / Display to use for drawing. */
	659	TCL_UNUSED(Display ), / Display to use for drawing. */
663	660	Drawable dst, /* Pixmap or window in which to draw */
664		int screenY) /* Y-coordinate in text window that
	661	TCL_UNUSED(int)) /* Y-coordinate in text window that
665	662	* corresponds to y. */
666	663	{
667		TkTextSegment *eiPtr = chunkPtr->clientData;
	664	TkTextSegment eiPtr = (TkTextSegment )chunkPtr->clientData;
668	665	int lineX, imageX, imageY, width, height;
669	666	Tk_Image image;
670	667

712	709
713	710	static void
714	711	EmbImageBboxProc(
715		TkText *textPtr,
	712	TCL_UNUSED(TkText *),
716	713	TkTextDispChunk chunkPtr, / Chunk containing desired char. */
717		int index, /* Index of desired character within the
	714	TCL_UNUSED(int), /* Index of desired character within the
718	715	* chunk. */
719	716	int y, /* Topmost pixel in area allocated for this
720	717	* line. */

728	725	int heightPtr) / Gets filled in with height of image, in
729	726	* pixels. */
730	727	{
731		TkTextSegment *eiPtr = chunkPtr->clientData;
	728	TkTextSegment eiPtr = (TkTextSegment )chunkPtr->clientData;
732	729	Tk_Image image;
733	730
734	731	image = eiPtr->body.ei.image;

793	790	if (hPtr == NULL) {
794	791	return 0;
795	792	}
796		eiPtr = Tcl_GetHashValue(hPtr);
	793	eiPtr = (TkTextSegment *)Tcl_GetHashValue(hPtr);
797	794	indexPtr->tree = textPtr->sharedTextPtr->tree;
798	795	indexPtr->linePtr = eiPtr->body.ei.linePtr;
799	796	indexPtr->byteIndex = TkTextSegToOffset(eiPtr, indexPtr->linePtr);

820	817	static void
821	818	EmbImageProc(
822	819	ClientData clientData, /* Pointer to widget record. */
823		int x, int y, /* Upper left pixel (within image) that must
	820	TCL_UNUSED(int), /* Upper left pixel (within image) that must
824	821	* be redisplayed. */
825		int width, int height, /* Dimensions of area to redisplay (may be
	822	TCL_UNUSED(int),
	823	TCL_UNUSED(int), /* Dimensions of area to redisplay (may be
826	824	* <= 0). */
827		int imgWidth, int imgHeight)/* New dimensions of image. */
828
829		{
830		TkTextSegment *eiPtr = clientData;
	825	TCL_UNUSED(int),
	826	TCL_UNUSED(int),/* New dimensions of image. */
	827	TCL_UNUSED(int))
	828
	829	{
	830	TkTextSegment eiPtr = (TkTextSegment )clientData;
831	831	TkTextIndex index;
832	832
833	833	index.tree = eiPtr->body.ei.sharedTextPtr->tree;

+22

-22

generic/tkTextIndex.c less more

10	10	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
11	11	*/
12	12
13		#include "default.h"
14	13	#include "tkInt.h"
15	14	#include "tkText.h"
	15	#include "default.h"
16	16
17	17	/*
18	18	* Index to use to select last character in line (very large integer):

61	61	#define GET_INDEXEPOCH(objPtr) \
62	62	(PTR2INT((objPtr)->internalRep.twoPtrValue.ptr2))
63	63	#define SET_TEXTINDEX(objPtr, indexPtr) \
64		((objPtr)->internalRep.twoPtrValue.ptr1 = (void *) (indexPtr))
	64	((objPtr)->internalRep.twoPtrValue.ptr1 = (void *)(indexPtr))
65	65	#define SET_INDEXEPOCH(objPtr, epoch) \
66	66	((objPtr)->internalRep.twoPtrValue.ptr2 = INT2PTR(epoch))
67	67

106	106	int epoch;
107	107	TkTextIndex dupIndexPtr, indexPtr;
108	108
109		dupIndexPtr = ckalloc(sizeof(TkTextIndex));
	109	dupIndexPtr = (TkTextIndex *)ckalloc(sizeof(TkTextIndex));
110	110	indexPtr = GET_TEXTINDEX(srcPtr);
111	111	epoch = GET_INDEXEPOCH(srcPtr);
112	112

138	138
139	139	len = TkTextPrintIndex(indexPtr->textPtr, indexPtr, buffer);
140	140
141		objPtr->bytes = ckalloc(len + 1);
	141	objPtr->bytes = (char *)ckalloc(len + 1);
142	142	strcpy(objPtr->bytes, buffer);
143	143	objPtr->length = len;
144	144	}

175	175	* position. */
176	176	const TkTextIndex origPtr) / Pointer to index. */
177	177	{
178		TkTextIndex *indexPtr = ckalloc(sizeof(TkTextIndex));
	178	TkTextIndex indexPtr = (TkTextIndex )ckalloc(sizeof(TkTextIndex));
179	179
180	180	indexPtr->tree = origPtr->tree;
181	181	indexPtr->linePtr = origPtr->linePtr;

435	435	*/
436	436
437	437	start = segPtr->body.chars + (byteIndex - index);
438		p = Tcl_UtfPrev(start, segPtr->body.chars);
	438	p = TkUtfPrev(start, segPtr->body.chars);
439	439	p += TkUtfToUniChar(p, &ch);
440	440	indexPtr->byteIndex += p - start;
441	441	}

476	476	int charIndex, /* Index of desired character. */
477	477	TkTextIndex indexPtr) / Structure to fill in. */
478	478	{
479		register TkTextSegment *segPtr;
	479	TkTextSegment *segPtr;
480	480	char p, start, *end;
481	481	int index, offset;
482	482	int ch;

815	815	hPtr = Tcl_FindHashEntry(&sharedPtr->tagTable, tagName);
816	816	*p = '.';
817	817	if (hPtr != NULL) {
818		tagPtr = Tcl_GetHashValue(hPtr);
	818	tagPtr = (TkTextTag *)Tcl_GetHashValue(hPtr);
819	819	}
820	820	}
821	821

831	831	if (tagPtr == textPtr->selTagPtr) {
832	832	tagName = "sel";
833	833	} else if (hPtr != NULL) {
834		tagName = Tcl_GetHashKey(&sharedPtr->tagTable, hPtr);
	834	tagName = (const char *)Tcl_GetHashKey(&sharedPtr->tagTable, hPtr);
835	835	}
836	836	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
837	837	"text doesn't contain any characters tagged with \"%s\"",

922	922	}
923	923	if ((string[0] == 'e')
924	924	&& (strncmp(string, "end",
925		(size_t) (endOfBase-Tcl_DStringValue(&copy))) == 0)) {
	925	endOfBase-Tcl_DStringValue(&copy)) == 0)) {
926	926	/*
927	927	* Base position is end of text.
928	928	*/

1150	1150	* or "-" that starts modifier. */
1151	1151	TkTextIndex indexPtr) / Index to update as specified in string. */
1152	1152	{
1153		register const char p, units;
	1153	const char p, units;
1154	1154	char *end;
1155	1155	int count, lineIndex, modifier;
1156	1156	size_t length;

1498	1498	return;
1499	1499	}
1500	1500	if (checkElided) {
1501		infoPtr = ckalloc(sizeof(TkTextElideInfo));
	1501	infoPtr = (TkTextElideInfo *)ckalloc(sizeof(TkTextElideInfo));
1502	1502	elide = TkTextIsElided(textPtr, srcPtr, infoPtr);
1503	1503	}
1504	1504

1596	1596	charCount--;
1597	1597	}
1598	1598	} else if (type & COUNT_INDICES) {
1599		if (charCount < segPtr->size - byteOffset) {
	1599	if (charCount + byteOffset < segPtr->size) {
1600	1600	dstPtr->byteIndex += charCount;
1601	1601	goto forwardCharDone;
1602	1602	}

1766	1766	seg2Ptr = TkTextIndexToSeg(indexPtr2, &maxBytes);
1767	1767
1768	1768	if (checkElided) {
1769		infoPtr = ckalloc(sizeof(TkTextElideInfo));
	1769	infoPtr = (TkTextElideInfo *)ckalloc(sizeof(TkTextElideInfo));
1770	1770	elide = TkTextIsElided(textPtr, indexPtr1, infoPtr);
1771	1771	}
1772	1772

1843	1843
1844	1844	if (segPtr->typePtr == &tkTextCharType) {
1845	1845	int byteLen = segPtr->size - byteOffset;
1846		register unsigned char str = (unsigned char )
	1846	unsigned char str = (unsigned char )
1847	1847	segPtr->body.chars + byteOffset;
1848		register int i;
	1848	int i;
1849	1849
1850	1850	if (segPtr == seg2Ptr) {
1851		if (byteLen > (maxBytes - byteOffset)) {
	1851	if (byteLen + byteOffset > maxBytes) {
1852	1852	byteLen = maxBytes - byteOffset;
1853	1853	}
1854	1854	}

1878	1878	int byteLen = segPtr->size - byteOffset;
1879	1879
1880	1880	if (segPtr == seg2Ptr) {
1881		if (byteLen > (maxBytes - byteOffset)) {
	1881	if (byteLen + byteOffset > maxBytes) {
1882	1882	byteLen = maxBytes - byteOffset;
1883	1883	}
1884	1884	}

2024	2024	return;
2025	2025	}
2026	2026	if (checkElided) {
2027		infoPtr = ckalloc(sizeof(TkTextElideInfo));
	2027	infoPtr = (TkTextElideInfo *)ckalloc(sizeof(TkTextElideInfo));
2028	2028	elide = TkTextIsElided(textPtr, srcPtr, infoPtr);
2029	2029	}
2030	2030

2124	2124	if (segPtr->typePtr == &tkTextCharType) {
2125	2125	start = segPtr->body.chars;
2126	2126	end = segPtr->body.chars + segSize;
2127		for (p = end; ; p = Tcl_UtfPrev(p, start)) {
	2127	for (p = end; ; p = TkUtfPrev(p, start)) {
2128	2128	if (charCount == 0) {
2129	2129	dstPtr->byteIndex -= (end - p);
2130	2130	goto backwardCharDone;

2224	2224	{
2225	2225	const char *p;
2226	2226	size_t length;
2227		register TkTextSegment *segPtr;
	2227	TkTextSegment *segPtr;
2228	2228	int modifier;
2229	2229
2230	2230	/*

2365	2365	}
2366	2366	if (offset > 0) {
2367	2367	chSize = (segPtr->body.chars + offset
2368		- Tcl_UtfPrev(segPtr->body.chars + offset,
	2368	- TkUtfPrev(segPtr->body.chars + offset,
2369	2369	segPtr->body.chars));
2370	2370	}
2371	2371	firstChar = 0;

+30

-33

generic/tkTextMark.c less more

18	18	* Macro that determines the size of a mark segment:
19	19	*/
20	20
21		#define MSEG_SIZE ((unsigned) (Tk_Offset(TkTextSegment, body) \
	21	#define MSEG_SIZE ((unsigned)(Tk_Offset(TkTextSegment, body) \
22	22	+ sizeof(TkTextMark)))
23	23
24	24	/*

92	92
93	93	int
94	94	TkTextMarkCmd(
95		register TkText textPtr, / Information about text widget. */
	95	TkText textPtr, / Information about text widget. */
96	96	Tcl_Interp interp, / Current interpreter. */
97	97	int objc, /* Number of arguments. */
98	98	Tcl_Obj const objv[]) / Argument objects. Someone else has already

146	146	NULL);
147	147	return TCL_ERROR;
148	148	}
149		markPtr = Tcl_GetHashValue(hPtr);
	149	markPtr = (TkTextSegment *)Tcl_GetHashValue(hPtr);
150	150	}
151	151	if (objc == 4) {
152	152	const char *typeStr;

161	161	}
162	162	str = Tcl_GetStringFromObj(objv[4],&length);
163	163	c = str[0];
164		if ((c == 'l') && (strncmp(str, "left", (unsigned) length) == 0)) {
	164	if ((c == 'l') && (strncmp(str, "left", length) == 0)) {
165	165	newTypePtr = &tkTextLeftMarkType;
166	166	} else if ((c == 'r') &&
167		(strncmp(str, "right", (unsigned) length) == 0)) {
	167	(strncmp(str, "right", length) == 0)) {
168	168	newTypePtr = &tkTextRightMarkType;
169	169	} else {
170	170	Tcl_SetObjResult(interp, Tcl_ObjPrintf(

193	193	for (hPtr = Tcl_FirstHashEntry(&textPtr->sharedTextPtr->markTable,
194	194	&search); hPtr != NULL; hPtr = Tcl_NextHashEntry(&search)) {
195	195	Tcl_ListObjAppendElement(NULL, resultObj, Tcl_NewStringObj(
196		Tcl_GetHashKey(&textPtr->sharedTextPtr->markTable, hPtr),
	196	(const char *)Tcl_GetHashKey(&textPtr->sharedTextPtr->markTable, hPtr),
197	197	-1));
198	198	}
199	199	Tcl_SetObjResult(interp, resultObj);

228	228	hPtr = Tcl_FindHashEntry(&textPtr->sharedTextPtr->markTable,
229	229	Tcl_GetString(objv[i]));
230	230	if (hPtr != NULL) {
231		markPtr = Tcl_GetHashValue(hPtr);
	231	markPtr = (TkTextSegment *)Tcl_GetHashValue(hPtr);
232	232
233	233	/*
234	234	* Special case not needed with peer widgets.

289	289	widgetSpecific = 0;
290	290	hPtr = Tcl_CreateHashEntry(&textPtr->sharedTextPtr->markTable, name,
291	291	&isNew);
292		markPtr = Tcl_GetHashValue(hPtr);
	292	markPtr = (TkTextSegment *)Tcl_GetHashValue(hPtr);
293	293	}
294	294	if (!isNew) {
295	295	/*

329	329	}
330	330	TkBTreeUnlinkSegment(markPtr, markPtr->body.mark.linePtr);
331	331	} else {
332		markPtr = ckalloc(MSEG_SIZE);
	332	markPtr = (TkTextSegment *)ckalloc(MSEG_SIZE);
333	333	markPtr->typePtr = &tkTextRightMarkType;
334	334	markPtr->size = 0;
335	335	markPtr->body.mark.textPtr = textPtr;

451	451	if (hPtr == NULL) {
452	452	return TCL_ERROR;
453	453	}
454		segPtr = Tcl_GetHashValue(hPtr);
	454	segPtr = (TkTextSegment *)Tcl_GetHashValue(hPtr);
455	455	}
456	456	TkTextMarkSegToIndex(textPtr, segPtr, indexPtr);
457	457

498	498	*--------------------------------------------------------------
499	499	*/
500	500
501		/* ARGSUSED */
502	501	static int
503	502	MarkDeleteProc(
504		TkTextSegment segPtr, / Segment being deleted. */
505		TkTextLine linePtr, / Line containing segment. */
506		int treeGone) /* Non-zero means the entire tree is being
	503	TCL_UNUSED(TkTextSegment ), / Segment being deleted. */
	504	TCL_UNUSED(TkTextLine ), / Line containing segment. */
	505	TCL_UNUSED(int)) /* Non-zero means the entire tree is being
507	506	* deleted, so everything must get cleaned
508	507	* up. */
509	508	{

558	557	static int
559	558	MarkLayoutProc(
560	559	TkText textPtr, / Text widget being layed out. */
561		TkTextIndex indexPtr, / Identifies first character in chunk. */
	560	TCL_UNUSED(TkTextIndex ), / Identifies first character in chunk. */
562	561	TkTextSegment segPtr, / Segment corresponding to indexPtr. */
563		int offset, /* Offset within segPtr corresponding to
	562	TCL_UNUSED(int), /* Offset within segPtr corresponding to
564	563	* indexPtr (always 0). */
565		int maxX, /* Chunk must not occupy pixels at this
	564	TCL_UNUSED(int), /* Chunk must not occupy pixels at this
566	565	* position or higher. */
567		int maxChars, /* Chunk must not include more than this many
	566	TCL_UNUSED(int), /* Chunk must not include more than this many
568	567	* characters. */
569		int noCharsYet, /* Non-zero means no characters have been
	568	TCL_UNUSED(int), /* Non-zero means no characters have been
570	569	* assigned to this line yet. */
571		TkWrapMode wrapMode, /* Not used. */
572		register TkTextDispChunk *chunkPtr)
	570	TCL_UNUSED(TkWrapMode), /* Not used. */
	571	TkTextDispChunk *chunkPtr)
573	572	/* Structure to fill in with information about
574	573	* this chunk. The x field has already been
575	574	* set by the caller. */

614	613	*--------------------------------------------------------------
615	614	*/
616	615
617		/* ARGSUSED */
618	616	void
619	617	TkTextInsertDisplayProc(
620	618	TkText textPtr, / The current text widget. */
621		TkTextDispChunk chunkPtr, / Chunk that is to be drawn. */
	619	TCL_UNUSED(TkTextDispChunk ), / Chunk that is to be drawn. */
622	620	int x, /* X-position in dst at which to draw this
623	621	* chunk (may differ from the x-position in
624	622	* the chunk because of scrolling). */
625	623	int y, /* Y-position at which to draw this chunk in
626	624	* dst (x-position is in the chunk itself). */
627	625	int height, /* Total height of line. */
628		int baseline, /* Offset of baseline from y. */
629		Display display, / Display to use for drawing. */
	626	TCL_UNUSED(int), /* Offset of baseline from y. */
	627	TCL_UNUSED(Display ), / Display to use for drawing. */
630	628	Drawable dst, /* Pixmap or window in which to draw chunk. */
631	629	int screenY) /* Y-coordinate in text window that
632	630	* corresponds to y. */

720	718	*--------------------------------------------------------------
721	719	*/
722	720
723		/* ARGSUSED */
724	721	static void
725	722	InsertUndisplayProc(
726		TkText textPtr, / Overall information about text widget. */
727		TkTextDispChunk chunkPtr) / Chunk that is about to be freed. */
	723	TCL_UNUSED(TkText ), / Overall information about text widget. */
	724	TCL_UNUSED(TkTextDispChunk )) / Chunk that is about to be freed. */
728	725	{
729	726	return;
730	727	}

808	805	{
809	806	TkTextIndex index;
810	807	Tcl_HashEntry *hPtr;
811		register TkTextSegment *segPtr;
	808	TkTextSegment *segPtr;
812	809	int offset;
813	810	const char *string = Tcl_GetString(obj);
814	811

829	826	* position.
830	827	*/
831	828
832		segPtr = Tcl_GetHashValue(hPtr);
	829	segPtr = (TkTextSegment *)Tcl_GetHashValue(hPtr);
833	830	TkTextMarkSegToIndex(textPtr, segPtr, &index);
834	831	segPtr = segPtr->nextPtr;
835	832	} else {

899	896	{
900	897	TkTextIndex index;
901	898	Tcl_HashEntry *hPtr;
902		register TkTextSegment segPtr, seg2Ptr, *prevPtr;
	899	TkTextSegment segPtr, seg2Ptr, *prevPtr;
903	900	int offset;
904	901	const char *string = Tcl_GetString(obj);
905	902

918	915	* position.
919	916	*/
920	917
921		segPtr = Tcl_GetHashValue(hPtr);
	918	segPtr = (TkTextSegment *)Tcl_GetHashValue(hPtr);
922	919	TkTextMarkSegToIndex(textPtr, segPtr, &index);
923	920	} else {
924	921	/*

1011	1008
1012	1009	return NULL;
1013	1010	} else {
1014		markName = Tcl_GetHashKey(&textPtr->sharedTextPtr->markTable,
	1011	markName = (const char *)Tcl_GetHashKey(&textPtr->sharedTextPtr->markTable,
1015	1012	segPtr->body.mark.hPtr);
1016	1013	}
1017	1014	return Tcl_NewStringObj(markName, -1);

+26

-26

generic/tkTextTag.c less more

11	11	* this file, and for a DISCLAIMER OF ALL WARRANTIES.
12	12	*/
13	13
14		#include "default.h"
15	14	#include "tkInt.h"
16	15	#include "tkText.h"
	16	#include "default.h"
17	17
18	18	/*
19	19	* The 'TkWrapMode' enum in tkText.h is used to define a type for the -wrap

136	136
137	137	int
138	138	TkTextTagCmd(
139		register TkText textPtr, / Information about text widget. */
	139	TkText textPtr, / Information about text widget. */
140	140	Tcl_Interp interp, / Current interpreter. */
141	141	int objc, /* Number of arguments. */
142	142	Tcl_Obj const objv[]) / Argument objects. Someone else has already

153	153	TAG_REMOVE
154	154	};
155	155	int optionIndex, i;
156		register TkTextTag *tagPtr;
	156	TkTextTag *tagPtr;
157	157	TkTextIndex index1, index2;
158	158
159	159	if (objc < 3) {

342	342	if (tagPtr == NULL) {
343	343	return TCL_ERROR;
344	344	}
345		objPtr = Tk_GetOptionValue(interp, (char *) tagPtr,
	345	objPtr = Tk_GetOptionValue(interp, (char *)tagPtr,
346	346	tagPtr->optionTable, objv[4], textPtr->tkwin);
347	347	if (objPtr == NULL) {
348	348	return TCL_ERROR;

361	361	}
362	362	tagPtr = TkTextCreateTag(textPtr, Tcl_GetString(objv[3]), &newTag);
363	363	if (objc <= 5) {
364		Tcl_Obj objPtr = Tk_GetOptionInfo(interp, (char ) tagPtr,
	364	Tcl_Obj objPtr = Tk_GetOptionInfo(interp, (char )tagPtr,
365	365	tagPtr->optionTable,
366	366	(objc == 5) ? objv[4] : NULL, textPtr->tkwin);
367	367

373	373	} else {
374	374	int result = TCL_OK;
375	375
376		if (Tk_SetOptions(interp, (char *) tagPtr, tagPtr->optionTable,
	376	if (Tk_SetOptions(interp, (char *)tagPtr, tagPtr->optionTable,
377	377	objc-4, objv+4, textPtr->tkwin, NULL, NULL) != TCL_OK) {
378	378	return TCL_ERROR;
379	379	}

583	583
584	584	continue;
585	585	}
586		tagPtr = Tcl_GetHashValue(hPtr);
	586	tagPtr = (TkTextTag *)Tcl_GetHashValue(hPtr);
587	587	if (tagPtr == textPtr->selTagPtr) {
588	588	continue;
589	589	}

644	644	Tcl_HashSearch search;
645	645	Tcl_HashEntry *hPtr;
646	646
647		arrayPtr = ckalloc(textPtr->sharedTextPtr->numTags
	647	arrayPtr = (TkTextTag **)ckalloc(textPtr->sharedTextPtr->numTags
648	648	* sizeof(TkTextTag *));
649	649	for (i=0, hPtr = Tcl_FirstHashEntry(
650	650	&textPtr->sharedTextPtr->tagTable, &search);
651	651	hPtr != NULL; i++, hPtr = Tcl_NextHashEntry(&search)) {
652		arrayPtr[i] = Tcl_GetHashValue(hPtr);
	652	arrayPtr[i] = (TkTextTag *)Tcl_GetHashValue(hPtr);
653	653	}
654	654
655	655	/*

985	985	int newTag) / If non-NULL, then return 1 if new, or 0 if
986	986	* already exists. */
987	987	{
988		register TkTextTag *tagPtr;
	988	TkTextTag *tagPtr;
989	989	Tcl_HashEntry *hPtr = NULL;
990	990	int isNew;
991	991	const char *name;

1008	1008	*newTag = isNew;
1009	1009	}
1010	1010	if (!isNew) {
1011		return Tcl_GetHashValue(hPtr);
1012		}
1013		name = Tcl_GetHashKey(&textPtr->sharedTextPtr->tagTable, hPtr);
	1011	return (TkTextTag *)Tcl_GetHashValue(hPtr);
	1012	}
	1013	name = (const char *)Tcl_GetHashKey(&textPtr->sharedTextPtr->tagTable, hPtr);
1014	1014	}
1015	1015
1016	1016	/*

1018	1018	* to it to the hash table entry.
1019	1019	*/
1020	1020
1021		tagPtr = ckalloc(sizeof(TkTextTag));
	1021	tagPtr = (TkTextTag *)ckalloc(sizeof(TkTextTag));
1022	1022	tagPtr->name = name;
1023	1023	tagPtr->textPtr = NULL;
1024	1024	tagPtr->toggleCount = 0;

1117	1117	hPtr = Tcl_FindHashEntry(&textPtr->sharedTextPtr->tagTable,
1118	1118	Tcl_GetString(tagName));
1119	1119	if (hPtr != NULL) {
1120		return Tcl_GetHashValue(hPtr);
	1120	return (TkTextTag *)Tcl_GetHashValue(hPtr);
1121	1121	}
1122	1122	if (interp != NULL) {
1123	1123	Tcl_SetObjResult(interp, Tcl_ObjPrintf(

1157	1157	void
1158	1158	TkTextDeleteTag(
1159	1159	TkText textPtr, / Info about overall widget. */
1160		register TkTextTag tagPtr) / Tag being deleted. */
	1160	TkTextTag tagPtr) / Tag being deleted. */
1161	1161	{
1162	1162	TkTextIndex first, last;
1163	1163

1215	1215	void
1216	1216	TkTextFreeTag(
1217	1217	TkText textPtr, / Info about overall widget. */
1218		register TkTextTag tagPtr) / Tag being deleted. */
	1218	TkTextTag tagPtr) / Tag being deleted. */
1219	1219	{
1220	1220	int i;
1221	1221

1294	1294	TkTextTag *tagArrayPtr) / Pointer to array of pointers. */
1295	1295	{
1296	1296	int i, j, prio;
1297		register TkTextTag **tagPtrPtr;
	1297	TkTextTag **tagPtrPtr;
1298	1298	TkTextTag *maxPtrPtr, tmp;
1299	1299
1300	1300	if (numTags < 2) {

1378	1378	int prio) /* New priority for tag. */
1379	1379	{
1380	1380	int low, high, delta;
1381		register TkTextTag *tagPtr2;
	1381	TkTextTag *tagPtr2;
1382	1382	Tcl_HashEntry *hPtr;
1383	1383	Tcl_HashSearch search;
1384	1384

1411	1411	}
1412	1412	for (hPtr = Tcl_FirstHashEntry(&textPtr->sharedTextPtr->tagTable, &search);
1413	1413	hPtr != NULL; hPtr = Tcl_NextHashEntry(&search)) {
1414		tagPtr2 = Tcl_GetHashValue(hPtr);
	1414	tagPtr2 = (TkTextTag *)Tcl_GetHashValue(hPtr);
1415	1415	if ((tagPtr2->priority >= low) && (tagPtr2->priority <= high)) {
1416	1416	tagPtr2->priority += delta;
1417	1417	}

1439	1439
1440	1440	void
1441	1441	TkTextBindProc(
1442		ClientData clientData, /* Pointer to canvas structure. */
	1442	ClientData clientData, /* Pointer to text widget structure. */
1443	1443	XEvent eventPtr) / Pointer to X event that just happened. */
1444	1444	{
1445		TkText *textPtr = clientData;
	1445	TkText textPtr = (TkText )clientData;
1446	1446	int repick = 0;
1447	1447
1448	1448	textPtr->refCount++;

1528	1528
1529	1529	void
1530	1530	TkTextPickCurrent(
1531		register TkText textPtr, / Text widget in which to select current
	1531	TkText textPtr, / Text widget in which to select current
1532	1532	* character. */
1533	1533	XEvent eventPtr) / Event describing location of mouse cursor.
1534	1534	* Must be EnterWindow, LeaveWindow,

1631	1631	SortTags(textPtr->numCurTags, textPtr->curTagArrayPtr);
1632	1632	if (numNewTags > 0) {
1633	1633	size = numNewTags * sizeof(TkTextTag *);
1634		copyArrayPtr = ckalloc(size);
1635		memcpy(copyArrayPtr, newArrayPtr, (size_t) size);
	1634	copyArrayPtr = (TkTextTag **)ckalloc(size);
	1635	memcpy(copyArrayPtr, newArrayPtr, size);
1636	1636	for (i = 0; i < textPtr->numCurTags; i++) {
1637	1637	for (j = 0; j < numNewTags; j++) {
1638	1638	if (textPtr->curTagArrayPtr[i] == copyArrayPtr[j]) {

1735	1735	*/
1736	1736
1737	1737	if (numTags > NUM_BIND_TAGS) {
1738		nameArrPtr = ckalloc(numTags * sizeof(const char *));
	1738	nameArrPtr = (const char *)ckalloc(numTags sizeof(const char *));
1739	1739	} else {
1740	1740	nameArrPtr = nameArray;
1741	1741	}

+42

-47

generic/tkTextWind.c less more

21	21
22	22	static void EmbWinRequestProc(ClientData clientData,
23	23	Tk_Window tkwin);
24		static void EmbWinLostSlaveProc(ClientData clientData,
	24	static void EmbWinLostContentProc(ClientData clientData,
25	25	Tk_Window tkwin);
26	26
27	27	static const Tk_GeomMgr textGeomType = {
28	28	"text", /* name */
29	29	EmbWinRequestProc, /* requestProc */
30		EmbWinLostSlaveProc, /* lostSlaveProc */
	30	EmbWinLostContentProc, /* lostSlaveProc */
31	31	};
32	32
33	33	/*
34	34	* Macro that determines the size of an embedded window segment:
35	35	*/
36	36
37		#define EW_SEG_SIZE ((unsigned) (Tk_Offset(TkTextSegment, body) \
	37	#define EW_SEG_SIZE ((unsigned)(Tk_Offset(TkTextSegment, body) \
38	38	+ sizeof(TkTextEmbWindow)))
39	39
40	40	/*

132	132
133	133	int
134	134	TkTextWindowCmd(
135		register TkText textPtr, / Information about text widget. */
	135	TkText textPtr, / Information about text widget. */
136	136	Tcl_Interp interp, / Current interpreter. */
137	137	int objc, /* Number of arguments. */
138	138	Tcl_Obj const objv[]) / Argument objects. Someone else has already

146	146	enum windOptions {
147	147	WIND_CGET, WIND_CONFIGURE, WIND_CREATE, WIND_NAMES
148	148	};
149		register TkTextSegment *ewPtr;
	149	TkTextSegment *ewPtr;
150	150
151	151	if (objc < 3) {
152	152	Tcl_WrongNumArgs(interp, 2, objv, "option ?arg ...?");

159	159	switch ((enum windOptions) optionIndex) {
160	160	case WIND_CGET: {
161	161	TkTextIndex index;
162		TkTextSegment *ewPtr;
163	162	Tcl_Obj *objPtr;
164	163	TkTextEmbWindowClient *client;
165	164

190	189	ewPtr->body.ew.tkwin = NULL;
191	190	}
192	191
193		objPtr = Tk_GetOptionValue(interp, (char *) &ewPtr->body.ew,
	192	objPtr = Tk_GetOptionValue(interp, (char *)&ewPtr->body.ew,
194	193	ewPtr->body.ew.optionTable, objv[4], textPtr->tkwin);
195	194	if (objPtr == NULL) {
196	195	return TCL_ERROR;

200	199	}
201	200	case WIND_CONFIGURE: {
202	201	TkTextIndex index;
203		TkTextSegment *ewPtr;
204	202
205	203	if (objc < 4) {
206	204	Tcl_WrongNumArgs(interp, 3, objv, "index ?-option value ...?");

232	230	ewPtr->body.ew.tkwin = NULL;
233	231	}
234	232
235		objPtr = Tk_GetOptionInfo(interp, (char *) &ewPtr->body.ew,
	233	objPtr = Tk_GetOptionInfo(interp, (char *)&ewPtr->body.ew,
236	234	ewPtr->body.ew.optionTable, (objc == 5) ? objv[4] : NULL,
237	235	textPtr->tkwin);
238	236	if (objPtr == NULL) {

289	287	* Create the new window segment and initialize it.
290	288	*/
291	289
292		ewPtr = ckalloc(EW_SEG_SIZE);
	290	ewPtr = (TkTextSegment *)ckalloc(EW_SEG_SIZE);
293	291	ewPtr->typePtr = &tkTextEmbWindowType;
294	292	ewPtr->size = 1;
295	293	ewPtr->body.ew.sharedTextPtr = textPtr->sharedTextPtr;

301	299	ewPtr->body.ew.stretch = 0;
302	300	ewPtr->body.ew.optionTable = Tk_CreateOptionTable(interp, optionSpecs);
303	301
304		client = ckalloc(sizeof(TkTextEmbWindowClient));
	302	client = (TkTextEmbWindowClient *)ckalloc(sizeof(TkTextEmbWindowClient));
305	303	client->next = NULL;
306	304	client->textPtr = textPtr;
307	305	client->tkwin = NULL;

344	342	for (hPtr = Tcl_FirstHashEntry(&textPtr->sharedTextPtr->windowTable,
345	343	&search); hPtr != NULL; hPtr = Tcl_NextHashEntry(&search)) {
346	344	Tcl_ListObjAppendElement(NULL, resultObj, Tcl_NewStringObj(
347		Tcl_GetHashKey(&textPtr->sharedTextPtr->markTable, hPtr),
	345	(const char *)Tcl_GetHashKey(&textPtr->sharedTextPtr->markTable, hPtr),
348	346	-1));
349	347	}
350	348	Tcl_SetObjResult(interp, resultObj);

402	400	}
403	401
404	402	oldWindow = ewPtr->body.ew.tkwin;
405		if (Tk_SetOptions(textPtr->interp, (char *) &ewPtr->body.ew,
	403	if (Tk_SetOptions(textPtr->interp, (char *)&ewPtr->body.ew,
406	404	ewPtr->body.ew.optionTable, objc, objv, textPtr->tkwin, NULL,
407	405	NULL) != TCL_OK) {
408	406	return TCL_ERROR;

442	440	break;
443	441	}
444	442	if (Tk_TopWinHierarchy(ancestor)) {
445		badMaster:
	443	badContainer:
446	444	Tcl_SetObjResult(textPtr->interp, Tcl_ObjPrintf(
447	445	"can't embed %s in %s",
448	446	Tk_PathName(ewPtr->body.ew.tkwin),

458	456	}
459	457	if (Tk_TopWinHierarchy(ewPtr->body.ew.tkwin)
460	458	\|\| (ewPtr->body.ew.tkwin == textPtr->tkwin)) {
461		goto badMaster;
	459	goto badContainer;
462	460	}
463	461
464	462	if (client == NULL) {

466	464	* Have to make the new client.
467	465	*/
468	466
469		client = ckalloc(sizeof(TkTextEmbWindowClient));
	467	client = (TkTextEmbWindowClient *)ckalloc(sizeof(TkTextEmbWindowClient));
470	468	client->next = ewPtr->body.ew.clients;
471	469	client->textPtr = textPtr;
472	470	client->tkwin = NULL;

525	523	ClientData clientData, /* Pointer to record describing window item. */
526	524	XEvent eventPtr) / Describes what just happened. */
527	525	{
528		TkTextEmbWindowClient *client = clientData;
	526	TkTextEmbWindowClient client = (TkTextEmbWindowClient )clientData;
529	527	TkTextSegment *ewPtr = client->parent;
530	528	TkTextIndex index;
531	529	Tcl_HashEntry *hPtr;

572	570	*--------------------------------------------------------------
573	571	*/
574	572
575		/* ARGSUSED */
576	573	static void
577	574	EmbWinRequestProc(
578	575	ClientData clientData, /* Pointer to record for window item. */
579		Tk_Window tkwin) /* Window that changed its desired size. */
580		{
581		TkTextEmbWindowClient *client = clientData;
	576	TCL_UNUSED(Tk_Window)) /* Window that changed its desired size. */
	577	{
	578	TkTextEmbWindowClient client = (TkTextEmbWindowClient )clientData;
582	579	TkTextSegment *ewPtr = client->parent;
583	580	TkTextIndex index;
584	581

593	590	/*
594	591	*--------------------------------------------------------------
595	592	*
596		* EmbWinLostSlaveProc --
597		*
598		* This function is invoked by the Tk geometry manager when a slave
	593	* EmbWinLostContentProc --
	594	*
	595	* This function is invoked by the Tk geometry manager when a content
599	596	* window managed by a text widget is claimed away by another geometry
600	597	* manager.
601	598	*

610	607	*/
611	608
612	609	static void
613		EmbWinLostSlaveProc(
	610	EmbWinLostContentProc(
614	611	ClientData clientData, /* Pointer to record describing window item. */
615	612	Tk_Window tkwin) /* Window that was claimed away by another
616	613	* geometry manager. */
617	614	{
618		TkTextEmbWindowClient *client = clientData;
	615	TkTextEmbWindowClient client = (TkTextEmbWindowClient )clientData;
619	616	TkTextSegment *ewPtr = client->parent;
620	617	TkTextIndex index;
621	618	Tcl_HashEntry *hPtr;

735	732	*--------------------------------------------------------------
736	733	*/
737	734
738		/* ARGSUSED */
739	735	static int
740	736	EmbWinDeleteProc(
741	737	TkTextSegment ewPtr, / Segment being deleted. */
742		TkTextLine linePtr, / Line containing segment. */
743		int treeGone) /* Non-zero means the entire tree is being
	738	TCL_UNUSED(TkTextLine ), / Line containing segment. */
	739	TCL_UNUSED(int)) /* Non-zero means the entire tree is being
744	740	* deleted, so everything must get cleaned
745	741	* up. */
746	742	{

815	811	*--------------------------------------------------------------
816	812	*/
817	813
818		/ARGSUSED/
819	814	static int
820	815	EmbWinLayoutProc(
821	816	TkText textPtr, / Text widget being layed out. */
822		TkTextIndex indexPtr, / Identifies first character in chunk. */
	817	TCL_UNUSED(TkTextIndex ), / Identifies first character in chunk. */
823	818	TkTextSegment ewPtr, / Segment corresponding to indexPtr. */
824	819	int offset, /* Offset within segPtr corresponding to
825	820	* indexPtr (always 0). */
826	821	int maxX, /* Chunk must not occupy pixels at this
827	822	* position or higher. */
828		int maxChars, /* Chunk must not include more than this many
	823	TCL_UNUSED(int), /* Chunk must not include more than this many
829	824	* characters. */
830	825	int noCharsYet, /* Non-zero means no characters have been
831	826	* assigned to this line yet. */
832		TkWrapMode wrapMode, /* Wrap mode to use for line:
	827	TCL_UNUSED(TkWrapMode), /* Wrap mode to use for line:
833	828	* TEXT_WRAPMODE_CHAR, TEXT_WRAPMODE_NONE, or
834	829	* TEXT_WRAPMODE_WORD. */
835		register TkTextDispChunk *chunkPtr)
	830	TkTextDispChunk *chunkPtr)
836	831	/* Structure to fill in with information about
837	832	* this chunk. The x field has already been
838	833	* set by the caller. */

935	930	break;
936	931	}
937	932	if (Tk_TopWinHierarchy(ancestor)) {
938		goto badMaster;
	933	goto badContainer;
939	934	}
940	935	}
941	936	if (Tk_TopWinHierarchy(ewPtr->body.ew.tkwin)
942	937	\|\| (textPtr->tkwin == ewPtr->body.ew.tkwin)) {
943		badMaster:
	938	badContainer:
944	939	Tcl_SetObjResult(textPtr->interp, Tcl_ObjPrintf(
945	940	"can't embed %s relative to %s",
946	941	Tk_PathName(ewPtr->body.ew.tkwin),

958	953	* now need to add to our client list.
959	954	*/
960	955
961		client = ckalloc(sizeof(TkTextEmbWindowClient));
	956	client = (TkTextEmbWindowClient *)ckalloc(sizeof(TkTextEmbWindowClient));
962	957	client->next = ewPtr->body.ew.clients;
963	958	client->textPtr = textPtr;
964	959	client->tkwin = NULL;

1051	1046	static void
1052	1047	EmbWinCheckProc(
1053	1048	TkTextSegment ewPtr, / Segment to check. */
1054		TkTextLine linePtr) / Line containing segment. */
	1049	TCL_UNUSED(TkTextLine )) / Line containing segment. */
1055	1050	{
1056	1051	if (ewPtr->nextPtr == NULL) {
1057	1052	Tcl_Panic("EmbWinCheckProc: embedded window is last segment in line");

1086	1081	int x, /* X-position in dst at which to draw this
1087	1082	* chunk (differs from the x-position in the
1088	1083	* chunk because of scrolling). */
1089		int y, /* Top of rectangular bounding box for line:
	1084	TCL_UNUSED(int), /* Top of rectangular bounding box for line:
1090	1085	* tells where to draw this chunk in dst
1091	1086	* (x-position is in the chunk itself). */
1092	1087	int lineHeight, /* Total height of line. */
1093	1088	int baseline, /* Offset of baseline from y. */
1094		Display display, / Display to use for drawing (unused). */
1095		Drawable dst, /* Pixmap or window in which to draw
	1089	TCL_UNUSED(Display ), / Display to use for drawing (unused). */
	1090	TCL_UNUSED(Drawable), /* Pixmap or window in which to draw
1096	1091	* (unused). */
1097	1092	int screenY) /* Y-coordinate in text window that
1098	1093	* corresponds to y. */
1099	1094	{
1100	1095	int lineX, windowX, windowY, width, height;
1101	1096	Tk_Window tkwin;
1102		TkTextSegment *ewPtr = chunkPtr->clientData;
	1097	TkTextSegment ewPtr = (TkTextSegment )chunkPtr->clientData;
1103	1098	TkTextEmbWindowClient *client = EmbWinGetClient(textPtr, ewPtr);
1104	1099
1105	1100	if (client == NULL) {

1179	1174	TkText textPtr, / Overall information about text widget. */
1180	1175	TkTextDispChunk chunkPtr) / Chunk that is about to be freed. */
1181	1176	{
1182		TkTextSegment *ewPtr = chunkPtr->clientData;
	1177	TkTextSegment ewPtr = (TkTextSegment )chunkPtr->clientData;
1183	1178	TkTextEmbWindowClient *client = EmbWinGetClient(textPtr, ewPtr);
1184	1179
1185	1180	if (client == NULL) {

1227	1222	EmbWinBboxProc(
1228	1223	TkText textPtr, / Information about text widget. */
1229	1224	TkTextDispChunk chunkPtr, / Chunk containing desired char. */
1230		int index, /* Index of desired character within the
	1225	TCL_UNUSED(int), /* Index of desired character within the
1231	1226	* chunk. */
1232	1227	int y, /* Topmost pixel in area allocated for this
1233	1228	* line. */

1242	1237	* pixels. */
1243	1238	{
1244	1239	Tk_Window tkwin;
1245		TkTextSegment *ewPtr = chunkPtr->clientData;
	1240	TkTextSegment ewPtr = (TkTextSegment )chunkPtr->clientData;
1246	1241	TkTextEmbWindowClient *client = EmbWinGetClient(textPtr, ewPtr);
1247	1242
1248	1243	if (client == NULL) {

1304	1299	EmbWinDelayedUnmap(
1305	1300	ClientData clientData) /* Token for the window to be unmapped. */
1306	1301	{
1307		TkTextEmbWindowClient *client = clientData;
	1302	TkTextEmbWindowClient client = (TkTextEmbWindowClient )clientData;
1308	1303
1309	1304	if (!client->displayed && (client->tkwin != NULL)) {
1310	1305	if (client->textPtr->tkwin != Tk_Parent(client->tkwin)) {

1352	1347	return 0;
1353	1348	}
1354	1349
1355		ewPtr = Tcl_GetHashValue(hPtr);
	1350	ewPtr = (TkTextSegment *)Tcl_GetHashValue(hPtr);
1356	1351	indexPtr->tree = textPtr->sharedTextPtr->tree;
1357	1352	indexPtr->linePtr = ewPtr->body.ew.linePtr;
1358	1353	indexPtr->byteIndex = TkTextSegToOffset(ewPtr, indexPtr->linePtr);

+95

-35

generic/tkUtil.c less more

298	298	tsoffset.flags = INT_MAX;
299	299	goto goodTSOffset;
300	300	}
	301	break;
301	302	case 'w':
302	303	if (value[1] != '\0') {goto badTSOffset;}
303	304	tsoffset.flags = TK_OFFSET_LEFT\|TK_OFFSET_MIDDLE;

1131	1132
1132	1133	dictObj = Tcl_NewObj();
1133	1134	for (i = 0; map[i].name != NULL ; ++i) {
1134		Tcl_Obj nameObj, fqdnObj;
	1135	Tcl_Obj *fqdnObj;
1135	1136
1136	1137	nameObj = Tcl_NewStringObj(map[i].name, -1);
1137	1138	fqdnObj = Tcl_NewStringObj(Tcl_DStringValue(&ds),

1176	1177	const char *eventName,
1177	1178	Tcl_Obj *detail)
1178	1179	{
1179		union {XEvent general; XVirtualEvent virtual;} event;
	1180	union {XEvent general; XVirtualEvent virt;} event;
1180	1181
1181	1182	memset(&event, 0, sizeof(event));
1182	1183	event.general.xany.type = VirtualEvent;

1184	1185	event.general.xany.send_event = False;
1185	1186	event.general.xany.window = Tk_WindowId(target);
1186	1187	event.general.xany.display = Tk_Display(target);
1187		event.virtual.name = Tk_GetUid(eventName);
1188		if (detail != NULL) {
1189		event.virtual.user_data = detail;
1190		}
	1188	event.virt.name = Tk_GetUid(eventName);
	1189	event.virt.user_data = detail;
1191	1190
1192	1191	Tk_QueueWindowEvent(&event.general, TCL_QUEUE_TAIL);
1193	1192	}

1215	1214	int
1216	1215	TkUtfToUniChar(
1217	1216	const char src, / The UTF-8 string. */
1218		int chPtr) / Filled with the Tcl_UniChar represented by
	1217	int chPtr) / Filled with the Unicode value represented by
1219	1218	* the UTF-8 string. */
1220	1219	{
1221	1220	Tcl_UniChar uniChar = 0;
1222	1221
1223	1222	int len = Tcl_UtfToUniChar(src, &uniChar);
1224		if ((uniChar & 0xfc00) == 0xd800) {
1225		Tcl_UniChar high = uniChar;
	1223	if ((sizeof(Tcl_UniChar) == 2) && ((uniChar & 0xFC00) == 0xD800)) {
	1224	Tcl_UniChar low = uniChar;
1226	1225	/* This can only happen if Tcl is compiled with TCL_UTF_MAX=4,
1227	1226	* or when a high surrogate character is detected in UTF-8 form */
1228		int len2 = Tcl_UtfToUniChar(src+len, &uniChar);
1229		if ((uniChar & 0xfc00) == 0xdc00) {
1230		*chPtr = (((high & 0x3ff) << 10) \| (uniChar & 0x3ff)) + 0x10000;
1231		len += len2;
1232		} else {
1233		*chPtr = high;
1234		}
1235		} else {
1236		*chPtr = uniChar;
1237		}
	1227	int len2 = Tcl_UtfToUniChar(src+len, &low);
	1228	if ((low & 0xFC00) == 0xDC00) {
	1229	*chPtr = (((uniChar & 0x3FF) << 10) \| (low & 0x3FF)) + 0x10000;
	1230	return len + len2;
	1231	}
	1232	}
	1233	*chPtr = uniChar;
1238	1234	return len;
1239	1235	}
1240	1236

1243	1239	*
1244	1240	* TkUniCharToUtf --
1245	1241	*
1246		* Almost the same as Tcl_UniCharToUtf but producing 4-byte UTF-8
1247		* sequences even when TCL_UTF_MAX==3. So, up to 4 bytes might be produced.
	1242	* Almost the same as Tcl_UniCharToUtf but producing 2 x 3-byte UTF-8
	1243	* sequences for out-of-bmp characters when TCL_UTF_MAX==3.
	1244	* So, up to 6 bytes might be produced.
1248	1245	*
1249	1246	* Results:
1250	1247	* *buf is filled with the UTF-8 string, and the return value is the

1258	1255
1259	1256	int TkUniCharToUtf(int ch, char *buf)
1260	1257	{
1261		int size = Tcl_UniCharToUtf(ch, buf);
1262		if ((((unsigned)(ch - 0x10000) <= 0xFFFFF)) && (size < 4)) {
1263		/* Hey, this is wrong, we must be running TCL_UTF_MAX==3
1264		* The best thing we can do is spit out a 4-byte UTF-8 character */
1265		buf[3] = (char) ((ch \| 0x80) & 0xBF);
1266		buf[2] = (char) (((ch >> 6) \| 0x80) & 0xBF);
1267		buf[1] = (char) (((ch >> 12) \| 0x80) & 0xBF);
1268		buf[0] = (char) ((ch >> 18) \| 0xF0);
1269		size = 4;
1270		}
1271		return size;
1272		}
1273
1274
	1258	if ((sizeof(Tcl_UniChar) == 2) && (((unsigned)(ch - 0x10000) <= 0xFFFFF))) {
	1259	/* Spit out a 4-byte UTF-8 character or 2 x 3-byte UTF-8 characters, depending on Tcl
	1260	* version and/or TCL_UTF_MAX build value */
	1261	int len = Tcl_UniCharToUtf(0xD800 \| ((ch - 0x10000) >> 10), buf);
	1262	return len + Tcl_UniCharToUtf(0xDC00 \| (ch & 0x7FF), buf + len);
	1263	}
	1264	return Tcl_UniCharToUtf(ch, buf);
	1265	}
	1266	/*
	1267	*---------------------------------------------------------------------------
	1268	*
	1269	* TkUtfPrev --
	1270	*
	1271	* Almost the same as Tcl_UtfPrev.
	1272	* This function is capable of jumping over a upper/lower surrogate pair.
	1273	* So, might jump back up to 6 bytes.
	1274	*
	1275	* Results:
	1276	* pointer to the first byte of the current UTF-8 character. A surrogate
	1277	* pair is also handled as being a single entity.
	1278	*
	1279	* Side effects:
	1280	* None.
	1281	*
	1282	*---------------------------------------------------------------------------
	1283	*/
	1284
	1285	const char *
	1286	TkUtfPrev(
	1287	const char src, / The UTF-8 string. */
	1288	const char start) / Start position of string */
	1289	{
	1290	const char *p = Tcl_UtfPrev(src, start);
	1291	const char *first = Tcl_UtfPrev(p, start);
	1292	int ch;
	1293
	1294	#if TCL_UTF_MAX == 3
	1295	if ((src - start > 3) && ((src[-1] & 0xC0) == 0x80) && ((src[-2] & 0xC0) == 0x80)
	1296	&& ((src[-3] & 0xC0) == 0x80) && (UCHAR(src[-4]) >= 0xF0)) {
	1297	return src - 4;
	1298	}
1275	1299	#endif
	1300
	1301	return (first + TkUtfToUniChar(first, &ch) >= src) ? first : p ;
	1302	}
	1303
	1304	/*
	1305	*---------------------------------------------------------------------------
	1306	*
	1307	* TkUtfAtIndex --
	1308	*
	1309	* Returns a pointer to the specified character (not byte) position in
	1310	* a CESU-8 string. This will never point at a low surrogate.
	1311	*
	1312	* Results:
	1313	* As above.
	1314	*
	1315	* Side effects:
	1316	* None.
	1317	*
	1318	*---------------------------------------------------------------------------
	1319	*/
	1320
	1321	const char *
	1322	TkUtfAtIndex(
	1323	const char src, / The UTF-8 string. */
	1324	int index) /* The position of the desired character. */
	1325	{
	1326	int ch;
	1327	const char *p = Tcl_UtfAtIndex(src, index);
	1328	if ((p > src) && (UCHAR(p[-1]) >= 0xF0)) {
	1329	--p;
	1330	return p + TkUtfToUniChar(p, &ch);
	1331	}
	1332	return p;
	1333	}
	1334	#endif
	1335
1276	1336	/*
1277	1337	* Local Variables:
1278	1338	* mode: c

+26

-26

generic/tkWindow.c less more

12	12	*/
13	13
14	14	#include "tkInt.h"
15
	15	#include "tkPort.h"
16	16	#ifdef _WIN32
17	17	#include "tkWinInt.h"
18	18	#elif !defined(MAC_OSX_TK)

123	123	{"place", Tk_PlaceObjCmd, PASSMAINWINDOW\|ISSAFE},
124	124	{"raise", Tk_RaiseObjCmd, PASSMAINWINDOW\|ISSAFE},
125	125	{"selection", Tk_SelectionObjCmd, PASSMAINWINDOW},
126		{"tk", (Tcl_ObjCmdProc *) TkInitTkCmd, USEINITPROC\|PASSMAINWINDOW\|ISSAFE},
	126	{"tk", (Tcl_ObjCmdProc )(void )TkInitTkCmd, USEINITPROC\|PASSMAINWINDOW\|ISSAFE},
127	127	{"tkwait", Tk_TkwaitObjCmd, PASSMAINWINDOW\|ISSAFE},
128	128	{"update", Tk_UpdateObjCmd, PASSMAINWINDOW\|ISSAFE},
129	129	{"winfo", Tk_WinfoObjCmd, PASSMAINWINDOW\|ISSAFE},

938	938	clientData = NULL;
939	939	}
940	940	if (cmdPtr->flags & USEINITPROC) {
941		((TkInitProc *) cmdPtr->objProc)(interp, clientData);
	941	((TkInitProc )(void )cmdPtr->objProc)(interp, clientData);
942	942	} else {
943	943	Tcl_CreateObjCommand(interp, cmdPtr->name, cmdPtr->objProc,
944	944	clientData, NULL);

1647	1647	event.xmap.event = winPtr->window;
1648	1648	event.xmap.window = winPtr->window;
1649	1649	event.xmap.override_redirect = winPtr->atts.override_redirect;
1650		Tk_HandleEvent(&event);
	1650	TkpHandleMapOrUnmap((Tk_Window)winPtr, &event);
1651	1651	}
1652	1652
1653	1653	/*

1809	1809	event.xunmap.event = winPtr->window;
1810	1810	event.xunmap.window = winPtr->window;
1811	1811	event.xunmap.from_configure = False;
1812		Tk_HandleEvent(&event);
	1812	TkpHandleMapOrUnmap((Tk_Window)winPtr, &event);
1813	1813	}
1814	1814	}
1815	1815

2865	2865	return 0;
2866	2866	}
2867	2867	tkmainex = (void ()(int, char , Tcl_AppInitProc , Tcl_Interp *))
2868		GetProcAddress(tkcygwindll, "Tk_MainEx");
	2868	(void *)GetProcAddress(tkcygwindll, "Tk_MainEx");
2869	2869	if (!tkmainex) {
2870	2870	return 0;
2871	2871	}

2905	2905	if (tkcygwindll) {
2906	2906	int (tkinit)(Tcl_Interp );
2907	2907
2908		tkinit = (int()(Tcl_Interp )) GetProcAddress(tkcygwindll,"Tk_Init");
	2908	tkinit = (int()(Tcl_Interp ))(void *)GetProcAddress(tkcygwindll,"Tk_Init");
2909	2909	if (tkinit) {
2910	2910	return tkinit(interp);
2911	2911	}

2968	2968	* Current risks:
2969	2969	*
2970	2970	* - No CPU time limit, no memory allocation limits, no color limits.
2971		* CPU time limits can be imposed by an unsafe master interpreter.
	2971	* CPU time limits can be imposed by an unsafe parent interpreter.
2972	2972	*
2973	2973	* The actual code called is the same as Tk_Init but Tcl_IsSafe() is
2974	2974	* checked at several places to differentiate the two initialisations.

2979	2979	int (tksafeinit)(Tcl_Interp );
2980	2980
2981	2981	tksafeinit = (int ()(Tcl_Interp ))
2982		GetProcAddress(tkcygwindll, "Tk_SafeInit");
	2982	(void *)GetProcAddress(tkcygwindll, "Tk_SafeInit");
2983	2983	if (tksafeinit) {
2984	2984	return tksafeinit(interp);
2985	2985	}

3080	3080	if (Tcl_IsSafe(interp)) {
3081	3081	/*
3082	3082	* Get the clearance to start Tk and the "argv" parameters from the
3083		* master.
	3083	* parent.
3084	3084	*/
3085	3085
3086	3086	/*
3087		* Step 1 : find the master and construct the interp name (could be a
	3087	* Step 1 : find the parent and construct the interp name (could be a
3088	3088	* function if new APIs were ok). We could also construct the path
3089	3089	* while walking, but there is no API to get the name of an interp
3090	3090	* either.
3091	3091	*/
3092	3092
3093		Tcl_Interp *master = interp;
3094
3095		while (Tcl_IsSafe(master)) {
3096		master = Tcl_GetMaster(master);
3097		if (master == NULL) {
	3093	Tcl_Interp *parent = interp;
	3094
	3095	while (Tcl_IsSafe(parent)) {
	3096	parent = Tcl_GetParent(parent);
	3097	if (parent == NULL) {
3098	3098	Tcl_SetObjResult(interp, Tcl_NewStringObj(
3099		"no controlling master interpreter", -1));
	3099	"no controlling parent interpreter", -1));
3100	3100	Tcl_SetErrorCode(interp, "TK", "SAFE", "NO_MASTER", NULL);
3101	3101	return TCL_ERROR;
3102	3102	}

3106	3106	* Construct the name (rewalk...)
3107	3107	*/
3108	3108
3109		code = Tcl_GetInterpPath(master, interp);
	3109	code = Tcl_GetInterpPath(parent, interp);
3110	3110	if (code != TCL_OK) {
3111	3111	Tcl_Panic("Tcl_GetInterpPath broken!");
3112	3112	}
3113	3113
3114	3114	/*
3115		* Build the command to eval in trusted master.
	3115	* Build the command to eval in trusted parent.
3116	3116	*/
3117	3117
3118	3118	cmd = Tcl_NewListObj(2, NULL);
3119	3119	Tcl_ListObjAppendElement(NULL, cmd,
3120	3120	Tcl_NewStringObj("::safe::TkInit", -1));
3121		Tcl_ListObjAppendElement(NULL, cmd, Tcl_GetObjResult(master));
	3121	Tcl_ListObjAppendElement(NULL, cmd, Tcl_GetObjResult(parent));
3122	3122
3123	3123	/*
3124		* Step 2 : Eval in the master. The argument is the reversed interp
3125		* path of the slave.
	3124	* Step 2 : Eval in the parent. The argument is the reversed interp
	3125	* path of the child.
3126	3126	*/
3127	3127
3128	3128	Tcl_IncrRefCount(cmd);
3129		code = Tcl_EvalObjEx(master, cmd, 0);
	3129	code = Tcl_EvalObjEx(parent, cmd, 0);
3130	3130	Tcl_DecrRefCount(cmd);
3131		Tcl_TransferResult(master, code, interp);
	3131	Tcl_TransferResult(parent, code, interp);
3132	3132	if (code != TCL_OK) {
3133	3133	return code;
3134	3134	}
3135	3135
3136	3136	/*
3137		* Use the master's result as argv. Note: We don't use the Obj
	3137	* Use the parent's result as argv. Note: We don't use the Obj
3138	3138	* interfaces to avoid dealing with cross interp refcounting and
3139	3139	* changing the code below.
3140	3140	*/

3338	3338	tcl_findLibrary tk $tk_version $tk_patchLevel tk.tcl TK_LIBRARY tk_library\n\
3339	3339	}\n\
3340	3340	}\n\
3341		tkInit", -1, 0);
	3341	tkInit", -1, TCL_EVAL_GLOBAL);
3342	3342	}
3343	3343	if (code == TCL_OK) {
3344	3344	/*

+2

-2

generic/ttk/ttkBlink.c less more

13	13	* Add script-level access to configure application-wide blink rate.
14	14	*/
15	15
16		#include <tk.h>
	16	#include "tkInt.h"
17	17	#include "ttkTheme.h"
18	18	#include "ttkWidget.h"
19	19

56	56	cm->owner = 0;
57	57	cm->onTime = DEF_CURSOR_ON_TIME;
58	58	cm->offTime = DEF_CURSOR_OFF_TIME;
59		Tcl_SetAssocData(interp,cm_key,CursorManagerDeleteProc,(ClientData)cm);
	59	Tcl_SetAssocData(interp, cm_key, CursorManagerDeleteProc, cm);
60	60	}
61	61	return cm;
62	62	}

+41

-31

generic/ttk/ttkButton.c less more

3	3	* label, button, checkbutton, radiobutton, and menubutton widgets.
4	4	*/
5	5
6		#include <string.h>
7		#include <tk.h>
	6	#include "tkInt.h"
8	7	#include "ttkTheme.h"
9	8	#include "ttkWidget.h"
10	9

80	79	* Compound base/image options
81	80	*/
82	81	{TK_OPTION_STRING_TABLE, "-compound", "compound", "Compound",
83		NULL, Tk_Offset(Base,base.compoundObj), -1,
84		TK_OPTION_NULL_OK,(ClientData)ttkCompoundStrings,
85		GEOMETRY_CHANGED },
	82	NULL, Tk_Offset(Base,base.compoundObj), -1,
	83	TK_OPTION_NULL_OK, (void *)ttkCompoundStrings,
	84	GEOMETRY_CHANGED },
86	85	{TK_OPTION_STRING, "-padding", "padding", "Pad",
87	86	NULL, Tk_Offset(Base,base.paddingObj), -1,
88	87	TK_OPTION_NULL_OK,0,GEOMETRY_CHANGED},

102	101	*/
103	102	static void TextVariableChanged(void clientData, const char value)
104	103	{
105		Base *basePtr = clientData;
	104	Base basePtr = (Base )clientData;
106	105	Tcl_Obj *newText;
107	106
108	107	if (WidgetDestroyed(&basePtr->core)) {

119	118	}
120	119
121	120	static void
122		BaseInitialize(Tcl_Interp interp, void recordPtr)
123		{
124		Base *basePtr = recordPtr;
	121	BaseInitialize(Tcl_Interp dummy, void recordPtr)
	122	{
	123	Base basePtr = (Base )recordPtr;
	124	(void)dummy;
	125
125	126	basePtr->base.textVariableTrace = 0;
126	127	basePtr->base.imageSpec = NULL;
127	128	}

129	130	static void
130	131	BaseCleanup(void *recordPtr)
131	132	{
132		Base *basePtr = recordPtr;
	133	Base basePtr = (Base )recordPtr;
133	134	if (basePtr->base.textVariableTrace)
134	135	Ttk_UntraceVariable(basePtr->base.textVariableTrace);
135	136	if (basePtr->base.imageSpec)

142	143	int imageWidth, int imageHeight)
143	144	{
144	145	Base basePtr = (Base )clientData;
	146	(void)x;
	147	(void)y;
	148	(void)width;
	149	(void)height;
	150	(void)imageWidth;
	151	(void)imageHeight;
	152
145	153	TtkResizeWidget(&basePtr->core);
146	154	}
147	155
148	156	static int BaseConfigure(Tcl_Interp interp, void recordPtr, int mask)
149	157	{
150		Base *basePtr = recordPtr;
	158	Base basePtr = (Base )recordPtr;
151	159	Tcl_Obj *textVarName = basePtr->base.textVariableObj;
152	160	Ttk_TraceHandle *vt = 0;
153	161	Ttk_ImageSpec *imageSpec = NULL;

190	198	}
191	199
192	200	static int
193		BasePostConfigure(Tcl_Interp interp, void recordPtr, int mask)
194		{
195		Base *basePtr = recordPtr;
	201	BasePostConfigure(Tcl_Interp dummy, void recordPtr, int mask)
	202	{
	203	Base basePtr = (Base )recordPtr;
196	204	int status = TCL_OK;
	205	(void)dummy;
	206	(void)mask;
197	207
198	208	if (basePtr->base.textVariableTrace) {
199	209	status = Ttk_FireTrace(basePtr->base.textVariableTrace);

315	325	"", Tk_Offset(Button, button.commandObj), -1, 0,0,0},
316	326	{TK_OPTION_STRING_TABLE, "-default", "default", "Default",
317	327	"normal", Tk_Offset(Button, button.defaultStateObj), -1,
318		0, (ClientData) ttkDefaultStrings, DEFAULTSTATE_CHANGED},
	328	0, (void *)ttkDefaultStrings, DEFAULTSTATE_CHANGED},
319	329
320	330	WIDGET_TAKEFOCUS_TRUE,
321	331	WIDGET_INHERIT_OPTIONS(BaseOptionSpecs)

323	333
324	334	static int ButtonConfigure(Tcl_Interp interp, void recordPtr, int mask)
325	335	{
326		Button *buttonPtr = recordPtr;
	336	Button buttonPtr = (Button )recordPtr;
327	337
328	338	if (BaseConfigure(interp, recordPtr, mask) != TCL_OK) {
329	339	return TCL_ERROR;

351	361	ButtonInvokeCommand(
352	362	void recordPtr, Tcl_Interp interp, int objc, Tcl_Obj *const objv[])
353	363	{
354		Button *buttonPtr = recordPtr;
	364	Button buttonPtr = (Button )recordPtr;
355	365	if (objc > 2) {
356	366	Tcl_WrongNumArgs(interp, 1, objv, "invoke");
357	367	return TCL_ERROR;

443	453	*/
444	454	static void CheckbuttonVariableChanged(void clientData, const char value)
445	455	{
446		Checkbutton *checkPtr = clientData;
	456	Checkbutton checkPtr = (Checkbutton )clientData;
447	457
448	458	if (WidgetDestroyed(&checkPtr->core)) {
449	459	return;

465	475	static void
466	476	CheckbuttonInitialize(Tcl_Interp interp, void recordPtr)
467	477	{
468		Checkbutton *checkPtr = recordPtr;
	478	Checkbutton checkPtr = (Checkbutton )recordPtr;
469	479	Tcl_Obj *variableObj;
470	480
471	481	/* default -variable is the widget name:

479	489	static void
480	490	CheckbuttonCleanup(void *recordPtr)
481	491	{
482		Checkbutton *checkPtr = recordPtr;
	492	Checkbutton checkPtr = (Checkbutton )recordPtr;
483	493	Ttk_UntraceVariable(checkPtr->checkbutton.variableTrace);
484	494	checkPtr->checkbutton.variableTrace = 0;
485	495	BaseCleanup(recordPtr);

488	498	static int
489	499	CheckbuttonConfigure(Tcl_Interp interp, void recordPtr, int mask)
490	500	{
491		Checkbutton *checkPtr = recordPtr;
	501	Checkbutton checkPtr = (Checkbutton )recordPtr;
492	502	Tcl_Obj *varName = checkPtr->checkbutton.variableObj;
493	503	Ttk_TraceHandle *vt = NULL;
494
	504
495	505	if (varName != NULL && *Tcl_GetString(varName) != '\0') {
496	506	vt = Ttk_TraceVariable(interp, varName,
497	507	CheckbuttonVariableChanged, checkPtr);

516	526	static int
517	527	CheckbuttonPostConfigure(Tcl_Interp interp, void recordPtr, int mask)
518	528	{
519		Checkbutton *checkPtr = recordPtr;
	529	Checkbutton checkPtr = (Checkbutton )recordPtr;
520	530	int status = TCL_OK;
521	531
522	532	if (checkPtr->checkbutton.variableTrace)

534	544	CheckbuttonInvokeCommand(
535	545	void recordPtr, Tcl_Interp interp, int objc, Tcl_Obj *const objv[])
536	546	{
537		Checkbutton *checkPtr = recordPtr;
	547	Checkbutton checkPtr = (Checkbutton )recordPtr;
538	548	WidgetCore *corePtr = &checkPtr->core;
539	549	Tcl_Obj *newValue;
540	550

649	659	static void
650	660	RadiobuttonVariableChanged(void clientData, const char value)
651	661	{
652		Radiobutton *radioPtr = clientData;
	662	Radiobutton radioPtr = (Radiobutton )clientData;
653	663
654	664	if (WidgetDestroyed(&radioPtr->core)) {
655	665	return;

671	681	static void
672	682	RadiobuttonCleanup(void *recordPtr)
673	683	{
674		Radiobutton *radioPtr = recordPtr;
	684	Radiobutton radioPtr = (Radiobutton )recordPtr;
675	685	Ttk_UntraceVariable(radioPtr->radiobutton.variableTrace);
676	686	radioPtr->radiobutton.variableTrace = 0;
677	687	BaseCleanup(recordPtr);

680	690	static int
681	691	RadiobuttonConfigure(Tcl_Interp interp, void recordPtr, int mask)
682	692	{
683		Radiobutton *radioPtr = recordPtr;
	693	Radiobutton radioPtr = (Radiobutton )recordPtr;
684	694	Ttk_TraceHandle *vt = Ttk_TraceVariable(
685	695	interp, radioPtr->radiobutton.variableObj,
686	696	RadiobuttonVariableChanged, radioPtr);

703	713	static int
704	714	RadiobuttonPostConfigure(Tcl_Interp interp, void recordPtr, int mask)
705	715	{
706		Radiobutton *radioPtr = recordPtr;
	716	Radiobutton radioPtr = (Radiobutton )recordPtr;
707	717	int status = TCL_OK;
708	718
709	719	if (radioPtr->radiobutton.variableTrace)

721	731	RadiobuttonInvokeCommand(
722	732	void recordPtr, Tcl_Interp interp, int objc, Tcl_Obj *const objv[])
723	733	{
724		Radiobutton *radioPtr = recordPtr;
	734	Radiobutton radioPtr = (Radiobutton )recordPtr;
725	735	WidgetCore *corePtr = &radioPtr->core;
726	736
727	737	if (objc > 2) {

808	818	"", Tk_Offset(Menubutton, menubutton.menuObj), -1, 0,0,0},
809	819	{TK_OPTION_STRING_TABLE, "-direction", "direction", "Direction",
810	820	"below", Tk_Offset(Menubutton, menubutton.directionObj), -1,
811		0,(ClientData)directionStrings,GEOMETRY_CHANGED},
	821	0, (void *)directionStrings, GEOMETRY_CHANGED},
812	822
813	823	WIDGET_TAKEFOCUS_TRUE,
814	824	WIDGET_INHERIT_OPTIONS(BaseOptionSpecs)

843	853	TTK_GROUP("Menubutton.border", TTK_FILL_BOTH,
844	854	TTK_GROUP("Menubutton.focus", TTK_FILL_BOTH,
845	855	TTK_NODE("Menubutton.indicator", TTK_PACK_RIGHT)
846		TTK_GROUP("Menubutton.padding", TTK_PACK_LEFT\|TTK_EXPAND\|TTK_FILL_X,
	856	TTK_GROUP("Menubutton.padding", TTK_FILL_X,
847	857	TTK_NODE("Menubutton.label", TTK_PACK_LEFT))))
848	858	TTK_END_LAYOUT
849	859

+1

-2

generic/ttk/ttkCache.c less more

27	27	* but this will be a transient effect.
28	28	*/
29	29
30		#include <stdio.h> /* for sprintf */
31		#include <tk.h>
	30	#include "tkInt.h"
32	31	#include "ttkTheme.h"
33	32
34	33	struct Ttk_ResourceCache_ {

+123

-62

generic/ttk/ttkClamTheme.c less more

3	3	* "clam" theme; inspired by the XFCE family of Gnome themes.
4	4	*/
5	5
6		#include <tk.h>
	6	#include "tkInt.h"
7	7	#include "ttkTheme.h"
8	8
9		/*
10		* Under windows, the Tk-provided XDrawLine and XDrawArc have an
	9	/*
	10	* Under windows, the Tk-provided XDrawLine and XDrawArc have an
11	11	* off-by-one error in the end point. This is especially apparent with this
12	12	* theme. Defining this macro as true handles this case.
13	13	*/

116	116	Tk_Offset(BorderElement,reliefObj), "flat" },
117	117	{ "-borderwidth", TK_OPTION_PIXELS,
118	118	Tk_Offset(BorderElement,borderWidthObj), "2" },
119		{ NULL, 0, 0, NULL }
	119	{ NULL, TK_OPTION_BOOLEAN, 0, NULL }
120	120	};
121	121
122	122	/*
123	123	* <<NOTE-BORDERWIDTH>>: -borderwidth is only partially supported:
124	124	* in this theme, borders are always exactly 2 pixels thick.
125		* With -borderwidth 0, border is not drawn at all;
126		* otherwise a 2-pixel border is used. For -borderwidth > 2,
	125	* With -borderwidth 0, border is not drawn at all;
	126	* otherwise a 2-pixel border is used. For -borderwidth > 2,
127	127	* the excess is used as padding.
128	128	*/
129	129
130	130	static void BorderElementSize(
131		void clientData, void elementRecord, Tk_Window tkwin,
	131	void dummy, void elementRecord, Tk_Window tkwin,
132	132	int widthPtr, int heightPtr, Ttk_Padding *paddingPtr)
133	133	{
134	134	BorderElement border = (BorderElement)elementRecord;
135	135	int borderWidth = 2;
	136	(void)dummy;
	137	(void)widthPtr;
	138	(void)heightPtr;
	139
136	140	Tk_GetPixelsFromObj(NULL, tkwin, border->borderWidthObj, &borderWidth);
137	141	if (borderWidth == 1) ++borderWidth;
138	142	*paddingPtr = Ttk_UniformPadding((short)borderWidth);
139	143	}
140	144
141	145	static void BorderElementDraw(
142		void clientData, void elementRecord, Tk_Window tkwin,
	146	void dummy, void elementRecord, Tk_Window tkwin,
143	147	Drawable d, Ttk_Box b, unsigned state)
144	148	{
145		BorderElement *border = elementRecord;
	149	BorderElement border = (BorderElement )elementRecord;
146	150	int relief = TK_RELIEF_FLAT;
147	151	int borderWidth = 2;
148	152	Tcl_Obj outer = 0, upper = 0, *lower = 0;
	153	(void)dummy;
	154	(void)state;
149	155
150	156	Tk_GetReliefFromObj(NULL, border->reliefObj, &relief);
151	157	Tk_GetPixelsFromObj(NULL, tkwin, border->borderWidthObj, &borderWidth);

204	210	Tk_Offset(FieldElement,darkColorObj), DARK_COLOR },
205	211	{ "-fieldbackground", TK_OPTION_BORDER,
206	212	Tk_Offset(FieldElement,backgroundObj), "white" },
207		{ NULL, 0, 0, NULL }
	213	{ NULL, TK_OPTION_BOOLEAN, 0, NULL }
208	214	};
209	215
210	216	static void FieldElementSize(
211		void clientData, void elementRecord, Tk_Window tkwin,
	217	void dummy, void elementRecord, Tk_Window tkwin,
212	218	int widthPtr, int heightPtr, Ttk_Padding *paddingPtr)
213	219	{
	220	(void)dummy;
	221	(void)elementRecord;
	222	(void)tkwin;
	223	(void)widthPtr;
	224	(void)heightPtr;
	225
214	226	*paddingPtr = Ttk_UniformPadding(2);
215	227	}
216	228
217	229	static void FieldElementDraw(
218		void clientData, void elementRecord, Tk_Window tkwin,
	230	void dummy, void elementRecord, Tk_Window tkwin,
219	231	Drawable d, Ttk_Box b, unsigned state)
220	232	{
221		FieldElement *field = elementRecord;
	233	FieldElement field = (FieldElement )elementRecord;
222	234	Tk_3DBorder bg = Tk_Get3DBorderFromObj(tkwin, field->backgroundObj);
223	235	Ttk_Box f = Ttk_PadBox(b, Ttk_UniformPadding(2));
224	236	Tcl_Obj *outer = field->borderColorObj,
225	237	*inner = field->lightColorObj;
	238	(void)dummy;
	239	(void)state;
226	240
227	241	DrawSmoothBorder(tkwin, d, b, outer, inner, inner);
228	242	Tk_Fill3DRectangle(

245	259	void clientData, void elementRecord, Tk_Window tkwin,
246	260	Drawable d, Ttk_Box b, unsigned state)
247	261	{
248		FieldElement *field = elementRecord;
	262	FieldElement field = (FieldElement )elementRecord;
249	263	GC gc = Ttk_GCForColor(tkwin,field->borderColorObj,d);
250	264
251	265	++b.width;

290	304	Tk_Offset(IndicatorElement,upperColorObj), DARKEST_COLOR },
291	305	{ "-lowerbordercolor", TK_OPTION_COLOR,
292	306	Tk_Offset(IndicatorElement,lowerColorObj), DARK_COLOR },
293		{ NULL, 0, 0, NULL }
	307	{ NULL, TK_OPTION_BOOLEAN, 0, NULL }
294	308	};
295	309
296	310	static void IndicatorElementSize(
297		void clientData, void elementRecord, Tk_Window tkwin,
	311	void dummy, void elementRecord, Tk_Window tkwin,
298	312	int widthPtr, int heightPtr, Ttk_Padding *paddingPtr)
299	313	{
300		IndicatorElement *indicator = elementRecord;
	314	IndicatorElement indicator = (IndicatorElement )elementRecord;
301	315	Ttk_Padding margins;
302	316	int size = 10;
	317	(void)dummy;
	318	(void)paddingPtr;
	319
303	320	Ttk_GetPaddingFromObj(NULL, tkwin, indicator->marginObj, &margins);
304	321	Tk_GetPixelsFromObj(NULL, tkwin, indicator->sizeObj, &size);
305	322	*widthPtr = size + Ttk_PaddingWidth(margins);

307	324	}
308	325
309	326	static void RadioIndicatorElementDraw(
310		void clientData, void elementRecord, Tk_Window tkwin,
	327	void dummy, void elementRecord, Tk_Window tkwin,
311	328	Drawable d, Ttk_Box b, unsigned state)
312	329	{
313		IndicatorElement *indicator = elementRecord;
	330	IndicatorElement indicator = (IndicatorElement )elementRecord;
314	331	GC gcb=Ttk_GCForColor(tkwin,indicator->backgroundObj,d);
315	332	GC gcf=Ttk_GCForColor(tkwin,indicator->foregroundObj,d);
316	333	GC gcu=Ttk_GCForColor(tkwin,indicator->upperColorObj,d);
317	334	GC gcl=Ttk_GCForColor(tkwin,indicator->lowerColorObj,d);
318	335	Ttk_Padding padding;
	336	(void)dummy;
319	337
320	338	Ttk_GetPaddingFromObj(NULL, tkwin, indicator->marginObj, &padding);
321	339	b = Ttk_PadBox(b, padding);

335	353	}
336	354
337	355	static void CheckIndicatorElementDraw(
338		void clientData, void elementRecord, Tk_Window tkwin,
	356	void dummy, void elementRecord, Tk_Window tkwin,
339	357	Drawable d, Ttk_Box b, unsigned state)
340	358	{
341	359	Display *display = Tk_Display(tkwin);
342		IndicatorElement *indicator = elementRecord;
	360	IndicatorElement indicator = (IndicatorElement )elementRecord;
	361
343	362	GC gcb=Ttk_GCForColor(tkwin,indicator->backgroundObj,d);
344	363	GC gcf=Ttk_GCForColor(tkwin,indicator->foregroundObj,d);
345	364	GC gcu=Ttk_GCForColor(tkwin,indicator->upperColorObj,d);
346	365	GC gcl=Ttk_GCForColor(tkwin,indicator->lowerColorObj,d);
347	366	Ttk_Padding padding;
348	367	const int w = WIN32_XDRAWLINE_HACK;
	368	(void)dummy;
349	369
350	370	Ttk_GetPaddingFromObj(NULL, tkwin, indicator->marginObj, &padding);
351	371	b = Ttk_PadBox(b, padding);

401	421	static Ttk_ElementOptionSpec MenuIndicatorElementOptions[] =
402	422	{
403	423	{ "-arrowsize", TK_OPTION_PIXELS,
404		Tk_Offset(MenuIndicatorElement,sizeObj),
	424	Tk_Offset(MenuIndicatorElement,sizeObj),
405	425	STR(MENUBUTTON_ARROW_SIZE)},
406	426	{ "-arrowcolor",TK_OPTION_COLOR,
407	427	Tk_Offset(MenuIndicatorElement,colorObj),

409	429	{ "-arrowpadding",TK_OPTION_STRING,
410	430	Tk_Offset(MenuIndicatorElement,paddingObj),
411	431	"3" },
412		{ NULL, 0, 0, NULL }
	432	{ NULL, TK_OPTION_BOOLEAN, 0, NULL }
413	433	};
414	434
415	435	static void MenuIndicatorElementSize(
416		void clientData, void elementRecord, Tk_Window tkwin,
	436	void dummy, void elementRecord, Tk_Window tkwin,
417	437	int widthPtr, int heightPtr, Ttk_Padding *paddingPtr)
418	438	{
419		MenuIndicatorElement *indicator = elementRecord;
	439	MenuIndicatorElement indicator = (MenuIndicatorElement )elementRecord;
420	440	Ttk_Padding margins;
421	441	int size = MENUBUTTON_ARROW_SIZE;
	442	(void)dummy;
	443	(void)paddingPtr;
	444
422	445	Tk_GetPixelsFromObj(NULL, tkwin, indicator->sizeObj, &size);
423	446	Ttk_GetPaddingFromObj(NULL, tkwin, indicator->paddingObj, &margins);
424	447	TtkArrowSize(size, ARROW_DOWN, widthPtr, heightPtr);

427	450	}
428	451
429	452	static void MenuIndicatorElementDraw(
430		void clientData, void elementRecord, Tk_Window tkwin,
	453	void dummy, void elementRecord, Tk_Window tkwin,
431	454	Drawable d, Ttk_Box b, unsigned int state)
432	455	{
433		MenuIndicatorElement *indicator = elementRecord;
	456	MenuIndicatorElement indicator = (MenuIndicatorElement )elementRecord;
434	457	XColor *arrowColor = Tk_GetColorFromObj(tkwin, indicator->colorObj);
435	458	GC gc = Tk_GCForColor(arrowColor, d);
436	459	int size = MENUBUTTON_ARROW_SIZE;
437	460	int width, height;
	461	(void)dummy;
	462	(void)state;
438	463
439	464	Tk_GetPixelsFromObj(NULL, tkwin, indicator->sizeObj, &size);
440	465

475	500	Tk_Offset(GripElement,borderColorObj), DARKEST_COLOR },
476	501	{ "-gripcount", TK_OPTION_INT,
477	502	Tk_Offset(GripElement,gripCountObj), "5" },
478		{ NULL, 0, 0, NULL }
	503	{ NULL, TK_OPTION_BOOLEAN, 0, NULL }
479	504	};
480	505
481	506	static void GripElementSize(

483	508	int widthPtr, int heightPtr, Ttk_Padding *paddingPtr)
484	509	{
485	510	int horizontal = ((Ttk_Orient)clientData) == TTK_ORIENT_HORIZONTAL;
486		GripElement *grip = elementRecord;
	511	GripElement grip = (GripElement )elementRecord;
487	512	int gripCount = 0;
	513	(void)tkwin;
	514	(void)paddingPtr;
488	515
489	516	Tcl_GetIntFromObj(NULL, grip->gripCountObj, &gripCount);
490	517	if (horizontal) {

500	527	{
501	528	const int w = WIN32_XDRAWLINE_HACK;
502	529	int horizontal = ((Ttk_Orient)clientData) == TTK_ORIENT_HORIZONTAL;
503		GripElement *grip = elementRecord;
	530	GripElement grip = (GripElement )elementRecord;
504	531	GC lightGC = Ttk_GCForColor(tkwin,grip->lightColorObj,d);
505	532	GC darkGC = Ttk_GCForColor(tkwin,grip->borderColorObj,d);
506	533	int gripPad = 1, gripCount = 0;

574	601	Tk_Offset(ScrollbarElement,gripCountObj), "5" },
575	602	{ "-sliderlength", TK_OPTION_INT,
576	603	Tk_Offset(ScrollbarElement,sliderlengthObj), "30" },
577		{ NULL, 0, 0, NULL }
	604	{ NULL, TK_OPTION_BOOLEAN, 0, NULL }
578	605	};
579	606
580	607	static void TroughElementDraw(
581		void clientData, void elementRecord, Tk_Window tkwin,
	608	void dummy, void elementRecord, Tk_Window tkwin,
582	609	Drawable d, Ttk_Box b, unsigned state)
583	610	{
584		ScrollbarElement *sb = elementRecord;
	611	ScrollbarElement sb = (ScrollbarElement )elementRecord;
585	612	GC gcb = Ttk_GCForColor(tkwin,sb->borderColorObj,d);
586	613	GC gct = Ttk_GCForColor(tkwin,sb->troughColorObj,d);
	614	(void)dummy;
	615	(void)state;
	616
587	617	XFillRectangle(Tk_Display(tkwin), d, gct, b.x, b.y, b.width-1, b.height-1);
588	618	XDrawRectangle(Tk_Display(tkwin), d, gcb, b.x, b.y, b.width-1, b.height-1);
589	619	}

597	627	};
598	628
599	629	static void ThumbElementSize(
600		void clientData, void elementRecord, Tk_Window tkwin,
	630	void dummy, void elementRecord, Tk_Window tkwin,
601	631	int widthPtr, int heightPtr, Ttk_Padding *paddingPtr)
602	632	{
603		ScrollbarElement *sb = elementRecord;
	633	ScrollbarElement sb = (ScrollbarElement )elementRecord;
604	634	int size = SCROLLBAR_THICKNESS;
	635	(void)dummy;
	636	(void)tkwin;
	637	(void)paddingPtr;
	638
605	639	Tcl_GetIntFromObj(NULL, sb->arrowSizeObj, &size);
606	640	widthPtr = heightPtr = size;
607	641	}
608	642
609	643	static void ThumbElementDraw(
610		void clientData, void elementRecord, Tk_Window tkwin,
	644	void dummy, void elementRecord, Tk_Window tkwin,
611	645	Drawable d, Ttk_Box b, unsigned state)
612	646	{
613		ScrollbarElement *sb = elementRecord;
614		int gripCount = 0, orient = TTK_ORIENT_HORIZONTAL;
	647	ScrollbarElement sb = (ScrollbarElement )elementRecord;
	648	int gripCount = 0;
	649	int orient = TTK_ORIENT_HORIZONTAL;
615	650	GC lightGC, darkGC;
616	651	int x1, y1, x2, y2, dx, dy, i;
617	652	const int w = WIN32_XDRAWLINE_HACK;
	653	(void)dummy;
	654	(void)state;
618	655
619	656	DrawSmoothBorder(tkwin, d, b,
620	657	sb->borderColorObj, sb->lightColorObj, sb->darkColorObj);

629	666	Tcl_GetIntFromObj(NULL, sb->gripCountObj, &gripCount);
630	667	lightGC = Ttk_GCForColor(tkwin,sb->lightColorObj,d);
631	668	darkGC = Ttk_GCForColor(tkwin,sb->borderColorObj,d);
632
	669
633	670	if (orient == TTK_ORIENT_HORIZONTAL) {
634	671	dx = 1; dy = 0;
635	672	x1 = x2 = b.x + b.width / 2 - gripCount;

662	699	* +++ Slider element.
663	700	*/
664	701	static void SliderElementSize(
665		void clientData, void elementRecord, Tk_Window tkwin,
	702	void dummy, void elementRecord, Tk_Window tkwin,
666	703	int widthPtr, int heightPtr, Ttk_Padding *paddingPtr)
667	704	{
668		ScrollbarElement *sb = elementRecord;
669		int length, thickness, orient;
	705	ScrollbarElement sb = (ScrollbarElement )elementRecord;
	706	int length, thickness;
	707	int orient;
	708	(void)dummy;
	709	(void)paddingPtr;
670	710
671	711	length = thickness = SCROLLBAR_THICKNESS;
672	712	Ttk_GetOrientFromObj(NULL, sb->orientObj, &orient);

705	745	}
706	746
707	747	static void PbarElementDraw(
708		void clientData, void elementRecord, Tk_Window tkwin,
	748	void dummy, void elementRecord, Tk_Window tkwin,
709	749	Drawable d, Ttk_Box b, unsigned state)
710	750	{
711		ScrollbarElement *sb = elementRecord;
712
	751	ScrollbarElement sb = (ScrollbarElement )elementRecord;
	752	(void)dummy;
	753	(void)state;
	754
713	755	b = Ttk_PadBox(b, Ttk_UniformPadding(2));
714	756	if (b.width > 4 && b.height > 4) {
715	757	DrawSmoothBorder(tkwin, d, b,
716	758	sb->borderColorObj, sb->lightColorObj, sb->darkColorObj);
717		XFillRectangle(Tk_Display(tkwin), d,
	759	XFillRectangle(Tk_Display(tkwin), d,
718	760	BackgroundGC(tkwin, sb->backgroundObj),
719	761	b.x+2, b.y+2, b.width-4, b.height-4);
720	762	}

735	777	static int ArrowElements[] = { ARROW_UP, ARROW_DOWN, ARROW_LEFT, ARROW_RIGHT };
736	778
737	779	static void ArrowElementSize(
738		void clientData, void elementRecord, Tk_Window tkwin,
	780	void dummy, void elementRecord, Tk_Window tkwin,
739	781	int widthPtr, int heightPtr, Ttk_Padding *paddingPtr)
740	782	{
741		ScrollbarElement *sb = elementRecord;
	783	ScrollbarElement sb = (ScrollbarElement )elementRecord;
742	784	int size = SCROLLBAR_THICKNESS;
	785	(void)dummy;
	786	(void)tkwin;
	787	(void)paddingPtr;
	788
743	789	Tcl_GetIntFromObj(NULL, sb->arrowSizeObj, &size);
744	790	widthPtr = heightPtr = size;
745	791	}

748	794	void clientData, void elementRecord, Tk_Window tkwin,
749	795	Drawable d, Ttk_Box b, unsigned state)
750	796	{
751		ArrowDirection dir = (ArrowDirection)clientData;
752		ScrollbarElement *sb = elementRecord;
	797	ArrowDirection direction = (ArrowDirection)clientData;
	798	ScrollbarElement sb = (ScrollbarElement )elementRecord;
753	799	GC gc = Ttk_GCForColor(tkwin,sb->arrowColorObj, d);
754	800	int h, cx, cy;
755	801

762	808
763	809	b = Ttk_PadBox(b, Ttk_UniformPadding(3));
764	810	h = b.width < b.height ? b.width : b.height;
765		TtkArrowSize(h/2, dir, &cx, &cy);
	811	TtkArrowSize(h/2, direction, &cx, &cy);
766	812	b = Ttk_AnchorBox(b, cx, cy, TK_ANCHOR_CENTER);
767	813
768		TtkFillArrow(Tk_Display(tkwin), d, gc, b, dir);
	814	TtkFillArrow(Tk_Display(tkwin), d, gc, b, direction);
769	815	}
770	816
771	817	static Ttk_ElementSpec ArrowElementSpec = {

779	825
780	826	/*------------------------------------------------------------------------
781	827	* +++ Notebook elements.
782		*
783		* Note: Tabs, except for the rightmost, overlap the neighbor to
	828	*
	829	* Note: Tabs, except for the rightmost, overlap the neighbor to
784	830	* their right by one pixel.
785	831	*/
786	832

800	846	Tk_Offset(NotebookElement,lightColorObj), LIGHT_COLOR },
801	847	{ "-darkcolor", TK_OPTION_COLOR,
802	848	Tk_Offset(NotebookElement,darkColorObj), DARK_COLOR },
803		{ NULL, 0, 0, NULL }
	849	{ NULL, TK_OPTION_BOOLEAN, 0, NULL }
804	850	};
805	851
806	852	static void TabElementSize(
807		void clientData, void elementRecord, Tk_Window tkwin,
	853	void dummy, void elementRecord, Tk_Window tkwin,
808	854	int widthPtr, int heightPtr, Ttk_Padding *paddingPtr)
809	855	{
810	856	int borderWidth = 2;
	857	(void)dummy;
	858	(void)elementRecord;
	859	(void)tkwin;
	860	(void)widthPtr;
	861	(void)heightPtr;
	862
811	863	paddingPtr->top = paddingPtr->left = paddingPtr->right = borderWidth;
812	864	paddingPtr->bottom = 0;
813	865	}
814	866
815	867	static void TabElementDraw(
816		void clientData, void elementRecord, Tk_Window tkwin,
	868	void dummy, void elementRecord, Tk_Window tkwin,
817	869	Drawable d, Ttk_Box b, unsigned int state)
818	870	{
819		NotebookElement *tab = elementRecord;
	871	NotebookElement tab = (NotebookElement )elementRecord;
820	872	Tk_3DBorder border = Tk_Get3DBorderFromObj(tkwin, tab->backgroundObj);
821	873	Display *display = Tk_Display(tkwin);
822	874	int borderWidth = 2, dh = 0;
823	875	int x1,y1,x2,y2;
824	876	GC gc;
825	877	const int w = WIN32_XDRAWLINE_HACK;
	878	(void)dummy;
826	879
827	880	if (state & TTK_STATE_SELECTED) {
828	881	dh = borderWidth;

859	912	};
860	913
861	914	static void ClientElementSize(
862		void clientData, void elementRecord, Tk_Window tkwin,
	915	void dummy, void elementRecord, Tk_Window tkwin,
863	916	int widthPtr, int heightPtr, Ttk_Padding *paddingPtr)
864	917	{
865	918	int borderWidth = 2;
	919	(void)dummy;
	920	(void)elementRecord;
	921	(void)tkwin;
	922	(void)widthPtr;
	923	(void)heightPtr;
	924
866	925	*paddingPtr = Ttk_UniformPadding((short)borderWidth);
867	926	}
868	927
869	928	static void ClientElementDraw(
870		void clientData, void elementRecord, Tk_Window tkwin,
	929	void dummy, void elementRecord, Tk_Window tkwin,
871	930	Drawable d, Ttk_Box b, unsigned int state)
872	931	{
873		NotebookElement *ce = elementRecord;
	932	NotebookElement ce = (NotebookElement )elementRecord;
874	933	Tk_3DBorder border = Tk_Get3DBorderFromObj(tkwin, ce->backgroundObj);
875	934	int borderWidth = 2;
	935	(void)dummy;
	936	(void)state;
876	937
877	938	Tk_Fill3DRectangle(tkwin, d, border,
878	939	b.x, b.y, b.width, b.height, borderWidth,TK_RELIEF_FLAT);

897	958
898	959	TTK_LAYOUT("TCombobox",
899	960	TTK_NODE("Combobox.downarrow", TTK_PACK_RIGHT\|TTK_FILL_Y)
900		TTK_GROUP("Combobox.field", TTK_PACK_LEFT\|TTK_FILL_BOTH\|TTK_EXPAND,
	961	TTK_GROUP("Combobox.field", TTK_FILL_BOTH,
901	962	TTK_GROUP("Combobox.padding", TTK_FILL_BOTH,
902	963	TTK_NODE("Combobox.textarea", TTK_FILL_BOTH))))
903	964

+52

-34

generic/ttk/ttkClassicTheme.c less more

25	25	Tk_Offset(HighlightElement,highlightColorObj), DEFAULT_BACKGROUND },
26	26	{ "-highlightthickness",TK_OPTION_PIXELS,
27	27	Tk_Offset(HighlightElement,highlightThicknessObj), "0" },
28		{ NULL, 0, 0, NULL }
	28	{ NULL, TK_OPTION_BOOLEAN, 0, NULL }
29	29	};
30	30
31	31	static void HighlightElementSize(
32		void clientData, void elementRecord, Tk_Window tkwin,
	32	void dummy, void elementRecord, Tk_Window tkwin,
33	33	int widthPtr, int heightPtr, Ttk_Padding *paddingPtr)
34	34	{
35		HighlightElement *hl = elementRecord;
	35	HighlightElement hl = (HighlightElement )elementRecord;
36	36	int highlightThickness = 0;
	37	(void)dummy;
	38	(void)tkwin;
	39	(void)widthPtr;
	40	(void)heightPtr;
37	41
38	42	Tcl_GetIntFromObj(NULL,hl->highlightThicknessObj,&highlightThickness);
39	43	*paddingPtr = Ttk_UniformPadding((short)highlightThickness);
40	44	}
41	45
42	46	static void HighlightElementDraw(
43		void clientData, void elementRecord, Tk_Window tkwin,
	47	void dummy, void elementRecord, Tk_Window tkwin,
44	48	Drawable d, Ttk_Box b, unsigned int state)
45	49	{
46		HighlightElement *hl = elementRecord;
	50	HighlightElement hl = (HighlightElement )elementRecord;
47	51	int highlightThickness = 0;
48	52	XColor *highlightColor = Tk_GetColorFromObj(tkwin, hl->highlightColorObj);
	53	(void)dummy;
	54	(void)b;
	55	(void)state;
49	56
50	57	Tcl_GetIntFromObj(NULL,hl->highlightThicknessObj,&highlightThickness);
51	58	if (highlightColor && highlightThickness > 0) {

65	72
66	73	/*------------------------------------------------------------------------
67	74	* +++ Button Border element:
68		*
	75	*
69	76	* The Motif-style button border on X11 consists of (from outside-in):
70	77	*
71	78	* + focus indicator (controlled by -highlightcolor and -highlightthickness),

82	89
83	90	static Ttk_ElementOptionSpec ButtonBorderElementOptions[] =
84	91	{
85		{ "-background", TK_OPTION_BORDER,
	92	{ "-background", TK_OPTION_BORDER,
86	93	Tk_Offset(ButtonBorderElement,borderObj), DEFAULT_BACKGROUND },
87		{ "-borderwidth", TK_OPTION_PIXELS,
	94	{ "-borderwidth", TK_OPTION_PIXELS,
88	95	Tk_Offset(ButtonBorderElement,borderWidthObj), DEFAULT_BORDERWIDTH },
89		{ "-relief", TK_OPTION_RELIEF,
	96	{ "-relief", TK_OPTION_RELIEF,
90	97	Tk_Offset(ButtonBorderElement,reliefObj), "flat" },
91		{ "-default", TK_OPTION_ANY,
	98	{ "-default", TK_OPTION_ANY,
92	99	Tk_Offset(ButtonBorderElement,defaultStateObj), "disabled" },
93		{ NULL, 0, 0, NULL }
	100	{ NULL, TK_OPTION_BOOLEAN, 0, NULL }
94	101	};
95	102
96	103	static void ButtonBorderElementSize(
97		void clientData, void elementRecord, Tk_Window tkwin,
	104	void dummy, void elementRecord, Tk_Window tkwin,
98	105	int widthPtr, int heightPtr, Ttk_Padding *paddingPtr)
99	106	{
100		ButtonBorderElement *bd = elementRecord;
	107	ButtonBorderElement bd = (ButtonBorderElement )elementRecord;
101	108	int defaultState = TTK_BUTTON_DEFAULT_DISABLED;
102	109	int borderWidth = 0;
	110	(void)dummy;
	111	(void)tkwin;
	112	(void)widthPtr;
	113	(void)heightPtr;
103	114
104	115	Tcl_GetIntFromObj(NULL, bd->borderWidthObj, &borderWidth);
105	116	Ttk_GetButtonDefaultStateFromObj(NULL, bd->defaultStateObj, &defaultState);

112	123
113	124	/*
114	125	* (@@@ Note: ButtonBorderElement still still still buggy:
115		* padding for default ring is drawn in the wrong color
	126	* padding for default ring is drawn in the wrong color
116	127	* when the button is active.)
117	128	*/
118	129	static void ButtonBorderElementDraw(
119		void clientData, void elementRecord, Tk_Window tkwin,
	130	void dummy, void elementRecord, Tk_Window tkwin,
120	131	Drawable d, Ttk_Box b, unsigned int state)
121	132	{
122		ButtonBorderElement *bd = elementRecord;
	133	ButtonBorderElement bd = (ButtonBorderElement )elementRecord;
123	134	Tk_3DBorder border = NULL;
124	135	int borderWidth = 1, relief = TK_RELIEF_FLAT;
125	136	int defaultState = TTK_BUTTON_DEFAULT_DISABLED;
126	137	int inset = 0;
	138	(void)dummy;
	139	(void)state;
127	140
128	141	/*
129	142	* Get option values.

203	216	{ "-borderwidth", TK_OPTION_PIXELS, Tk_Offset(ArrowElement,borderWidthObj),
204	217	DEFAULT_BORDERWIDTH },
205	218	{ "-relief", TK_OPTION_RELIEF, Tk_Offset(ArrowElement,reliefObj),"raised" },
206		{ NULL, 0, 0, NULL }
	219	{ NULL, TK_OPTION_BOOLEAN, 0, NULL }
207	220	};
208	221
209	222	static void ArrowElementSize(
210		void clientData, void elementRecord, Tk_Window tkwin,
	223	void dummy, void elementRecord, Tk_Window tkwin,
211	224	int widthPtr, int heightPtr, Ttk_Padding *paddingPtr)
212	225	{
213		ArrowElement *arrow = elementRecord;
	226	ArrowElement arrow = (ArrowElement )elementRecord;
214	227	int size = 12;
	228	(void)dummy;
	229	(void)paddingPtr;
215	230
216	231	Tk_GetPixelsFromObj(NULL, tkwin, arrow->sizeObj, &size);
217	232	widthPtr = heightPtr = size;

222	237	Drawable d, Ttk_Box b, unsigned int state)
223	238	{
224	239	int direction = (int )clientData;
225		ArrowElement *arrow = elementRecord;
	240	ArrowElement arrow = (ArrowElement )elementRecord;
226	241	Tk_3DBorder border = Tk_Get3DBorderFromObj(tkwin, arrow->borderObj);
227	242	int borderWidth = 2;
228	243	int relief = TK_RELIEF_RAISED;
229	244	int size = b.width < b.height ? b.width : b.height;
230	245	XPoint points[3];
	246	(void)state;
231	247
232	248	Tk_GetPixelsFromObj(NULL, tkwin, arrow->borderWidthObj, &borderWidth);
233	249	Tk_GetReliefFromObj(NULL, arrow->reliefObj, &relief);

278	294	/*------------------------------------------------------------------------
279	295	* +++ Sash element (for ttk::panedwindow)
280	296	*
281		* NOTES:
	297	* NOTES:
282	298	*
283	299	* panedwindows with -orient horizontal use vertical sashes, and vice versa.
284	300	*
285	301	* Interpretation of -sashrelief 'groove' and 'ridge' are
286	302	* swapped wrt. the core panedwindow, which (I think) has them backwards.
287	303	*
288		* Default -sashrelief is sunken; the core panedwindow has default
	304	* Default -sashrelief is sunken; the core panedwindow has default
289	305	* -sashrelief raised, but that looks wrong to me.
290	306	*/
291	307
292	308	static Ttk_Orient SashClientData[] = {
293		TTK_ORIENT_HORIZONTAL, TTK_ORIENT_VERTICAL
	309	TTK_ORIENT_HORIZONTAL, TTK_ORIENT_VERTICAL
294	310	};
295	311
296	312	typedef struct {

303	319	} SashElement;
304	320
305	321	static Ttk_ElementOptionSpec SashOptions[] = {
306		{ "-background", TK_OPTION_BORDER,
	322	{ "-background", TK_OPTION_BORDER,
307	323	Tk_Offset(SashElement,borderObj), DEFAULT_BACKGROUND },
308		{ "-sashrelief", TK_OPTION_RELIEF,
	324	{ "-sashrelief", TK_OPTION_RELIEF,
309	325	Tk_Offset(SashElement,sashReliefObj), "sunken" },
310	326	{ "-sashthickness", TK_OPTION_PIXELS,
311	327	Tk_Offset(SashElement,sashThicknessObj), "6" },
312		{ "-sashpad", TK_OPTION_PIXELS,
	328	{ "-sashpad", TK_OPTION_PIXELS,
313	329	Tk_Offset(SashElement,sashPadObj), "2" },
314	330	{ "-handlesize", TK_OPTION_PIXELS,
315	331	Tk_Offset(SashElement,handleSizeObj), "8" },
316	332	{ "-handlepad", TK_OPTION_PIXELS,
317	333	Tk_Offset(SashElement,handlePadObj), "8" },
318		{ NULL, 0, 0, NULL }
	334	{ NULL, TK_OPTION_BOOLEAN, 0, NULL }
319	335	};
320	336
321	337	static void SashElementSize(
322	338	void clientData, void elementRecord, Tk_Window tkwin,
323	339	int widthPtr, int heightPtr, Ttk_Padding *paddingPtr)
324	340	{
325		SashElement *sash = elementRecord;
	341	SashElement sash = (SashElement )elementRecord;
326	342	int sashPad = 2, sashThickness = 6, handleSize = 8;
327	343	int horizontal = ((Ttk_Orient)clientData) == TTK_ORIENT_HORIZONTAL;
	344	(void)paddingPtr;
328	345
329	346	Tk_GetPixelsFromObj(NULL, tkwin, sash->sashThicknessObj, &sashThickness);
330	347	Tk_GetPixelsFromObj(NULL, tkwin, sash->handleSizeObj, &handleSize);

343	360	void clientData, void elementRecord, Tk_Window tkwin,
344	361	Drawable d, Ttk_Box b, Ttk_State state)
345	362	{
346		SashElement *sash = elementRecord;
	363	SashElement sash = (SashElement )elementRecord;
347	364	Tk_3DBorder border = Tk_Get3DBorderFromObj(tkwin, sash->borderObj);
348	365	GC gc1,gc2;
349	366	int relief = TK_RELIEF_RAISED;
350	367	int handleSize = 8, handlePad = 8;
351	368	int horizontal = ((Ttk_Orient)clientData) == TTK_ORIENT_HORIZONTAL;
352	369	Ttk_Box hb;
	370	(void)state;
353	371
354	372	Tk_GetPixelsFromObj(NULL, tkwin, sash->handleSizeObj, &handleSize);
355	373	Tk_GetPixelsFromObj(NULL, tkwin, sash->handlePadObj, &handlePad);

364	382	gc1 = Tk_3DBorderGC(tkwin, border, TK_3D_DARK_GC);
365	383	gc2 = Tk_3DBorderGC(tkwin, border, TK_3D_LIGHT_GC);
366	384	break;
367		case TK_RELIEF_SOLID:
	385	case TK_RELIEF_SOLID:
368	386	gc1 = gc2 = Tk_3DBorderGC(tkwin, border, TK_3D_DARK_GC);
369	387	break;
370		case TK_RELIEF_FLAT:
	388	case TK_RELIEF_FLAT:
371	389	default:
372	390	gc1 = gc2 = Tk_3DBorderGC(tkwin, border, TK_3D_FLAT_GC);
373	391	break;

395	413	hb = Ttk_StickBox(b, handleSize, handleSize, TTK_STICK_N);
396	414	hb.y += handlePad;
397	415	}
398		Tk_Fill3DRectangle(tkwin, d, border,
	416	Tk_Fill3DRectangle(tkwin, d, border,
399	417	hb.x, hb.y, hb.width, hb.height, 1, TK_RELIEF_RAISED);
400	418	}
401	419	}

438	456	TTK_GROUP("Menubutton.highlight", TTK_FILL_BOTH,
439	457	TTK_GROUP("Menubutton.border", TTK_FILL_BOTH,
440	458	TTK_NODE("Menubutton.indicator", TTK_PACK_RIGHT)
441		TTK_GROUP("Menubutton.padding", TTK_PACK_LEFT\|TTK_EXPAND\|TTK_FILL_X,
	459	TTK_GROUP("Menubutton.padding", TTK_FILL_X,
442	460	TTK_NODE("Menubutton.label", 0)))))
443	461
444	462	/* "classic" entry, includes highlight border */

492	510	Ttk_RegisterElement(interp, theme, "arrow",
493	511	&ArrowElementSpec, &ArrowElements[0]);
494	512
495		Ttk_RegisterElement(interp, theme, "hsash",
	513	Ttk_RegisterElement(interp, theme, "hsash",
496	514	&SashElementSpec, &SashClientData[0]);
497	515	Ttk_RegisterElement(interp, theme, "vsash",
498	516	&SashElementSpec, &SashClientData[1]);

+1

-3

generic/ttk/ttkElements.c less more

4	4	*
5	5	*/
6	6
7		#include <tcl.h>
8		#include <tk.h>
9		#include <string.h>
	7	#include "tkInt.h"
10	8	#include "ttkTheme.h"
11	9	#include "ttkWidget.h"
12	10

+48

-23

generic/ttk/ttkEntry.c less more

338	338	}
339	339	string = entryPtr->entry.displayString;
340	340
341		selStart = Tcl_UtfAtIndex(string, entryPtr->entry.selectFirst);
342		selEnd = Tcl_UtfAtIndex(selStart,
	341	selStart = TkUtfAtIndex(string, entryPtr->entry.selectFirst);
	342	selEnd = TkUtfAtIndex(selStart,
343	343	entryPtr->entry.selectLast - entryPtr->entry.selectFirst);
344	344	byteCount = selEnd - selStart - offset;
345	345	if (byteCount > maxBytes) {

457	457	break;
458	458	case 'S': /* string to be inserted/deleted, if any */
459	459	if (reason == VALIDATE_INSERT) {
460		string = Tcl_UtfAtIndex(new, index);
461		stringLength = Tcl_UtfAtIndex(string, count) - string;
	460	string = TkUtfAtIndex(new, index);
	461	stringLength = TkUtfAtIndex(string, count) - string;
462	462	} else if (reason == VALIDATE_DELETE) {
463		string = Tcl_UtfAtIndex(entryPtr->entry.string, index);
464		stringLength = Tcl_UtfAtIndex(string, count) - string;
	463	string = TkUtfAtIndex(entryPtr->entry.string, index);
	464	stringLength = TkUtfAtIndex(string, count) - string;
465	465	} else {
466	466	string = "";
467	467	stringLength = 0;

556	556	* Returns:
557	557	* TCL_OK if the change is accepted
558	558	* TCL_BREAK if the change is rejected
559		* TCL_ERROR if any errors occured
	559	* TCL_ERROR if any errors occurred
560	560	*
561	561	* The change will be rejected if -validatecommand returns 0,
562	562	* or if -validatecommand or -invalidcommand modifies the value.

649	649	static void EntryRevalidateBG(Entry *entryPtr, VREASON reason)
650	650	{
651	651	Tcl_Interp *interp = entryPtr->core.interp;
652		if (EntryRevalidate(interp, entryPtr, reason) == TCL_ERROR) {
653		Tcl_BackgroundException(interp, TCL_ERROR);
	652	VMODE vmode = entryPtr->entry.validate;
	653
	654	if (EntryNeedsValidation(vmode, reason)) {
	655	if (EntryRevalidate(interp, entryPtr, reason) == TCL_ERROR) {
	656	Tcl_BackgroundException(interp, TCL_ERROR);
	657	}
654	658	}
655	659	}
656	660

807	811	const char value) / New characters to add */
808	812	{
809	813	char *string = entryPtr->entry.string;
810		size_t byteIndex = Tcl_UtfAtIndex(string, index) - string;
	814	size_t byteIndex = TkUtfAtIndex(string, index) - string;
811	815	size_t byteCount = strlen(value);
812	816	int charsAdded = Tcl_NumUtfChars(value, byteCount);
813	817	size_t newByteCount = entryPtr->entry.numBytes + byteCount + 1;

861	865	return TCL_OK;
862	866	}
863	867
864		byteIndex = Tcl_UtfAtIndex(string, index) - string;
865		byteCount = Tcl_UtfAtIndex(string+byteIndex, count) - (string+byteIndex);
	868	byteIndex = TkUtfAtIndex(string, index) - string;
	869	byteCount = TkUtfAtIndex(string+byteIndex, count) - (string+byteIndex);
866	870
867	871	newByteCount = entryPtr->entry.numBytes + 1 - byteCount;
868	872	new = ckalloc(newByteCount);

1269	1273	/* Draw the text:
1270	1274	*/
1271	1275	gc = EntryGetGC(entryPtr, es.foregroundObj, clipRegion);
1272		Tk_DrawTextLayout(
1273		Tk_Display(tkwin), d, gc, entryPtr->entry.textLayout,
1274		entryPtr->entry.layoutX, entryPtr->entry.layoutY,
1275		leftIndex, rightIndex);
1276		XSetClipMask(Tk_Display(tkwin), gc, None);
1277		Tk_FreeGC(Tk_Display(tkwin), gc);
1278
1279		/* Overwrite the selected portion (if any) in the -selectforeground color:
1280		*/
1281	1276	if (showSelection) {
	1277
	1278	/* Draw the selected and unselected portions separately.
	1279	*/
	1280	if (leftIndex < selFirst) {
	1281	Tk_DrawTextLayout(
	1282	Tk_Display(tkwin), d, gc, entryPtr->entry.textLayout,
	1283	entryPtr->entry.layoutX, entryPtr->entry.layoutY,
	1284	leftIndex, selFirst);
	1285	}
	1286	if (selLast < rightIndex) {
	1287	Tk_DrawTextLayout(
	1288	Tk_Display(tkwin), d, gc, entryPtr->entry.textLayout,
	1289	entryPtr->entry.layoutX, entryPtr->entry.layoutY,
	1290	selLast, rightIndex);
	1291	}
	1292	XSetClipMask(Tk_Display(tkwin), gc, None);
	1293	Tk_FreeGC(Tk_Display(tkwin), gc);
	1294
	1295	/* Draw the selected portion in the -selectforeground color:
	1296	*/
1282	1297	gc = EntryGetGC(entryPtr, es.selForegroundObj, clipRegion);
1283	1298	Tk_DrawTextLayout(
1284	1299	Tk_Display(tkwin), d, gc, entryPtr->entry.textLayout,
1285	1300	entryPtr->entry.layoutX, entryPtr->entry.layoutY,
1286	1301	selFirst, selLast);
	1302	XSetClipMask(Tk_Display(tkwin), gc, None);
	1303	Tk_FreeGC(Tk_Display(tkwin), gc);
	1304	} else {
	1305
	1306	/* Draw the entire visible text
	1307	*/
	1308	Tk_DrawTextLayout(
	1309	Tk_Display(tkwin), d, gc, entryPtr->entry.textLayout,
	1310	entryPtr->entry.layoutX, entryPtr->entry.layoutY,
	1311	leftIndex, rightIndex);
1287	1312	XSetClipMask(Tk_Display(tkwin), gc, None);
1288	1313	Tk_FreeGC(Tk_Display(tkwin), gc);
1289	1314	}

1377	1402	*indexPtr += 1;
1378	1403	}
1379	1404	} else {
1380		if (Tcl_GetInt(interp, string, indexPtr) != TCL_OK) {
	1405	if (Tcl_GetIntFromObj(interp, indexObj, indexPtr) != TCL_OK) {
1381	1406	goto badIndex;
1382	1407	}
1383	1408	if (*indexPtr < 0) {

2067	2092	TTK_BEGIN_LAYOUT(ComboboxLayout)
2068	2093	TTK_GROUP("Combobox.field", TTK_FILL_BOTH,
2069	2094	TTK_NODE("Combobox.downarrow", TTK_PACK_RIGHT\|TTK_FILL_Y)
2070		TTK_GROUP("Combobox.padding", TTK_FILL_BOTH\|TTK_PACK_LEFT\|TTK_EXPAND,
	2095	TTK_GROUP("Combobox.padding", TTK_FILL_BOTH,
2071	2096	TTK_NODE("Combobox.textarea", TTK_FILL_BOTH)))
2072	2097	TTK_END_LAYOUT
2073	2098

+54

-40

generic/ttk/ttkFrame.c less more

3	3	* ttk::frame and ttk::labelframe widgets.
4	4	*/
5	5
6		#include <tk.h>
7
	6	#include "tkInt.h"
8	7	#include "ttkTheme.h"
9	8	#include "ttkWidget.h"
10	9	#include "ttkManager.h"

88	87	* The frame doesn't request a size of its own by default,
89	88	* but it does have an internal border. See also <<NOTE-SIZE>>
90	89	*/
91		static int FrameSize(void recordPtr, int widthPtr, int *heightPtr)
92		{
93		Frame *framePtr = recordPtr;
	90	static int FrameSize(
	91	void *recordPtr,
	92	TCL_UNUSED(int *),
	93	TCL_UNUSED(int *))
	94	{
	95	Frame framePtr = (Frame )recordPtr;
94	96	Ttk_SetMargins(framePtr->core.tkwin, FrameMargins(framePtr));
95	97	return 0;
96	98	}

111	113
112	114	static int FrameConfigure(Tcl_Interp interp, void recordPtr, int mask)
113	115	{
114		Frame *framePtr = recordPtr;
	116	Frame framePtr = (Frame )recordPtr;
115	117	int width, height;
116	118
117	119	/*

337	339	* Like the frame, this doesn't request a size of its own
338	340	* but it does have internal padding and a minimum size.
339	341	*/
340		static int LabelframeSize(void recordPtr, int widthPtr, int *heightPtr)
341		{
342		Labelframe *lframePtr = recordPtr;
	342	static int LabelframeSize(
	343	void *recordPtr,
	344	TCL_UNUSED(int *),
	345	TCL_UNUSED(int *))
	346	{
	347	Labelframe lframePtr = (Labelframe )recordPtr;
343	348	WidgetCore *corePtr = &lframePtr->core;
344	349	Ttk_Padding margins;
345	350	LabelframeStyle style;

384	389	static Ttk_Layout LabelframeGetLayout(
385	390	Tcl_Interp interp, Ttk_Theme theme, void recordPtr)
386	391	{
387		Labelframe *lf = recordPtr;
	392	Labelframe lf = (Labelframe )recordPtr;
388	393	Ttk_Layout frameLayout = TtkWidgetGetLayout(interp, theme, recordPtr);
389	394	Ttk_Layout labelLayout;
390	395

415	420
416	421	static void LabelframeDoLayout(void *recordPtr)
417	422	{
418		Labelframe *lframePtr = recordPtr;
	423	Labelframe lframePtr = (Labelframe )recordPtr;
419	424	WidgetCore *corePtr = &lframePtr->core;
420	425	int lw, lh; /* Label width and height */
421	426	LabelframeStyle style;

455	460	Ttk_PlaceLayout(
456	461	lframePtr->label.labelLayout, corePtr->state, labelParcel);
457	462	}
458		/* labelWidget placed in LabelframePlaceSlaves GM hook */
	463	/* labelWidget placed in LabelframePlaceContent GM hook */
459	464	lframePtr->label.labelParcel = labelParcel;
460	465	}
461	466
462	467	static void LabelframeDisplay(void *recordPtr, Drawable d)
463	468	{
464		Labelframe *lframePtr = recordPtr;
	469	Labelframe lframePtr = (Labelframe )recordPtr;
465	470	Ttk_DrawLayout(lframePtr->core.layout, lframePtr->core.state, d);
466	471	if (lframePtr->label.labelLayout) {
467	472	Ttk_DrawLayout(lframePtr->label.labelLayout, lframePtr->core.state, d);

471	476	/* +++ Labelframe geometry manager hooks.
472	477	*/
473	478
474		/* LabelframePlaceSlaves --
	479	/* LabelframePlaceContent --
475	480	* Sets the position and size of the labelwidget.
476	481	*/
477		static void LabelframePlaceSlaves(void *recordPtr)
478		{
479		Labelframe *lframe = recordPtr;
480
481		if (Ttk_NumberSlaves(lframe->label.mgr) == 1) {
	482	static void LabelframePlaceContent(void *recordPtr)
	483	{
	484	Labelframe lframe = (Labelframe )recordPtr;
	485
	486	if (Ttk_NumberContent(lframe->label.mgr) == 1) {
482	487	Ttk_Box b;
483	488	LabelframeDoLayout(recordPtr);
484	489	b = lframe->label.labelParcel;
485		/* ASSERT: slave #0 is lframe->label.labelWidget */
486		Ttk_PlaceSlave(lframe->label.mgr, 0, b.x,b.y,b.width,b.height);
487		}
488		}
489
490		static int LabelRequest(void *managerData, int index, int width, int height)
	490	/* ASSERT: content #0 is lframe->label.labelWidget */
	491	Ttk_PlaceContent(lframe->label.mgr, 0, b.x,b.y,b.width,b.height);
	492	}
	493	}
	494
	495	static int LabelRequest(
	496	TCL_UNUSED(void *),
	497	TCL_UNUSED(int),
	498	TCL_UNUSED(int),
	499	TCL_UNUSED(int))
491	500	{
492	501	return 1;
493	502	}

497	506	*
498	507	* <<NOTE-LABELREMOVED>>:
499	508	* This routine is also called when the widget voluntarily forgets
500		* the slave in LabelframeConfigure.
501		*/
502		static void LabelRemoved(void *managerData, int slaveIndex)
503		{
504		Labelframe *lframe = managerData;
	509	* the window in LabelframeConfigure.
	510	*/
	511	static void LabelRemoved(
	512	void *managerData,
	513	TCL_UNUSED(int))
	514	{
	515	Labelframe lframe = (Labelframe )managerData;
	516
505	517	lframe->label.labelWidget = 0;
506	518	}
507	519
508	520	static Ttk_ManagerSpec LabelframeManagerSpec = {
509		{ "labelframe", Ttk_GeometryRequestProc, Ttk_LostSlaveProc },
	521	{ "labelframe", Ttk_GeometryRequestProc, Ttk_LostContentProc },
510	522	LabelframeSize,
511		LabelframePlaceSlaves,
	523	LabelframePlaceContent,
512	524	LabelRequest,
513	525	LabelRemoved
514	526	};

516	528	/* LabelframeInitialize --
517	529	* Initialization hook.
518	530	*/
519		static void LabelframeInitialize(Tcl_Interp interp, void recordPtr)
520		{
521		Labelframe *lframe = recordPtr;
	531	static void LabelframeInitialize(
	532	TCL_UNUSED(Tcl_Interp *),
	533	void *recordPtr)
	534	{
	535	Labelframe lframe = (Labelframe )recordPtr;
522	536
523	537	lframe->label.mgr = Ttk_CreateManager(
524	538	&LabelframeManagerSpec, lframe, lframe->core.tkwin);

532	546	*/
533	547	static void LabelframeCleanup(void *recordPtr)
534	548	{
535		Labelframe *lframe = recordPtr;
	549	Labelframe lframe = (Labelframe )recordPtr;
536	550	Ttk_DeleteManager(lframe->label.mgr);
537	551	if (lframe->label.labelLayout) {
538	552	Ttk_FreeLayout(lframe->label.labelLayout);

563	577	*/
564	578	static int LabelframeConfigure(Tcl_Interp interp,void recordPtr,int mask)
565	579	{
566		Labelframe *lframePtr = recordPtr;
	580	Labelframe lframePtr = (Labelframe )recordPtr;
567	581	Tk_Window labelWidget = lframePtr->label.labelWidget;
568	582	Ttk_PositionSpec unused;
569	583

590	604	/* Update -labelwidget changes, if any:
591	605	*/
592	606	if (mask & LABELWIDGET_CHANGED) {
593		if (Ttk_NumberSlaves(lframePtr->label.mgr) == 1) {
594		Ttk_ForgetSlave(lframePtr->label.mgr, 0);
	607	if (Ttk_NumberContent(lframePtr->label.mgr) == 1) {
	608	Ttk_ForgetContent(lframePtr->label.mgr, 0);
595	609	/* Restore labelWidget field (see <<NOTE-LABELREMOVED>>)
596	610	*/
597	611	lframePtr->label.labelWidget = labelWidget;
598	612	}
599	613
600	614	if (labelWidget) {
601		Ttk_InsertSlave(lframePtr->label.mgr, 0, labelWidget, NULL);
	615	Ttk_InsertContent(lframePtr->label.mgr, 0, labelWidget, NULL);
602	616	RaiseLabelWidget(lframePtr);
603	617	}
604	618	}

+52

-7

generic/ttk/ttkGenStubs.tcl less more

283	283	# Results:
284	284	# Returns the original text inside an appropriate #ifdef.
285	285
286		proc genStubs::addPlatformGuard {plat iftxt {eltxt {}}} {
	286	proc genStubs::addPlatformGuard {plat iftxt {eltxt {}} {withCygwin 0}} {
287	287	set text ""
288	288	switch $plat {
289	289	win {
290		append text "#ifdef _WIN32 /* WIN */\n${iftxt}"
	290	append text "#if defined(_WIN32)"
	291	if {$withCygwin} {
	292	append text " \|\| defined(__CYGWIN__)"
	293	}
	294	append text " /* WIN */\n${iftxt}"
291	295	if {$eltxt ne ""} {
292	296	append text "#else /* WIN */\n${eltxt}"
293	297	}
294	298	append text "#endif /* WIN */\n"
295	299	}
296	300	unix {
297		append text "#if !defined(_WIN32) && !defined(MAC_OSX_TCL)\
	301	append text "#if !defined(_WIN32)"
	302	if {$withCygwin} {
	303	append text " && !defined(__CYGWIN__)"
	304	}
	305	append text " && !defined(MAC_OSX_TCL)\
298	306	/* UNIX */\n${iftxt}"
299	307	if {$eltxt ne ""} {
300	308	append text "#else /* UNIX */\n${eltxt}"

316	324	append text "#endif /* AQUA */\n"
317	325	}
318	326	x11 {
319		append text "#if !(defined(_WIN32) \|\| defined(MAC_OSX_TK))\
	327	append text "#if !(defined(_WIN32)"
	328	if {$withCygwin} {
	329	append text " \|\| defined(__CYGWIN__)"
	330	}
	331	append text " \|\| defined(MAC_OSX_TK))\
320	332	/* X11 */\n${iftxt}"
321	333	if {$eltxt ne ""} {
322	334	append text "#else /* X11 */\n${eltxt}"

449	461
450	462	proc genStubs::makeDecl {name decl index} {
451	463	variable scspec
	464	variable stubs
	465	variable libraryName
452	466	lassign $decl rtype fname args
453	467
454	468	append text "/* $index */\n"
455		set line "$scspec $rtype"
	469	if {[info exists stubs($name,deprecated,$index)]} {
	470	append text "[string toupper $libraryName]_DEPRECATED(\"$stubs($name,deprecated,$index)\")\n"
	471	set line "$rtype"
	472	} elseif {[string range $rtype end-5 end] eq "MP_WUR"} {
	473	set line "$scspec [string trim [string range $rtype 0 end-6]]"
	474	} else {
	475	set line "$scspec $rtype"
	476	}
456	477	set count [expr {2 - ([string length $line] / 8)}]
457		append line [string range "\t\t\t" 0 $count]
	478	if {$count >= 0} {
	479	append line [string range "\t\t\t" 0 $count]
	480	}
458	481	set pad [expr {24 - [string length $line]}]
459	482	if {$pad <= 0} {
460	483	append line " "

493	516	set sep ", "
494	517	}
495	518	append line ", ...)"
	519	if {[lindex $args end] eq "{const char *} format"} {
	520	append line " TCL_FORMAT_PRINTF(" [expr {[llength $args] - 1}] ", " [llength $args] ")"
	521	}
496	522	}
497	523	default {
498	524	set sep "("

516	542	append line ")"
517	543	}
518	544	}
	545	if {[string range $rtype end-5 end] eq "MP_WUR"} {
	546	append line " MP_WUR"
	547	}
519	548	return "$text$line;\n"
520	549	}
521	550

560	589
561	590	proc genStubs::makeSlot {name decl index} {
562	591	lassign $decl rtype fname args
	592	variable stubs
563	593
564	594	set lfname [string tolower [string index $fname 0]]
565	595	append lfname [string range $fname 1 end]
566	596
567	597	set text " "
	598	if {[info exists stubs($name,deprecated,$index)]} {
	599	append text "TCL_DEPRECATED_API(\"$stubs($name,deprecated,$index)\") "
	600	} elseif {[info exists stubs($name,nostub,$index)]} {
	601	append text "TCL_DEPRECATED_API(\"$stubs($name,nostub,$index)\") "
	602	}
568	603	if {$args eq ""} {
569	604	append text $rtype " " $lfname "; / $index */\n"
570	605	return $text
571	606	}
572	607	if {[string range $rtype end-8 end] eq "__stdcall"} {
573	608	append text [string trim [string range $rtype 0 end-9]] " (__stdcall *" $lfname ") "
	609	} elseif {[string range $rtype 0 11] eq "TCL_NORETURN"} {
	610	append text "TCL_NORETURN1 " [string trim [string range $rtype 12 end]] " (*" $lfname ") "
	611	} elseif {[string range $rtype end-5 end] eq "MP_WUR"} {
	612	append text [string trim [string range $rtype 0 end-6]] " (*" $lfname ") "
574	613	} else {
575	614	append text $rtype " (*" $lfname ") "
576	615	}

590	629	set sep ", "
591	630	}
592	631	append text ", ...)"
	632	if {[lindex $args end] eq "{const char *} format"} {
	633	append text " TCL_FORMAT_PRINTF(" [expr {[llength $args] - 1}] ", " [llength $args] ")"
	634	}
593	635	}
594	636	default {
595	637	set sep "("

605	647	}
606	648	}
607	649
	650	if {[string range $rtype end-5 end] eq "MP_WUR"} {
	651	append text " MP_WUR"
	652	}
608	653	append text "; /* $index */\n"
609	654	return $text
610	655	}

836	881	}
837	882	foreach intf [array names interfaces] {
838	883	if {[info exists hooks($intf)]} {
839		if {[lsearch -exact $hooks($intf) $name] >= 0} {
	884	if {$name in $hooks($intf)} {
840	885	set root 0
841	886	break
842	887	}

+1

-2

generic/ttk/ttkImage.c less more

9	9	* [style map].
10	10	*/
11	11
12		#include <string.h>
13		#include <tk.h>
	12	#include "tkInt.h"
14	13	#include "ttkTheme.h"
15	14
16	15	#define MIN(a,b) ((a) < (b) ? (a) : (b))

+4

-5

generic/ttk/ttkInit.c less more

3	3	* Ttk package: initialization routine and miscellaneous utilities.
4	4	*/
5	5
6		#include <string.h>
7		#include <tk.h>
	6	#include "tkInt.h"
8	7	#include "ttkTheme.h"
9	8	#include "ttkWidget.h"
10	9

114	113	*/
115	114	void TtkSendVirtualEvent(Tk_Window tgtWin, const char *eventName)
116	115	{
117		union {XEvent general; XVirtualEvent virtual;} event;
	116	union {XEvent general; XVirtualEvent virt;} event;
118	117
119	118	memset(&event, 0, sizeof(event));
120	119	event.general.xany.type = VirtualEvent;

122	121	event.general.xany.send_event = False;
123	122	event.general.xany.window = Tk_WindowId(tgtWin);
124	123	event.general.xany.display = Tk_Display(tgtWin);
125		event.virtual.name = Tk_GetUid(eventName);
	124	event.virt.name = Tk_GetUid(eventName);
126	125
127	126	Tk_QueueWindowEvent(&event.general, TCL_QUEUE_TAIL);
128	127	}

274	273
275	274	Ttk_PlatformInit(interp);
276	275
277		Tcl_PkgProvideEx(interp, "Ttk", TTK_PATCH_LEVEL, (ClientData)&ttkStubs);
	276	Tcl_PkgProvideEx(interp, "Ttk", TTK_PATCH_LEVEL, (void *)&ttkStubs);
278	277
279	278	return TCL_OK;
280	279	}

+35

-24

generic/ttk/ttkLabel.c less more

64	64	Tk_Offset(TextElement,wrapLengthObj), "0" },
65	65	{ "-embossed", TK_OPTION_INT,
66	66	Tk_Offset(TextElement,embossedObj), "0"},
67		{ NULL, 0, 0, NULL }
	67	{ NULL, TK_OPTION_BOOLEAN, 0, NULL }
68	68	};
69	69
70	70	static int TextSetup(TextElement *text, Tk_Window tkwin)

137	137	gcValues.foreground = WhitePixelOfScreen(Tk_Screen(tkwin));
138	138	gc2 = Tk_GetGC(tkwin, GCFont \| GCForeground, &gcValues);
139	139
140		/*
	140	/*
141	141	* Place text according to -anchor:
142	142	*/
143	143	Tk_GetAnchorFromObj(NULL, text->anchorObj, &anchor);

192	192	}
193	193
194	194	static void TextElementSize(
195		void clientData, void elementRecord, Tk_Window tkwin,
	195	void dummy, void elementRecord, Tk_Window tkwin,
196	196	int widthPtr, int heightPtr, Ttk_Padding *paddingPtr)
197	197	{
198		TextElement *text = elementRecord;
	198	TextElement text = (TextElement )elementRecord;
	199	(void)dummy;
	200	(void)paddingPtr;
199	201
200	202	if (!TextSetup(text, tkwin))
201	203	return;

209	211	}
210	212
211	213	static void TextElementDraw(
212		void clientData, void elementRecord, Tk_Window tkwin,
	214	void dummy, void elementRecord, Tk_Window tkwin,
213	215	Drawable d, Ttk_Box b, Ttk_State state)
214	216	{
215		TextElement *text = elementRecord;
	217	TextElement text = (TextElement )elementRecord;
	218	(void)dummy;
	219	(void)state;
	220
216	221	if (TextSetup(text, tkwin)) {
217	222	TextDraw(text, tkwin, d, b);
218	223	TextCleanup(text);

252	257	Tk_Offset(ImageElement,stippleObj), "gray50" },
253	258	{ "-background", TK_OPTION_COLOR,
254	259	Tk_Offset(ImageElement,backgroundObj), DEFAULT_BACKGROUND },
255		{ NULL, 0, 0, NULL }
	260	{ NULL, TK_OPTION_BOOLEAN, 0, NULL }
256	261	};
257	262
258	263	/*

340	345
341	346	Tk_RedrawImage(image->tkimg, 0,0, width, height, d, b.x, b.y);
342	347
343		/* If we're disabled there's no state-specific 'disabled' image,
	348	/* If we're disabled there's no state-specific 'disabled' image,
344	349	* stipple the image.
345	350	* @@@ Possibly: Don't do disabled-stippling at all;
346	351	* @@@ it's ugly and out of fashion.
347		* Do not stipple at all under Aqua, just draw the image: it shows up
	352	* Do not stipple at all under Aqua, just draw the image: it shows up
348	353	* as a white rectangle otherwise.
349	354	*/
350	355
351
	356
352	357	if (state & TTK_STATE_DISABLED) {
353	358	if (TtkSelectImage(image->imageSpec, 0ul) == image->tkimg) {
354	359	#ifndef MAC_OSX_TK

359	364	}
360	365
361	366	static void ImageElementSize(
362		void clientData, void elementRecord, Tk_Window tkwin,
	367	void dummy, void elementRecord, Tk_Window tkwin,
363	368	int widthPtr, int heightPtr, Ttk_Padding *paddingPtr)
364	369	{
365		ImageElement *image = elementRecord;
	370	ImageElement image = (ImageElement )elementRecord;
	371	(void)dummy;
	372	(void)paddingPtr;
366	373
367	374	if (ImageSetup(image, tkwin, 0)) {
368	375	*widthPtr = image->width;

372	379	}
373	380
374	381	static void ImageElementDraw(
375		void clientData, void elementRecord, Tk_Window tkwin,
	382	void dummy, void elementRecord, Tk_Window tkwin,
376	383	Drawable d, Ttk_Box b, Ttk_State state)
377	384	{
378		ImageElement *image = elementRecord;
	385	ImageElement image = (ImageElement )elementRecord;
	386	(void)dummy;
379	387
380	388	if (ImageSetup(image, tkwin, state)) {
381	389	ImageDraw(image, tkwin, d, b, state);

476	484	Tk_Offset(LabelElement,image.stippleObj), "gray50" },
477	485	{ "-background", TK_OPTION_COLOR,
478	486	Tk_Offset(LabelElement,image.backgroundObj), DEFAULT_BACKGROUND },
479		{ NULL, 0, 0, NULL }
	487	{ NULL, TK_OPTION_BOOLEAN, 0, NULL }
480	488	};
481	489
482	490	/*

493	501	{
494	502	Ttk_Compound *compoundPtr = &c->compound;
495	503
496		Tk_GetPixelsFromObj(NULL,tkwin,c->spaceObj,&c->space);
497		Ttk_GetCompoundFromObj(NULL,c->compoundObj,(int*)compoundPtr);
	504	Tk_GetPixelsFromObj(NULL, tkwin, c->spaceObj, &c->space);
	505	Ttk_GetCompoundFromObj(NULL, c->compoundObj, (int *)compoundPtr);
498	506
499	507	/*
500	508	* Deal with TTK_COMPOUND_NONE.

560	568	}
561	569
562	570	static void LabelElementSize(
563		void clientData, void elementRecord, Tk_Window tkwin,
	571	void dummy, void elementRecord, Tk_Window tkwin,
564	572	int widthPtr, int heightPtr, Ttk_Padding *paddingPtr)
565	573	{
566		LabelElement *label = elementRecord;
	574	LabelElement label = (LabelElement )elementRecord;
567	575	int textReqWidth = 0;
	576	(void)dummy;
	577	(void)paddingPtr;
568	578
569	579	LabelSetup(label, tkwin, 0);
570	580

575	585	if (label->compound != TTK_COMPOUND_IMAGE)
576	586	textReqWidth = TextReqWidth(&label->text);
577	587
578		switch (label->compound)
	588	switch (label->compound)
579	589	{
580	590	case TTK_COMPOUND_TEXT:
581	591	*widthPtr = textReqWidth;

586	596	case TTK_COMPOUND_TOP:
587	597	case TTK_COMPOUND_BOTTOM:
588	598	case TTK_COMPOUND_CENTER:
589		*widthPtr = MAX(label->image.width, textReqWidth);
	599	*widthPtr = MAX(label->image.width, textReqWidth);
590	600	break;
591	601	case TTK_COMPOUND_LEFT:
592	602	case TTK_COMPOUND_RIGHT:
593		*widthPtr = label->image.width + textReqWidth + label->space;
	603	*widthPtr = label->image.width + textReqWidth + label->space;
594	604	break;
595	605	case TTK_COMPOUND_NONE:
596	606	break; /* Can't happen */

617	627	}
618	628
619	629	static void LabelElementDraw(
620		void clientData, void elementRecord, Tk_Window tkwin,
	630	void dummy, void elementRecord, Tk_Window tkwin,
621	631	Drawable d, Ttk_Box b, Ttk_State state)
622	632	{
623		LabelElement *l = elementRecord;
	633	LabelElement l = (LabelElement )elementRecord;
624	634	Tk_Anchor anchor = TK_ANCHOR_CENTER;
	635	(void)dummy;
625	636
626	637	LabelSetup(l, tkwin, state);
627	638

+1

-2

generic/ttk/ttkLayout.c less more

5	5	* Copyright (c) 2003 Joe English. Freely redistributable.
6	6	*/
7	7
8		#include <string.h>
9	8	#include "tkInt.h"
10	9	#include "ttkThemeInt.h"
11	10

809	808	APPENDSTR("-sticky");
810	809	APPENDOBJ(Ttk_NewStickyObj(flags & _TTK_MASK_STICK));
811	810
812		/* @@@ Check again: are these necessary? */
	811	/* @@@ Check again: are these necessary? Can't see any effect! */
813	812	if (flags & TTK_BORDER) { APPENDSTR("-border"); APPENDSTR("1"); }
814	813	if (flags & TTK_UNIT) { APPENDSTR("-unit"); APPENDSTR("1"); }
815	814

+233

-235

generic/ttk/ttkManager.c less more

3	3	* Support routines for geometry managers.
4	4	*/
5	5
6		#include <string.h>
7		#include <tk.h>
	6	#include "tkInt.h"
8	7	#include "ttkManager.h"
9	8
10	9	/*------------------------------------------------------------------------
11	10	* +++ The Geometry Propagation Dance.
12	11	*
13		* When a slave window requests a new size or some other parameter changes,
14		* the manager recomputes the required size for the master window and calls
	12	* When a content window requests a new size or some other parameter changes,
	13	* the manager recomputes the required size for the container window and calls
15	14	* Tk_GeometryRequest(). This is scheduled as an idle handler so multiple
16	15	* updates can be processed as a single batch.
17	16	*
18		* If all goes well, the master's manager will process the request
19		* (and so on up the chain to the toplevel window), and the master
	17	* If all goes well, the container's manager will process the request
	18	* (and so on up the chain to the toplevel window), and the container
20	19	* window will eventually receive a <Configure> event. At this point
21		* it recomputes the size and position of all slaves and places them.
22		*
23		* If all does not go well, however, the master's request may be ignored
	20	* it recomputes the size and position of all content windows and places them.
	21	*
	22	* If all does not go well, however, the container's request may be ignored
24	23	* (typically because the top-level window has a fixed, user-specified size).
25	24	* Tk doesn't provide any notification when this happens; to account for this,
26	25	* we also schedule an idle handler to call the layout procedure
27	26	* after making a geometry request.
28	27	*
29		* +++ Slave removal <<NOTE-LOSTSLAVE>>.
30		*
31		* There are three conditions under which a slave is removed:
	28	* +++ Content window removal <<NOTE-LOSTCONTENT>>.
	29	*
	30	* There are three conditions under which a content window is removed:
32	31	*
33	32	* (1) Another GM claims control
34	33	* (2) Manager voluntarily relinquishes control
35		* (3) Slave is destroyed
	34	* (3) Content window is destroyed
36	35	*
37	36	* In case (1), Tk calls the manager's lostSlaveProc.
38		* Case (2) is performed by calling Tk_ManageGeometry(slave,NULL,0);
39		* in this case Tk does _not_ call the LostSlaveProc (documented behavior).
	37	* Case (2) is performed by calling Tk_ManageGeometry(window,NULL,0);
	38	* in this case Tk does _not_ call the lostSlaveProc (documented behavior).
40	39	* Tk doesn't handle case (3) either; to account for that we
41		* register an event handler on the slave widget to track <Destroy> events.
	40	* register an event handler on the content window to track <Destroy> events.
42	41	*/
43	42
44	43	/* ++ Data structures.
45	44	*/
46	45	typedef struct
47	46	{
48		Tk_Window slaveWindow;
	47	Tk_Window window;
49	48	Ttk_Manager *manager;
50		void *slaveData;
	49	void *data;
51	50	unsigned flags;
52		} Ttk_Slave;
53
54		/* slave->flags bits:
55		*/
56		#define SLAVE_MAPPED 0x1 /* slave to be mapped when master is */
	51	} Ttk_Content;
	52
	53	/* content->flags bits:
	54	*/
	55	#define CONTENT_MAPPED 0x1 /* content windows to be mapped when container is */
57	56
58	57	struct TtkManager_
59	58	{
60	59	Ttk_ManagerSpec *managerSpec;
61	60	void *managerData;
62		Tk_Window masterWindow;
	61	Tk_Window window;
63	62	unsigned flags;
64		int nSlaves;
65		Ttk_Slave **slaves;
	63	int nContent;
	64	Ttk_Content **content;
66	65	};
67	66
68	67	/* manager->flags bits:

87	86	}
88	87
89	88	/* ++ RecomputeSize --
90		* Recomputes the required size of the master window,
	89	* Recomputes the required size of the container window,
91	90	* makes geometry request.
92	91	*/
93	92	static void RecomputeSize(Ttk_Manager *mgr)

95	94	int width = 1, height = 1;
96	95
97	96	if (mgr->managerSpec->RequestedSize(mgr->managerData, &width, &height)) {
98		Tk_GeometryRequest(mgr->masterWindow, width, height);
	97	Tk_GeometryRequest(mgr->window, width, height);
99	98	ScheduleUpdate(mgr, MGR_RELAYOUT_REQUIRED);
100	99	}
101	100	mgr->flags &= ~MGR_RESIZE_REQUIRED;
102	101	}
103	102
104	103	/* ++ RecomputeLayout --
105		* Recompute geometry of all slaves.
	104	* Recompute geometry of all content windows.
106	105	*/
107	106	static void RecomputeLayout(Ttk_Manager *mgr)
108	107	{

115	114	*/
116	115	static void ManagerIdleProc(ClientData clientData)
117	116	{
118		Ttk_Manager *mgr = clientData;
	117	Ttk_Manager mgr = (Ttk_Manager )clientData;
119	118	mgr->flags &= ~MGR_UPDATE_PENDING;
120	119
121	120	if (mgr->flags & MGR_RESIZE_REQUIRED) {

135	134	*/
136	135
137	136	/* ++ ManagerEventHandler --
138		* Recompute slave layout when master widget is resized.
139		* Keep the slave's map state in sync with the master's.
	137	* Recompute content layout when container widget is resized.
	138	* Keep the content's map state in sync with the container's.
140	139	*/
141	140	static const int ManagerEventMask = StructureNotifyMask;
142	141	static void ManagerEventHandler(ClientData clientData, XEvent *eventPtr)
143	142	{
144		Ttk_Manager *mgr = clientData;
	143	Ttk_Manager mgr = (Ttk_Manager )clientData;
145	144	int i;
146	145
147	146	switch (eventPtr->type)

150	149	RecomputeLayout(mgr);
151	150	break;
152	151	case MapNotify:
153		for (i = 0; i < mgr->nSlaves; ++i) {
154		Ttk_Slave *slave = mgr->slaves[i];
155		if (slave->flags & SLAVE_MAPPED) {
156		Tk_MapWindow(slave->slaveWindow);
	152	for (i = 0; i < mgr->nContent; ++i) {
	153	Ttk_Content *content = mgr->content[i];
	154	if (content->flags & CONTENT_MAPPED) {
	155	Tk_MapWindow(content->window);
157	156	}
158	157	}
159	158	break;
160	159	case UnmapNotify:
161		for (i = 0; i < mgr->nSlaves; ++i) {
162		Ttk_Slave *slave = mgr->slaves[i];
163		Tk_UnmapWindow(slave->slaveWindow);
	160	for (i = 0; i < mgr->nContent; ++i) {
	161	Ttk_Content *content = mgr->content[i];
	162	Tk_UnmapWindow(content->window);
164	163	}
165	164	break;
166	165	}
167	166	}
168	167
169		/* ++ SlaveEventHandler --
170		* Notifies manager when a slave is destroyed
171		* (see <<NOTE-LOSTSLAVE>>).
172		*/
173		static const unsigned SlaveEventMask = StructureNotifyMask;
174		static void SlaveEventHandler(ClientData clientData, XEvent *eventPtr)
175		{
176		Ttk_Slave *slave = clientData;
	168	/* ++ ContentLostEventHandler --
	169	* Notifies manager when a content window is destroyed
	170	* (see <<NOTE-LOSTCONTENT>>).
	171	*/
	172	static void ContentLostEventHandler(void clientData, XEvent eventPtr)
	173	{
	174	Ttk_Content content = (Ttk_Content )clientData;
177	175	if (eventPtr->type == DestroyNotify) {
178		slave->manager->managerSpec->tkGeomMgr.lostSlaveProc(
179		slave->manager, slave->slaveWindow);
180		}
181		}
182
183		/*------------------------------------------------------------------------
184		* +++ Slave initialization and cleanup.
185		*/
186
187		static Ttk_Slave *NewSlave(
188		Ttk_Manager mgr, Tk_Window slaveWindow, void slaveData)
189		{
190		Ttk_Slave slave = ckalloc(sizeof(slave));
191
192		slave->slaveWindow = slaveWindow;
193		slave->manager = mgr;
194		slave->flags = 0;
195		slave->slaveData = slaveData;
196
197		return slave;
198		}
199
200		static void DeleteSlave(Ttk_Slave *slave)
201		{
202		ckfree(slave);
	176	content->manager->managerSpec->tkGeomMgr.lostSlaveProc(
	177	content->manager, content->window);
	178	}
	179	}
	180
	181	/*------------------------------------------------------------------------
	182	* +++ Content initialization and cleanup.
	183	*/
	184
	185	static Ttk_Content *NewContent(
	186	Ttk_Manager mgr, Tk_Window window, void data)
	187	{
	188	Ttk_Content content = (Ttk_Content )ckalloc(sizeof(Ttk_Content));
	189
	190	content->window = window;
	191	content->manager = mgr;
	192	content->flags = 0;
	193	content->data = data;
	194
	195	return content;
	196	}
	197
	198	static void DeleteContent(Ttk_Content *content)
	199	{
	200	ckfree(content);
203	201	}
204	202
205	203	/*------------------------------------------------------------------------

207	205	*/
208	206
209	207	Ttk_Manager *Ttk_CreateManager(
210		Ttk_ManagerSpec managerSpec, void managerData, Tk_Window masterWindow)
211		{
212		Ttk_Manager mgr = ckalloc(sizeof(mgr));
	208	Ttk_ManagerSpec managerSpec, void managerData, Tk_Window window)
	209	{
	210	Ttk_Manager mgr = (Ttk_Manager )ckalloc(sizeof(*mgr));
213	211
214	212	mgr->managerSpec = managerSpec;
215	213	mgr->managerData = managerData;
216		mgr->masterWindow = masterWindow;
217		mgr->nSlaves = 0;
218		mgr->slaves = NULL;
	214	mgr->window = window;
	215	mgr->nContent = 0;
	216	mgr->content = NULL;
219	217	mgr->flags = 0;
220	218
221	219	Tk_CreateEventHandler(
222		mgr->masterWindow, ManagerEventMask, ManagerEventHandler, mgr);
	220	mgr->window, ManagerEventMask, ManagerEventHandler, mgr);
223	221
224	222	return mgr;
225	223	}

227	225	void Ttk_DeleteManager(Ttk_Manager *mgr)
228	226	{
229	227	Tk_DeleteEventHandler(
230		mgr->masterWindow, ManagerEventMask, ManagerEventHandler, mgr);
231
232		while (mgr->nSlaves > 0) {
233		Ttk_ForgetSlave(mgr, mgr->nSlaves - 1);
234		}
235		if (mgr->slaves) {
236		ckfree(mgr->slaves);
	228	mgr->window, ManagerEventMask, ManagerEventHandler, mgr);
	229
	230	while (mgr->nContent > 0) {
	231	Ttk_ForgetContent(mgr, mgr->nContent - 1);
	232	}
	233	if (mgr->content) {
	234	ckfree(mgr->content);
237	235	}
238	236
239	237	Tcl_CancelIdleCall(ManagerIdleProc, mgr);

242	240	}
243	241
244	242	/*------------------------------------------------------------------------
245		* +++ Slave management.
246		*/
247
248		/* ++ InsertSlave --
249		* Adds slave to the list of managed windows.
250		*/
251		static void InsertSlave(Ttk_Manager mgr, Ttk_Slave slave, int index)
252		{
253		int endIndex = mgr->nSlaves++;
254		mgr->slaves = ckrealloc(mgr->slaves, mgr->nSlaves * sizeof(Ttk_Slave *));
	243	* +++ Content window management.
	244	*/
	245
	246	/* ++ InsertContent --
	247	* Adds content to the list of managed windows.
	248	*/
	249	static void InsertContent(Ttk_Manager mgr, Ttk_Content content, int index)
	250	{
	251	int endIndex = mgr->nContent++;
	252	mgr->content = (Ttk_Content *)ckrealloc(mgr->content, mgr->nContent sizeof(Ttk_Content *));
255	253
256	254	while (endIndex > index) {
257		mgr->slaves[endIndex] = mgr->slaves[endIndex - 1];
	255	mgr->content[endIndex] = mgr->content[endIndex - 1];
258	256	--endIndex;
259	257	}
260	258
261		mgr->slaves[index] = slave;
262
263		Tk_ManageGeometry(slave->slaveWindow,
264		&mgr->managerSpec->tkGeomMgr, (ClientData)mgr);
265
266		Tk_CreateEventHandler(slave->slaveWindow,
267		SlaveEventMask, SlaveEventHandler, (ClientData)slave);
	259	mgr->content[index] = content;
	260
	261	Tk_ManageGeometry(content->window,
	262	&mgr->managerSpec->tkGeomMgr, mgr);
	263
	264	Tk_CreateEventHandler(content->window,
	265	StructureNotifyMask, ContentLostEventHandler, content);
268	266
269	267	ScheduleUpdate(mgr, MGR_RESIZE_REQUIRED);
270	268	}
271	269
272		/* RemoveSlave --
273		* Unmanage and delete the slave.
	270	/* RemoveContent --
	271	* Unmanage and delete the content window.
274	272	*
275	273	* NOTES/ASSUMPTIONS:
276	274	*
277	275	* [1] It's safe to call Tk_UnmapWindow / Tk_UnmaintainGeometry even if this
278		* routine is called from the slave's DestroyNotify event handler.
279		*/
280		static void RemoveSlave(Ttk_Manager *mgr, int index)
281		{
282		Ttk_Slave *slave = mgr->slaves[index];
	276	* routine is called from the content window's DestroyNotify event handler.
	277	*/
	278	static void RemoveContent(Ttk_Manager *mgr, int index)
	279	{
	280	Ttk_Content *content = mgr->content[index];
283	281	int i;
284	282
285	283	/* Notify manager:

288	286
289	287	/* Remove from array:
290	288	*/
291		--mgr->nSlaves;
292		for (i = index ; i < mgr->nSlaves; ++i) {
293		mgr->slaves[i] = mgr->slaves[i+1];
	289	--mgr->nContent;
	290	for (i = index ; i < mgr->nContent; ++i) {
	291	mgr->content[i] = mgr->content[i+1];
294	292	}
295	293
296	294	/* Clean up:
297	295	*/
298	296	Tk_DeleteEventHandler(
299		slave->slaveWindow, SlaveEventMask, SlaveEventHandler, slave);
	297	content->window, StructureNotifyMask, ContentLostEventHandler, content);
300	298
301	299	/* Note [1] */
302		Tk_UnmaintainGeometry(slave->slaveWindow, mgr->masterWindow);
303		Tk_UnmapWindow(slave->slaveWindow);
304
305		DeleteSlave(slave);
	300	Tk_UnmaintainGeometry(content->window, mgr->window);
	301	Tk_UnmapWindow(content->window);
	302
	303	DeleteContent(content);
306	304
307	305	ScheduleUpdate(mgr, MGR_RESIZE_REQUIRED);
308	306	}

311	309	* +++ Tk_GeomMgr hooks.
312	310	*/
313	311
314		void Ttk_GeometryRequestProc(ClientData clientData, Tk_Window slaveWindow)
315		{
316		Ttk_Manager *mgr = clientData;
317		int slaveIndex = Ttk_SlaveIndex(mgr, slaveWindow);
318		int reqWidth = Tk_ReqWidth(slaveWindow);
319		int reqHeight= Tk_ReqHeight(slaveWindow);
	312	void Ttk_GeometryRequestProc(ClientData clientData, Tk_Window window)
	313	{
	314	Ttk_Manager mgr = (Ttk_Manager )clientData;
	315	int index = Ttk_ContentIndex(mgr, window);
	316	int reqWidth = Tk_ReqWidth(window);
	317	int reqHeight= Tk_ReqHeight(window);
320	318
321	319	if (mgr->managerSpec->SlaveRequest(
322		mgr->managerData, slaveIndex, reqWidth, reqHeight))
	320	mgr->managerData, index, reqWidth, reqHeight))
323	321	{
324	322	ScheduleUpdate(mgr, MGR_RESIZE_REQUIRED);
325	323	}
326	324	}
327	325
328		void Ttk_LostSlaveProc(ClientData clientData, Tk_Window slaveWindow)
329		{
330		Ttk_Manager *mgr = clientData;
331		int index = Ttk_SlaveIndex(mgr, slaveWindow);
	326	void Ttk_LostContentProc(ClientData clientData, Tk_Window window)
	327	{
	328	Ttk_Manager mgr = (Ttk_Manager )clientData;
	329	int index = Ttk_ContentIndex(mgr, window);
332	330
333	331	/* ASSERT: index >= 0 */
334		RemoveSlave(mgr, index);
	332	RemoveContent(mgr, index);
335	333	}
336	334
337	335	/*------------------------------------------------------------------------
338	336	* +++ Public API.
339	337	*/
340	338
341		/* ++ Ttk_InsertSlave --
342		* Add a new slave window at the specified index.
343		*/
344		void Ttk_InsertSlave(
345		Ttk_Manager mgr, int index, Tk_Window tkwin, void slaveData)
346		{
347		Ttk_Slave *slave = NewSlave(mgr, tkwin, slaveData);
348		InsertSlave(mgr, slave, index);
349		}
350
351		/* ++ Ttk_ForgetSlave --
352		* Unmanage the specified slave.
353		*/
354		void Ttk_ForgetSlave(Ttk_Manager *mgr, int slaveIndex)
355		{
356		Tk_Window slaveWindow = mgr->slaves[slaveIndex]->slaveWindow;
357		RemoveSlave(mgr, slaveIndex);
358		Tk_ManageGeometry(slaveWindow, NULL, 0);
359		}
360
361		/* ++ Ttk_PlaceSlave --
362		* Set the position and size of the specified slave window.
	339	/* ++ Ttk_InsertContent --
	340	* Add a new content window at the specified index.
	341	*/
	342	void Ttk_InsertContent(
	343	Ttk_Manager mgr, int index, Tk_Window tkwin, void data)
	344	{
	345	Ttk_Content *content = NewContent(mgr, tkwin, data);
	346	InsertContent(mgr, content, index);
	347	}
	348
	349	/* ++ Ttk_ForgetContent --
	350	* Unmanage the specified content window.
	351	*/
	352	void Ttk_ForgetContent(Ttk_Manager *mgr, int index)
	353	{
	354	Tk_Window window = mgr->content[index]->window;
	355	RemoveContent(mgr, index);
	356	Tk_ManageGeometry(window, NULL, 0);
	357	}
	358
	359	/* ++ Ttk_PlaceContent --
	360	* Set the position and size of the specified content window.
363	361	*
364	362	* NOTES:
365	363	* Contrary to documentation, Tk_MaintainGeometry doesn't always
366		* map the slave.
367		*/
368		void Ttk_PlaceSlave(
369		Ttk_Manager *mgr, int slaveIndex, int x, int y, int width, int height)
370		{
371		Ttk_Slave *slave = mgr->slaves[slaveIndex];
372		Tk_MaintainGeometry(slave->slaveWindow,mgr->masterWindow,x,y,width,height);
373		slave->flags \|= SLAVE_MAPPED;
374		if (Tk_IsMapped(mgr->masterWindow)) {
375		Tk_MapWindow(slave->slaveWindow);
376		}
377		}
378
379		/* ++ Ttk_UnmapSlave --
380		* Unmap the specified slave, but leave it managed.
381		*/
382		void Ttk_UnmapSlave(Ttk_Manager *mgr, int slaveIndex)
383		{
384		Ttk_Slave *slave = mgr->slaves[slaveIndex];
385		Tk_UnmaintainGeometry(slave->slaveWindow, mgr->masterWindow);
386		slave->flags &= ~SLAVE_MAPPED;
	364	* map the content window.
	365	*/
	366	void Ttk_PlaceContent(
	367	Ttk_Manager *mgr, int index, int x, int y, int width, int height)
	368	{
	369	Ttk_Content *content = mgr->content[index];
	370	Tk_MaintainGeometry(content->window,mgr->window,x,y,width,height);
	371	content->flags \|= CONTENT_MAPPED;
	372	if (Tk_IsMapped(mgr->window)) {
	373	Tk_MapWindow(content->window);
	374	}
	375	}
	376
	377	/* ++ Ttk_UnmapContent --
	378	* Unmap the specified content window, but leave it managed.
	379	*/
	380	void Ttk_UnmapContent(Ttk_Manager *mgr, int index)
	381	{
	382	Ttk_Content *content = mgr->content[index];
	383	Tk_UnmaintainGeometry(content->window, mgr->window);
	384	content->flags &= ~CONTENT_MAPPED;
387	385	/* Contrary to documentation, Tk_UnmaintainGeometry doesn't always
388		* unmap the slave:
389		*/
390		Tk_UnmapWindow(slave->slaveWindow);
	386	* unmap the content window:
	387	*/
	388	Tk_UnmapWindow(content->window);
391	389	}
392	390
393	391	/* LayoutChanged, SizeChanged --

405	403
406	404	/* +++ Accessors.
407	405	*/
408		int Ttk_NumberSlaves(Ttk_Manager *mgr)
409		{
410		return mgr->nSlaves;
411		}
412		void Ttk_SlaveData(Ttk_Manager mgr, int slaveIndex)
413		{
414		return mgr->slaves[slaveIndex]->slaveData;
415		}
416		Tk_Window Ttk_SlaveWindow(Ttk_Manager *mgr, int slaveIndex)
417		{
418		return mgr->slaves[slaveIndex]->slaveWindow;
	406	int Ttk_NumberContent(Ttk_Manager *mgr)
	407	{
	408	return mgr->nContent;
	409	}
	410	void Ttk_ContentData(Ttk_Manager mgr, int index)
	411	{
	412	return mgr->content[index]->data;
	413	}
	414	Tk_Window Ttk_ContentWindow(Ttk_Manager *mgr, int index)
	415	{
	416	return mgr->content[index]->window;
419	417	}
420	418
421	419	/*------------------------------------------------------------------------
422	420	* +++ Utility routines.
423	421	*/
424	422
425		/* ++ Ttk_SlaveIndex --
426		* Returns the index of specified slave window, -1 if not found.
427		*/
428		int Ttk_SlaveIndex(Ttk_Manager *mgr, Tk_Window slaveWindow)
	423	/* ++ Ttk_ContentIndex --
	424	* Returns the index of specified content window, -1 if not found.
	425	*/
	426	int Ttk_ContentIndex(Ttk_Manager *mgr, Tk_Window window)
429	427	{
430	428	int index;
431		for (index = 0; index < mgr->nSlaves; ++index)
432		if (mgr->slaves[index]->slaveWindow == slaveWindow)
	429	for (index = 0; index < mgr->nContent; ++index)
	430	if (mgr->content[index]->window == window)
433	431	return index;
434	432	return -1;
435	433	}
436	434
437		/* ++ Ttk_GetSlaveIndexFromObj(interp, mgr, objPtr, indexPtr) --
438		* Return the index of the slave specified by objPtr.
439		* Slaves may be specified as an integer index or
	435	/* ++ Ttk_GetContentIndexFromObj(interp, mgr, objPtr, indexPtr) --
	436	* Return the index of the content window specified by objPtr.
	437	* Content windows may be specified as an integer index or
440	438	* as the name of the managed window.
441	439	*
442	440	* Returns:
443	441	* Standard Tcl completion code. Leaves an error message in case of error.
444	442	*/
445	443
446		int Ttk_GetSlaveIndexFromObj(
	444	int Ttk_GetContentIndexFromObj(
447	445	Tcl_Interp interp, Ttk_Manager mgr, Tcl_Obj objPtr, int indexPtr)
448	446	{
449	447	const char *string = Tcl_GetString(objPtr);
450		int slaveIndex = 0;
	448	int index = 0;
451	449	Tk_Window tkwin;
452	450
453	451	/* Try interpreting as an integer first:
454	452	*/
455		if (Tcl_GetIntFromObj(NULL, objPtr, &slaveIndex) == TCL_OK) {
456		if (slaveIndex < 0 \|\| slaveIndex >= mgr->nSlaves) {
	453	if (Tcl_GetIntFromObj(NULL, objPtr, &index) == TCL_OK) {
	454	if (index < 0 \|\| index >= mgr->nContent) {
457	455	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
458		"Slave index %d out of bounds", slaveIndex));
	456	"Slave index %d out of bounds", index));
459	457	Tcl_SetErrorCode(interp, "TTK", "SLAVE", "INDEX", NULL);
460	458	return TCL_ERROR;
461	459	}
462		*indexPtr = slaveIndex;
	460	*indexPtr = index;
463	461	return TCL_OK;
464	462	}
465	463
466		/* Try interpreting as a slave window name;
	464	/* Try interpreting as a window name;
467	465	*/
468	466	if ((*string == '.') &&
469		(tkwin = Tk_NameToWindow(interp, string, mgr->masterWindow))) {
470		slaveIndex = Ttk_SlaveIndex(mgr, tkwin);
471		if (slaveIndex < 0) {
	467	(tkwin = Tk_NameToWindow(interp, string, mgr->window))) {
	468	index = Ttk_ContentIndex(mgr, tkwin);
	469	if (index < 0) {
472	470	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
473	471	"%s is not managed by %s", string,
474		Tk_PathName(mgr->masterWindow)));
	472	Tk_PathName(mgr->window)));
475	473	Tcl_SetErrorCode(interp, "TTK", "SLAVE", "MANAGER", NULL);
476	474	return TCL_ERROR;
477	475	}
478		*indexPtr = slaveIndex;
	476	*indexPtr = index;
479	477	return TCL_OK;
480	478	}
481	479

485	483	return TCL_ERROR;
486	484	}
487	485
488		/* ++ Ttk_ReorderSlave(mgr, fromIndex, toIndex) --
489		* Change slave order.
490		*/
491		void Ttk_ReorderSlave(Ttk_Manager *mgr, int fromIndex, int toIndex)
492		{
493		Ttk_Slave *moved = mgr->slaves[fromIndex];
	486	/* ++ Ttk_ReorderContent(mgr, fromIndex, toIndex) --
	487	* Change content window order.
	488	*/
	489	void Ttk_ReorderContent(Ttk_Manager *mgr, int fromIndex, int toIndex)
	490	{
	491	Ttk_Content *moved = mgr->content[fromIndex];
494	492
495	493	/* Shuffle down: */
496	494	while (fromIndex > toIndex) {
497		mgr->slaves[fromIndex] = mgr->slaves[fromIndex - 1];
	495	mgr->content[fromIndex] = mgr->content[fromIndex - 1];
498	496	--fromIndex;
499	497	}
500	498	/* Or, shuffle up: */
501	499	while (fromIndex < toIndex) {
502		mgr->slaves[fromIndex] = mgr->slaves[fromIndex + 1];
	500	mgr->content[fromIndex] = mgr->content[fromIndex + 1];
503	501	++fromIndex;
504	502	}
505	503	/* ASSERT: fromIndex == toIndex */
506		mgr->slaves[fromIndex] = moved;
507
508		/* Schedule a relayout. In general, rearranging slaves
	504	mgr->content[fromIndex] = moved;
	505
	506	/* Schedule a relayout. In general, rearranging content
509	507	* may also change the size:
510	508	*/
511	509	ScheduleUpdate(mgr, MGR_RESIZE_REQUIRED);
512	510	}
513	511
514		/* ++ Ttk_Maintainable(interp, slave, master) --
515		* Utility routine. Verifies that 'master' may be used to maintain
516		* the geometry of 'slave' via Tk_MaintainGeometry:
517		*
518		* + 'master' is either 'slave's parent -OR-
519		* + 'master is a descendant of 'slave's parent.
520		* + 'slave' is not a toplevel window
521		* + 'slave' belongs to the same toplevel as 'master'
	512	/* ++ Ttk_Maintainable(interp, window, container) --
	513	* Utility routine. Verifies that 'container' may be used to maintain
	514	* the geometry of 'window' via Tk_MaintainGeometry:
	515	*
	516	* + 'container' is either 'window's parent -OR-
	517	* + 'container is a descendant of 'window's parent.
	518	* + 'window' is not a toplevel window
	519	* + 'window' belongs to the same toplevel as 'container'
522	520	*
523	521	* Returns: 1 if OK; otherwise 0, leaving an error message in 'interp'.
524	522	*/
525		int Ttk_Maintainable(Tcl_Interp *interp, Tk_Window slave, Tk_Window master)
526		{
527		Tk_Window ancestor = master, parent = Tk_Parent(slave);
528
529		if (Tk_IsTopLevel(slave) \|\| slave == master) {
	523	int Ttk_Maintainable(Tcl_Interp *interp, Tk_Window window, Tk_Window container)
	524	{
	525	Tk_Window ancestor = container, parent = Tk_Parent(window);
	526
	527	if (Tk_IsTopLevel(window) \|\| window == container) {
530	528	goto badWindow;
531	529	}
532	530

541	539
542	540	badWindow:
543	541	Tcl_SetObjResult(interp, Tcl_ObjPrintf("can't add %s as slave of %s",
544		Tk_PathName(slave), Tk_PathName(master)));
	542	Tk_PathName(window), Tk_PathName(container)));
545	543	Tcl_SetErrorCode(interp, "TTK", "GEOMETRY", "MAINTAINABLE", NULL);
546	544	return 0;
547	545	}

+44

-33

generic/ttk/ttkManager.h less more

13	13	/*
14	14	* Geometry manager specification record:
15	15	*
16		* RequestedSize computes the requested size of the master window.
	16	* RequestedSize computes the requested size of the container window.
17	17	*
18		* PlaceSlaves sets the position and size of all managed slaves
19		* by calling Ttk_PlaceSlave().
	18	* PlaceSlaves sets the position and size of all managed content windows
	19	* by calling Ttk_PlaceContent().
20	20	*
21		* SlaveRemoved() is called immediately before a slave is removed.
22		* NB: the associated slave window may have been destroyed when this
	21	* SlaveRemoved() is called immediately before a content window is removed.
	22	* NB: the associated content window may have been destroyed when this
23	23	* routine is called.
24		*
25		* SlaveRequest() is called when a slave requests a size change.
	24	*
	25	* SlaveRequest() is called when a content window requests a size change.
26	26	* It should return 1 if the request should propagate, 0 otherwise.
27	27	*/
28	28	typedef struct { /* Manager hooks */

30	30
31	31	int (RequestedSize)(void managerData, int widthPtr, int heightPtr);
32	32	void (PlaceSlaves)(void managerData);
33		int (SlaveRequest)(void managerData, int slaveIndex, int w, int h);
34		void (SlaveRemoved)(void managerData, int slaveIndex);
	33	int (SlaveRequest)(void managerData, int index, int w, int h);
	34	void (SlaveRemoved)(void managerData, int index);
35	35	} Ttk_ManagerSpec;
36	36
37	37	/*
38	38	* Default implementations for Tk_GeomMgr hooks:
39	39	*/
40		MODULE_SCOPE void Ttk_GeometryRequestProc(ClientData, Tk_Window slave);
41		MODULE_SCOPE void Ttk_LostSlaveProc(ClientData, Tk_Window slave);
	40	#define Ttk_LostContentProc Ttk_LostSlaveProc
	41	MODULE_SCOPE void Ttk_GeometryRequestProc(ClientData, Tk_Window window);
	42	MODULE_SCOPE void Ttk_LostContentProc(ClientData, Tk_Window window);
42	43
43	44	/*
44	45	* Public API:
45	46	*/
46	47	MODULE_SCOPE Ttk_Manager *Ttk_CreateManager(
47		Ttk_ManagerSpec , void managerData, Tk_Window masterWindow);
	48	Ttk_ManagerSpec , void managerData, Tk_Window window);
48	49	MODULE_SCOPE void Ttk_DeleteManager(Ttk_Manager *);
49	50
50		MODULE_SCOPE void Ttk_InsertSlave(
51		Ttk_Manager , int position, Tk_Window, void slaveData);
	51	#define Ttk_InsertContent Ttk_InsertSlave
	52	MODULE_SCOPE void Ttk_InsertContent(
	53	Ttk_Manager , int position, Tk_Window, void data);
52	54
53		MODULE_SCOPE void Ttk_ForgetSlave(Ttk_Manager *, int slaveIndex);
	55	#define Ttk_ForgetContent Ttk_ForgetSlave
	56	MODULE_SCOPE void Ttk_ForgetContent(Ttk_Manager *, int index);
54	57
55		MODULE_SCOPE void Ttk_ReorderSlave(Ttk_Manager *, int fromIndex, int toIndex);
56		/* Rearrange slave positions */
	58	#define Ttk_ReorderContent Ttk_ReorderSlave
	59	MODULE_SCOPE void Ttk_ReorderContent(Ttk_Manager *, int fromIndex, int toIndex);
	60	/* Rearrange content window positions */
57	61
58		MODULE_SCOPE void Ttk_PlaceSlave(
59		Ttk_Manager *, int slaveIndex, int x, int y, int width, int height);
60		/* Position and map the slave */
	62	#define Ttk_PlaceContent Ttk_PlaceSlave
	63	MODULE_SCOPE void Ttk_PlaceContent(
	64	Ttk_Manager *, int index, int x, int y, int width, int height);
	65	/* Position and map the content window */
61	66
62		MODULE_SCOPE void Ttk_UnmapSlave(Ttk_Manager *, int slaveIndex);
63		/* Unmap the slave */
	67	#define Ttk_UnmapContent Ttk_UnmapSlave
	68	MODULE_SCOPE void Ttk_UnmapContent(Ttk_Manager *, int index);
	69	/* Unmap the content window */
64	70
65	71	MODULE_SCOPE void Ttk_ManagerSizeChanged(Ttk_Manager *);
66	72	MODULE_SCOPE void Ttk_ManagerLayoutChanged(Ttk_Manager *);

68	74
69	75	/* Utilities:
70	76	*/
71		MODULE_SCOPE int Ttk_SlaveIndex(Ttk_Manager *, Tk_Window);
72		/* Returns: index in slave array of specified window, -1 if not found */
	77	#define Ttk_ContentIndex Ttk_SlaveIndex
	78	MODULE_SCOPE int Ttk_ContentIndex(Ttk_Manager *, Tk_Window);
	79	/* Returns: index in content array of specified window, -1 if not found */
73	80
74		MODULE_SCOPE int Ttk_GetSlaveIndexFromObj(
	81	#define Ttk_GetContentIndexFromObj Ttk_GetSlaveIndexFromObj
	82	MODULE_SCOPE int Ttk_GetContentIndexFromObj(
75	83	Tcl_Interp , Ttk_Manager , Tcl_Obj , int indexPtr);
76	84
77	85	/* Accessor functions:
78	86	*/
79		MODULE_SCOPE int Ttk_NumberSlaves(Ttk_Manager *);
80		/* Returns: number of managed slaves */
	87	#define Ttk_NumberContent Ttk_NumberSlaves
	88	MODULE_SCOPE int Ttk_NumberContent(Ttk_Manager *);
	89	/* Returns: number of managed content windows */
81	90
82		MODULE_SCOPE void Ttk_SlaveData(Ttk_Manager , int slaveIndex);
83		/* Returns: client data associated with slave */
	91	#define Ttk_ContentData Ttk_SlaveData
	92	MODULE_SCOPE void Ttk_ContentData(Ttk_Manager , int index);
	93	/* Returns: client data associated with content window */
84	94
85		MODULE_SCOPE Tk_Window Ttk_SlaveWindow(Ttk_Manager *, int slaveIndex);
86		/* Returns: slave window */
	95	#define Ttk_ContentWindow Ttk_SlaveWindow
	96	MODULE_SCOPE Tk_Window Ttk_ContentWindow(Ttk_Manager *, int index);
	97	/* Returns: content window */
87	98
88		MODULE_SCOPE int Ttk_Maintainable(Tcl_Interp *, Tk_Window slave, Tk_Window master);
89		/* Returns: 1 if master can manage slave; 0 otherwise leaving error msg */
	99	MODULE_SCOPE int Ttk_Maintainable(Tcl_Interp *, Tk_Window content, Tk_Window container);
	100	/* Returns: 1 if container can manage content; 0 otherwise leaving error msg */
90	101
91	102	#endif /* _TTKMANAGER */

+164

-162

generic/ttk/ttkNotebook.c less more

1	1	* Copyright (c) 2004, Joe English
2	2	*/
3	3
4		#include <string.h>
5		#include <ctype.h>
6		#include <stdio.h>
7		#include <tk.h>
	4	#include "tkInt.h"
8	5
9	6	#include "ttkTheme.h"
10	7	#include "ttkWidget.h"

56	53	* relevant to the tab.
57	54	*
58	55	* PaneOptionSpecs includes additional options for child window placement
59		* and is used to configure the slave.
	56	* and is used to configure the content window.
60	57	*/
61	58	static Tk_OptionSpec TabOptionSpecs[] =
62	59	{
63	60	{TK_OPTION_STRING_TABLE, "-state", "", "",
64	61	"normal", -1,Tk_Offset(Tab,state),
65		0,(ClientData)TabStateStrings,0 },
	62	0, (void *)TabStateStrings, 0 },
66	63	{TK_OPTION_STRING, "-text", "text", "Text", "",
67	64	Tk_Offset(Tab,textObj), -1, 0,0,GEOMETRY_CHANGED },
68	65	{TK_OPTION_STRING, "-image", "image", "Image", NULL/default/,
69	66	Tk_Offset(Tab,imageObj), -1, TK_OPTION_NULL_OK,0,GEOMETRY_CHANGED },
70	67	{TK_OPTION_STRING_TABLE, "-compound", "compound", "Compound",
71	68	NULL, Tk_Offset(Tab,compoundObj), -1,
72		TK_OPTION_NULL_OK,(ClientData)ttkCompoundStrings,GEOMETRY_CHANGED },
	69	TK_OPTION_NULL_OK, (void *)ttkCompoundStrings, GEOMETRY_CHANGED },
73	70	{TK_OPTION_INT, "-underline", "underline", "Underline", "-1",
74	71	Tk_Offset(Tab,underlineObj), -1, 0,0,GEOMETRY_CHANGED },
75	72	{TK_OPTION_END, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0 }

101	98	int activeIndex; /* index of currently active tab */
102	99	Ttk_Layout tabLayout; /* Sublayout for tabs */
103	100
104		Ttk_Box clientArea; /* Where to pack slave widgets */
	101	Ttk_Box clientArea; /* Where to pack content widgets */
105	102	} NotebookPart;
106	103
107	104	typedef struct

190	187	* +++ Tab management.
191	188	*/
192	189
193		static Tab CreateTab(Tcl_Interp interp, Notebook *nb, Tk_Window slaveWindow)
	190	static Tab CreateTab(Tcl_Interp interp, Notebook *nb, Tk_Window window)
194	191	{
195	192	Tk_OptionTable optionTable = nb->notebook.paneOptionTable;
196		void *record = ckalloc(sizeof(Tab));
	193	Tab record = (Tab )ckalloc(sizeof(Tab));
197	194	memset(record, 0, sizeof(Tab));
198	195
199		if (Tk_InitOptions(interp, record, optionTable, slaveWindow) != TCL_OK) {
	196	if (Tk_InitOptions(interp, (char *)record, optionTable, window) != TCL_OK) {
200	197	ckfree(record);
201	198	return NULL;
202	199	}

212	209	}
213	210
214	211	static int ConfigureTab(
215		Tcl_Interp interp, Notebook nb, Tab *tab, Tk_Window slaveWindow,
	212	Tcl_Interp interp, Notebook nb, Tab *tab, Tk_Window window,
216	213	int objc, Tcl_Obj *const objv[])
217	214	{
218	215	Ttk_Sticky sticky = tab->sticky;

220	217	Tk_SavedOptions savedOptions;
221	218	int mask = 0;
222	219
223		if (Tk_SetOptions(interp, (ClientData)tab, nb->notebook.paneOptionTable,
224		objc, objv, slaveWindow, &savedOptions, &mask) != TCL_OK)
	220	if (Tk_SetOptions(interp, (void *)tab, nb->notebook.paneOptionTable,
	221	objc, objv, window, &savedOptions, &mask) != TCL_OK)
225	222	{
226	223	return TCL_ERROR;
227	224	}

233	230	{
234	231	goto error;
235	232	}
236		if (Ttk_GetPaddingFromObj(interp, slaveWindow, tab->paddingObj, &padding)
	233	if (Ttk_GetPaddingFromObj(interp, window, tab->paddingObj, &padding)
237	234	!= TCL_OK)
238	235	{
239	236	goto error;

260	257	static int IdentifyTab(Notebook *nb, int x, int y)
261	258	{
262	259	int index;
263		for (index = 0; index < Ttk_NumberSlaves(nb->notebook.mgr); ++index) {
264		Tab *tab = Ttk_SlaveData(nb->notebook.mgr,index);
	260	for (index = 0; index < Ttk_NumberContent(nb->notebook.mgr); ++index) {
	261	Tab tab = (Tab )Ttk_ContentData(nb->notebook.mgr,index);
265	262	if ( tab->state != TAB_STATE_HIDDEN
266	263	&& Ttk_BoxContains(tab->parcel, x,y))
267	264	{

293	290	static Ttk_State TabState(Notebook *nb, int index)
294	291	{
295	292	Ttk_State state = nb->core.state;
296		Tab *tab = Ttk_SlaveData(nb->notebook.mgr, index);
	293	Tab itab = (Tab )Ttk_ContentData(nb->notebook.mgr, index);
297	294	int i = 0;
298	295
299	296	if (index == nb->notebook.currentIndex) {

305	302	if (index == nb->notebook.activeIndex) {
306	303	state \|= TTK_STATE_ACTIVE;
307	304	}
308		for (i = 0; i < Ttk_NumberSlaves(nb->notebook.mgr); ++i) {
309		Tab *tab = Ttk_SlaveData(nb->notebook.mgr, i);
	305	for (i = 0; i < Ttk_NumberContent(nb->notebook.mgr); ++i) {
	306	Tab tab = (Tab )Ttk_ContentData(nb->notebook.mgr, i);
310	307	if (tab->state == TAB_STATE_HIDDEN) {
311	308	continue;
312	309	}

315	312	}
316	313	break;
317	314	}
318		for (i = Ttk_NumberSlaves(nb->notebook.mgr) - 1; i >= 0; --i) {
319		Tab *tab = Ttk_SlaveData(nb->notebook.mgr, i);
	315	for (i = Ttk_NumberContent(nb->notebook.mgr) - 1; i != -1; --i) {
	316	Tab tab = (Tab )Ttk_ContentData(nb->notebook.mgr, i);
320	317	if (tab->state == TAB_STATE_HIDDEN) {
321	318	continue;
322	319	}

325	322	}
326	323	break;
327	324	}
328		if (tab->state == TAB_STATE_DISABLED) {
	325	if (itab->state == TAB_STATE_DISABLED) {
329	326	state \|= TTK_STATE_DISABLED;
330	327	}
331	328

356	353	int tabrowWidth = 0, tabrowHeight = 0;
357	354	int i;
358	355
359		for (i = 0; i < Ttk_NumberSlaves(nb->notebook.mgr); ++i) {
360		Tab *tab = Ttk_SlaveData(nb->notebook.mgr, i);
	356	for (i = 0; i < Ttk_NumberContent(nb->notebook.mgr); ++i) {
	357	Tab tab = (Tab )Ttk_ContentData(nb->notebook.mgr, i);
361	358	Ttk_State tabState = TabState(nb,i);
362	359
363	360	Ttk_RebindSublayout(tabLayout, tab);

381	378	*
382	379	* Total height is tab height + client area height + pane internal padding
383	380	* Total width is max(client width, tab width) + pane internal padding
384		* Client area size determined by max size of slaves,
	381	* Client area size determined by max size of content windows,
385	382	* overridden by -width and/or -height if nonzero.
386	383	*/
387	384
388	385	static int NotebookSize(void clientData, int widthPtr, int *heightPtr)
389	386	{
390		Notebook *nb = clientData;
	387	Notebook nb = (Notebook )clientData;
391	388	NotebookStyle nbstyle;
392	389	Ttk_Padding padding;
393	390	Ttk_Element clientNode = Ttk_FindElement(nb->core.layout, "client");

398	395
399	396	NotebookStyleOptions(nb, &nbstyle);
400	397
401		/* Compute max requested size of all slaves:
402		*/
403		for (i = 0; i < Ttk_NumberSlaves(nb->notebook.mgr); ++i) {
404		Tk_Window slaveWindow = Ttk_SlaveWindow(nb->notebook.mgr, i);
405		Tab *tab = Ttk_SlaveData(nb->notebook.mgr, i);
406		int slaveWidth
407		= Tk_ReqWidth(slaveWindow) + Ttk_PaddingWidth(tab->padding);
408		int slaveHeight
409		= Tk_ReqHeight(slaveWindow) + Ttk_PaddingHeight(tab->padding);
410
411		clientWidth = MAX(clientWidth, slaveWidth);
412		clientHeight = MAX(clientHeight, slaveHeight);
	398	/* Compute max requested size of all content windows:
	399	*/
	400	for (i = 0; i < Ttk_NumberContent(nb->notebook.mgr); ++i) {
	401	Tk_Window window = Ttk_ContentWindow(nb->notebook.mgr, i);
	402	Tab tab = (Tab )Ttk_ContentData(nb->notebook.mgr, i);
	403	int width
	404	= Tk_ReqWidth(window) + Ttk_PaddingWidth(tab->padding);
	405	int height
	406	= Tk_ReqHeight(window) + Ttk_PaddingHeight(tab->padding);
	407
	408	clientWidth = MAX(clientWidth, width);
	409	clientHeight = MAX(clientHeight, height);
413	410	}
414	411
415	412	/* Client width/height overridable by widget options:

464	461	static void SqueezeTabs(
465	462	Notebook *nb, int needed, int available)
466	463	{
467		int nTabs = Ttk_NumberSlaves(nb->notebook.mgr);
	464	int nTabs = Ttk_NumberContent(nb->notebook.mgr);
468	465
469	466	if (nTabs > 0) {
470	467	int difference = available - needed;

473	470	int i;
474	471
475	472	for (i = 0; i < nTabs; ++i) {
476		Tab *tab = Ttk_SlaveData(nb->notebook.mgr,i);
	473	Tab tab = (Tab )Ttk_ContentData(nb->notebook.mgr,i);
477	474	double ad = slack + tab->width * delta;
478	475	tab->width += (int)ad;
479	476	slack = ad - (int)ad;

488	485	Notebook *nb, Ttk_Box tabrowBox, Ttk_PositionSpec tabPlacement)
489	486	{
490	487	Ttk_Layout tabLayout = nb->notebook.tabLayout;
491		int nTabs = Ttk_NumberSlaves(nb->notebook.mgr);
	488	int nTabs = Ttk_NumberContent(nb->notebook.mgr);
492	489	int i;
493	490
494	491	for (i = 0; i < nTabs; ++i) {
495		Tab *tab = Ttk_SlaveData(nb->notebook.mgr, i);
	492	Tab tab = (Tab )Ttk_ContentData(nb->notebook.mgr, i);
496	493	Ttk_State tabState = TabState(nb, i);
497	494
498	495	if (tab->state != TAB_STATE_HIDDEN) {

516	513	* Computes notebook layout and places tabs.
517	514	*
518	515	* Side effects:
519		* Sets clientArea, used to place slave panes.
	516	* Sets clientArea, used to place panes.
520	517	*/
521	518	static void NotebookDoLayout(void *recordPtr)
522	519	{
523		Notebook *nb = recordPtr;
	520	Notebook nb = (Notebook )recordPtr;
524	521	Tk_Window nbwin = nb->core.tkwin;
525	522	Ttk_Box cavity = Ttk_WinBox(nbwin);
526	523	int tabrowWidth = 0, tabrowHeight = 0;

570	567	}
571	568
572	569	/*
573		* NotebookPlaceSlave --
	570	* NotebookPlaceContent --
574	571	* Set the position and size of a child widget
575		* based on the current client area and slave options:
576		*/
577		static void NotebookPlaceSlave(Notebook *nb, int slaveIndex)
578		{
579		Tab *tab = Ttk_SlaveData(nb->notebook.mgr, slaveIndex);
580		Tk_Window slaveWindow = Ttk_SlaveWindow(nb->notebook.mgr, slaveIndex);
581		Ttk_Box slaveBox =
	572	* based on the current client area and content window options:
	573	*/
	574	static void NotebookPlaceContent(Notebook *nb, int index)
	575	{
	576	Tab tab = (Tab )Ttk_ContentData(nb->notebook.mgr, index);
	577	Tk_Window window = Ttk_ContentWindow(nb->notebook.mgr, index);
	578	Ttk_Box box =
582	579	Ttk_StickBox(Ttk_PadBox(nb->notebook.clientArea, tab->padding),
583		Tk_ReqWidth(slaveWindow), Tk_ReqHeight(slaveWindow),tab->sticky);
584
585		Ttk_PlaceSlave(nb->notebook.mgr, slaveIndex,
586		slaveBox.x, slaveBox.y, slaveBox.width, slaveBox.height);
587		}
588
589		/* NotebookPlaceSlaves --
	580	Tk_ReqWidth(window), Tk_ReqHeight(window),tab->sticky);
	581
	582	Ttk_PlaceContent(nb->notebook.mgr, index,
	583	box.x, box.y, box.width, box.height);
	584	}
	585
	586	/* NotebookPlaceContents --
590	587	* Geometry manager hook.
591	588	*/
592		static void NotebookPlaceSlaves(void *recordPtr)
593		{
594		Notebook *nb = recordPtr;
	589	static void NotebookPlaceContents(void *recordPtr)
	590	{
	591	Notebook nb = (Notebook )recordPtr;
595	592	int currentIndex = nb->notebook.currentIndex;
596	593	if (currentIndex >= 0) {
597	594	NotebookDoLayout(nb);
598		NotebookPlaceSlave(nb, currentIndex);
	595	NotebookPlaceContent(nb, currentIndex);
599	596	}
600	597	}
601	598

605	602	*/
606	603	static void SelectTab(Notebook *nb, int index)
607	604	{
608		Tab *tab = Ttk_SlaveData(nb->notebook.mgr,index);
	605	Tab tab = (Tab )Ttk_ContentData(nb->notebook.mgr, index);
609	606	int currentIndex = nb->notebook.currentIndex;
610	607
611	608	if (index == currentIndex) {

623	620	}
624	621
625	622	if (currentIndex >= 0) {
626		Ttk_UnmapSlave(nb->notebook.mgr, currentIndex);
627		}
628
629		/* Must be set before calling NotebookPlaceSlave(), otherwise it may
630		* happen that NotebookPlaceSlaves(), triggered by an interveaning
	623	Ttk_UnmapContent(nb->notebook.mgr, currentIndex);
	624	}
	625
	626	/* Must be set before calling NotebookPlaceContent(), otherwise it may
	627	* happen that NotebookPlaceContents(), triggered by an interveaning
631	628	* geometry request, will swap to old index. */
632	629	nb->notebook.currentIndex = index;
633	630
634		NotebookPlaceSlave(nb, index);
	631	NotebookPlaceContent(nb, index);
635	632	TtkRedisplayWidget(&nb->core);
636	633
637	634	TtkSendVirtualEvent(nb->core.tkwin, "NotebookTabChanged");

644	641	*/
645	642	static int NextTab(Notebook *nb, int index)
646	643	{
647		int nTabs = Ttk_NumberSlaves(nb->notebook.mgr);
	644	int nTabs = Ttk_NumberContent(nb->notebook.mgr);
648	645	int nextIndex;
649	646
650	647	/* Scan forward for following usable tab:
651	648	*/
652	649	for (nextIndex = index + 1; nextIndex < nTabs; ++nextIndex) {
653		Tab *tab = Ttk_SlaveData(nb->notebook.mgr, nextIndex);
	650	Tab tab = (Tab )Ttk_ContentData(nb->notebook.mgr, nextIndex);
654	651	if (tab->state == TAB_STATE_NORMAL) {
655	652	return nextIndex;
656	653	}

659	656	/* Not found -- scan backwards.
660	657	*/
661	658	for (nextIndex = index - 1; nextIndex >= 0; --nextIndex) {
662		Tab *tab = Ttk_SlaveData(nb->notebook.mgr, nextIndex);
	659	Tab tab = (Tab )Ttk_ContentData(nb->notebook.mgr, nextIndex);
663	660	if (tab->state == TAB_STATE_NORMAL) {
664	661	return nextIndex;
665	662	}

683	680	int nextIndex = NextTab(nb, currentIndex);
684	681
685	682	if (currentIndex >= 0) {
686		Ttk_UnmapSlave(nb->notebook.mgr, currentIndex);
	683	Ttk_UnmapContent(nb->notebook.mgr, currentIndex);
687	684	}
688	685	if (currentIndex != nextIndex) {
689	686	TtkSendVirtualEvent(nb->core.tkwin, "NotebookTabChanged");

694	691	TtkRedisplayWidget(&nb->core);
695	692	}
696	693
697		/* TabRemoved -- GM SlaveRemoved hook.
	694	/* TabRemoved -- GM TabRemoved hook.
698	695	* Select the next tab if the current one is being removed.
699		* Adjust currentIndex to account for removed slave.
	696	* Adjust currentIndex to account for removed content window.
700	697	*/
701	698	static void TabRemoved(void *managerData, int index)
702	699	{
703		Notebook *nb = managerData;
704		Tab *tab = Ttk_SlaveData(nb->notebook.mgr, index);
	700	Notebook nb = (Notebook )managerData;
	701	Tab tab = (Tab )Ttk_ContentData(nb->notebook.mgr, index);
705	702
706	703	if (index == nb->notebook.currentIndex) {
707	704	SelectNearestTab(nb);

716	713	TtkRedisplayWidget(&nb->core);
717	714	}
718	715
719		static int TabRequest(void *managerData, int index, int width, int height)
	716	static int TabRequest(
	717	TCL_UNUSED(void *),
	718	TCL_UNUSED(int),
	719	TCL_UNUSED(int),
	720	TCL_UNUSED(int))
720	721	{
721	722	return 1;
722	723	}

726	727	*/
727	728	static int AddTab(
728	729	Tcl_Interp interp, Notebook nb,
729		int destIndex, Tk_Window slaveWindow,
	730	int destIndex, Tk_Window window,
730	731	int objc, Tcl_Obj *const objv[])
731	732	{
732	733	Tab *tab;
733		if (!Ttk_Maintainable(interp, slaveWindow, nb->core.tkwin)) {
	734	if (!Ttk_Maintainable(interp, window, nb->core.tkwin)) {
734	735	return TCL_ERROR;
735	736	}
736	737	#if 0 /* can't happen */
737		if (Ttk_SlaveIndex(nb->notebook.mgr, slaveWindow) >= 0) {
	738	if (Ttk_ContentIndex(nb->notebook.mgr, window) >= 0) {
738	739	Tcl_SetObjResult(interp, Tcl_ObjPrintf("%s already added",
739		Tk_PathName(slaveWindow)));
	740	Tk_PathName(window)));
740	741	Tcl_SetErrorCode(interp, "TTK", "NOTEBOOK", "PRESENT", NULL);
741	742	return TCL_ERROR;
742	743	}

744	745
745	746	/* Create and insert tab.
746	747	*/
747		tab = CreateTab(interp, nb, slaveWindow);
	748	tab = CreateTab(interp, nb, window);
748	749	if (!tab) {
749	750	return TCL_ERROR;
750	751	}
751		if (ConfigureTab(interp, nb, tab, slaveWindow, objc, objv) != TCL_OK) {
	752	if (ConfigureTab(interp, nb, tab, window, objc, objv) != TCL_OK) {
752	753	DestroyTab(nb, tab);
753	754	return TCL_ERROR;
754	755	}
755	756
756		Ttk_InsertSlave(nb->notebook.mgr, destIndex, slaveWindow, tab);
	757	Ttk_InsertContent(nb->notebook.mgr, destIndex, window, tab);
757	758
758	759	/* Adjust indices and/or autoselect first tab:
759	760	*/

767	768	}
768	769
769	770	static Ttk_ManagerSpec NotebookManagerSpec = {
770		{ "notebook", Ttk_GeometryRequestProc, Ttk_LostSlaveProc },
	771	{ "notebook", Ttk_GeometryRequestProc, Ttk_LostContentProc },
771	772	NotebookSize,
772		NotebookPlaceSlaves,
	773	NotebookPlaceContents,
773	774	TabRequest,
774	775	TabRemoved
775	776	};

788	789	;
789	790	static void NotebookEventHandler(ClientData clientData, XEvent *eventPtr)
790	791	{
791		Notebook *nb = clientData;
	792	Notebook nb = (Notebook )clientData;
792	793
793	794	if (eventPtr->type == DestroyNotify) { /* Remove self */
794	795	Tk_DeleteEventHandler(nb->core.tkwin,

812	813	* + positional specifications @x,y,
813	814	* + "current",
814	815	* + numeric indices [0..nTabs],
815		* + slave window names
	816	* + content window names
816	817	*
817	818	* Stores index of specified tab in *index_rtn, -1 if not found.
818	819	*

843	844	return TCL_OK;
844	845	}
845	846
846		/* ... or integer index or slave window name:
847		*/
848		if (Ttk_GetSlaveIndexFromObj(
	847	/* ... or integer index or content window name:
	848	*/
	849	if (Ttk_GetContentIndexFromObj(
849	850	interp, nb->notebook.mgr, objPtr, index_rtn) == TCL_OK)
850	851	{
851	852	return TCL_OK;
852	853	}
853	854
854		/* Nothing matched; Ttk_GetSlaveIndexFromObj will have left error message.
	855	/* Nothing matched; Ttk_GetContentIndexFromObj will have left error message.
855	856	*/
856	857	return TCL_ERROR;
857	858	}

884	885	static int NotebookAddCommand(
885	886	void recordPtr, Tcl_Interp interp, int objc, Tcl_Obj *const objv[])
886	887	{
887		Notebook *nb = recordPtr;
888		int index = Ttk_NumberSlaves(nb->notebook.mgr);
889		Tk_Window slaveWindow;
890		int slaveIndex;
	888	Notebook nb = (Notebook )recordPtr;
	889	Tk_Window window;
	890	int index;
891	891	Tab *tab;
892	892
893	893	if (objc <= 2 \|\| objc % 2 != 1) {

895	895	return TCL_ERROR;
896	896	}
897	897
898		slaveWindow = Tk_NameToWindow(interp,Tcl_GetString(objv[2]),nb->core.tkwin);
899		if (!slaveWindow) {
900		return TCL_ERROR;
901		}
902		slaveIndex = Ttk_SlaveIndex(nb->notebook.mgr, slaveWindow);
903
904		if (slaveIndex < 0) { /* New tab */
905		return AddTab(interp, nb, index, slaveWindow, objc-3,objv+3);
906		}
907
908		tab = Ttk_SlaveData(nb->notebook.mgr, slaveIndex);
	898	window = Tk_NameToWindow(interp,Tcl_GetString(objv[2]),nb->core.tkwin);
	899	if (!window) {
	900	return TCL_ERROR;
	901	}
	902	index = Ttk_ContentIndex(nb->notebook.mgr, window);
	903
	904	if (index < 0) { /* New tab */
	905	return AddTab(interp, nb, Ttk_NumberContent(nb->notebook.mgr), window, objc-3,objv+3);
	906	}
	907
	908	tab = (Tab *)Ttk_ContentData(nb->notebook.mgr, index);
909	909	if (tab->state == TAB_STATE_HIDDEN) {
910	910	tab->state = TAB_STATE_NORMAL;
911	911	}
912		if (ConfigureTab(interp, nb, tab, slaveWindow, objc-3,objv+3) != TCL_OK) {
	912	if (ConfigureTab(interp, nb, tab, window, objc-3,objv+3) != TCL_OK) {
913	913	return TCL_ERROR;
914	914	}
915	915

924	924	static int NotebookInsertCommand(
925	925	void recordPtr, Tcl_Interp interp, int objc, Tcl_Obj *const objv[])
926	926	{
927		Notebook *nb = recordPtr;
	927	Notebook nb = (Notebook )recordPtr;
928	928	int current = nb->notebook.currentIndex;
929		int nSlaves = Ttk_NumberSlaves(nb->notebook.mgr);
	929	int nContent = Ttk_NumberContent(nb->notebook.mgr);
930	930	int srcIndex, destIndex;
931	931
932	932	if (objc < 4) {

935	935	}
936	936
937	937	if (!strcmp(Tcl_GetString(objv[2]), "end")) {
938		destIndex = Ttk_NumberSlaves(nb->notebook.mgr);
939		} else if (TCL_OK != Ttk_GetSlaveIndexFromObj(
	938	destIndex = Ttk_NumberContent(nb->notebook.mgr);
	939	} else if (TCL_OK != Ttk_GetContentIndexFromObj(
940	940	interp, nb->notebook.mgr, objv[2], &destIndex)) {
941	941	return TCL_ERROR;
942	942	}
943	943
944	944	if (Tcl_GetString(objv[3])[0] == '.') {
945		/* Window name -- could be new or existing slave.
	945	/* Window name -- could be new or existing content window.
946	946	*/
947		Tk_Window slaveWindow =
	947	Tk_Window window =
948	948	Tk_NameToWindow(interp,Tcl_GetString(objv[3]),nb->core.tkwin);
949	949
950		if (!slaveWindow) {
	950	if (!window) {
951	951	return TCL_ERROR;
952	952	}
953	953
954		srcIndex = Ttk_SlaveIndex(nb->notebook.mgr, slaveWindow);
955		if (srcIndex < 0) { /* New slave */
956		return AddTab(interp, nb, destIndex, slaveWindow, objc-4,objv+4);
957		}
958		} else if (Ttk_GetSlaveIndexFromObj(
	954	srcIndex = Ttk_ContentIndex(nb->notebook.mgr, window);
	955	if (srcIndex < 0) { /* New content window */
	956	return AddTab(interp, nb, destIndex, window, objc-4,objv+4);
	957	}
	958	} else if (Ttk_GetContentIndexFromObj(
959	959	interp, nb->notebook.mgr, objv[3], &srcIndex) != TCL_OK)
960	960	{
961	961	return TCL_ERROR;
962	962	}
963	963
964		/* Move existing slave:
	964	/* Move existing content window:
965	965	*/
966	966	if (ConfigureTab(interp, nb,
967		Ttk_SlaveData(nb->notebook.mgr,srcIndex),
968		Ttk_SlaveWindow(nb->notebook.mgr,srcIndex),
	967	(Tab *)Ttk_ContentData(nb->notebook.mgr, srcIndex),
	968	Ttk_ContentWindow(nb->notebook.mgr, srcIndex),
969	969	objc-4,objv+4) != TCL_OK)
970	970	{
971	971	return TCL_ERROR;
972	972	}
973	973
974		if (destIndex >= nSlaves) {
975		destIndex = nSlaves - 1;
976		}
977		Ttk_ReorderSlave(nb->notebook.mgr, srcIndex, destIndex);
	974	if (destIndex >= nContent) {
	975	destIndex = nContent - 1;
	976	}
	977	Ttk_ReorderContent(nb->notebook.mgr, srcIndex, destIndex);
978	978
979	979	/* Adjust internal indexes:
980	980	*/

998	998	static int NotebookForgetCommand(
999	999	void recordPtr, Tcl_Interp interp, int objc, Tcl_Obj *const objv[])
1000	1000	{
1001		Notebook *nb = recordPtr;
	1001	Notebook nb = (Notebook )recordPtr;
1002	1002	int index;
1003	1003
1004	1004	if (objc != 3) {

1010	1010	return TCL_ERROR;
1011	1011	}
1012	1012
1013		Ttk_ForgetSlave(nb->notebook.mgr, index);
	1013	Ttk_ForgetContent(nb->notebook.mgr, index);
1014	1014	TtkRedisplayWidget(&nb->core);
1015	1015
1016	1016	return TCL_OK;

1022	1022	static int NotebookHideCommand(
1023	1023	void recordPtr, Tcl_Interp interp, int objc, Tcl_Obj *const objv[])
1024	1024	{
1025		Notebook *nb = recordPtr;
	1025	Notebook nb = (Notebook )recordPtr;
1026	1026	int index;
1027	1027	Tab *tab;
1028	1028

1035	1035	return TCL_ERROR;
1036	1036	}
1037	1037
1038		tab = Ttk_SlaveData(nb->notebook.mgr, index);
	1038	tab = (Tab *)Ttk_ContentData(nb->notebook.mgr, index);
1039	1039	tab->state = TAB_STATE_HIDDEN;
1040	1040	if (index == nb->notebook.currentIndex) {
1041	1041	SelectNearestTab(nb);

1055	1055	static const char *whatTable[] = { "element", "tab", NULL };
1056	1056	enum { IDENTIFY_ELEMENT, IDENTIFY_TAB };
1057	1057	int what = IDENTIFY_ELEMENT;
1058		Notebook *nb = recordPtr;
	1058	Notebook nb = (Notebook )recordPtr;
1059	1059	Ttk_Element element = NULL;
1060		int x, y, tabIndex;
	1060	int x, y;
	1061	int tabIndex;
1061	1062
1062	1063	if (objc < 4 \|\| objc > 5) {
1063	1064	Tcl_WrongNumArgs(interp, 2,objv, "?what? x y");
1064	1065	return TCL_ERROR;
1065	1066	}
1066	1067
1067		if ( Tcl_GetIntFromObj(interp, objv[objc-2], &x) != TCL_OK
	1068	if (Tcl_GetIntFromObj(interp, objv[objc-2], &x) != TCL_OK
1068	1069	\|\| Tcl_GetIntFromObj(interp, objv[objc-1], &y) != TCL_OK
1069	1070	\|\| (objc == 5 && Tcl_GetIndexFromObjStruct(interp, objv[2], whatTable,
1070	1071	sizeof(char *), "option", 0, &what) != TCL_OK)

1074	1075
1075	1076	tabIndex = IdentifyTab(nb, x, y);
1076	1077	if (tabIndex >= 0) {
1077		Tab *tab = Ttk_SlaveData(nb->notebook.mgr, tabIndex);
	1078	Tab tab = (Tab )Ttk_ContentData(nb->notebook.mgr, tabIndex);
1078	1079	Ttk_State state = TabState(nb, tabIndex);
1079	1080	Ttk_Layout tabLayout = nb->notebook.tabLayout;
1080	1081

1109	1110	static int NotebookIndexCommand(
1110	1111	void recordPtr, Tcl_Interp interp, int objc, Tcl_Obj *const objv[])
1111	1112	{
1112		Notebook *nb = recordPtr;
1113		int index, status;
	1113	Notebook nb = (Notebook )recordPtr;
	1114	int index;
	1115	int status;
1114	1116
1115	1117	if (objc != 3) {
1116	1118	Tcl_WrongNumArgs(interp, 2, objv, "tab");

1121	1123	* Special-case for "end":
1122	1124	*/
1123	1125	if (!strcmp("end", Tcl_GetString(objv[2]))) {
1124		int nSlaves = Ttk_NumberSlaves(nb->notebook.mgr);
1125		Tcl_SetObjResult(interp, Tcl_NewIntObj(nSlaves));
	1126	int nContent = Ttk_NumberContent(nb->notebook.mgr);
	1127	Tcl_SetObjResult(interp, Tcl_NewIntObj(nContent));
1126	1128	return TCL_OK;
1127	1129	}
1128	1130

1141	1143	static int NotebookSelectCommand(
1142	1144	void recordPtr, Tcl_Interp interp, int objc, Tcl_Obj *const objv[])
1143	1145	{
1144		Notebook *nb = recordPtr;
	1146	Notebook nb = (Notebook )recordPtr;
1145	1147
1146	1148	if (objc == 2) {
1147	1149	if (nb->notebook.currentIndex >= 0) {
1148		Tk_Window pane = Ttk_SlaveWindow(
	1150	Tk_Window pane = Ttk_ContentWindow(
1149	1151	nb->notebook.mgr, nb->notebook.currentIndex);
1150	1152	Tcl_SetObjResult(interp, Tcl_NewStringObj(Tk_PathName(pane), -1));
1151	1153	}

1167	1169	static int NotebookTabsCommand(
1168	1170	void recordPtr, Tcl_Interp interp, int objc, Tcl_Obj *const objv[])
1169	1171	{
1170		Notebook *nb = recordPtr;
	1172	Notebook nb = (Notebook )recordPtr;
1171	1173	Ttk_Manager *mgr = nb->notebook.mgr;
1172	1174	Tcl_Obj *result;
1173	1175	int i;

1178	1180	}
1179	1181
1180	1182	result = Tcl_NewListObj(0, NULL);
1181		for (i = 0; i < Ttk_NumberSlaves(mgr); ++i) {
1182		const char *pathName = Tk_PathName(Ttk_SlaveWindow(mgr,i));
	1183	for (i = 0; i < Ttk_NumberContent(mgr); ++i) {
	1184	const char *pathName = Tk_PathName(Ttk_ContentWindow(mgr,i));
1183	1185
1184	1186	Tcl_ListObjAppendElement(NULL, result, Tcl_NewStringObj(pathName,-1));
1185	1187	}

1192	1194	static int NotebookTabCommand(
1193	1195	void recordPtr, Tcl_Interp interp, int objc, Tcl_Obj *const objv[])
1194	1196	{
1195		Notebook *nb = recordPtr;
	1197	Notebook nb = (Notebook )recordPtr;
1196	1198	Ttk_Manager *mgr = nb->notebook.mgr;
1197	1199	int index;
1198		Tk_Window slaveWindow;
	1200	Tk_Window window;
1199	1201	Tab *tab;
1200	1202
1201	1203	if (objc < 3) {

1207	1209	return TCL_ERROR;
1208	1210	}
1209	1211
1210		tab = Ttk_SlaveData(mgr, index);
1211		slaveWindow = Ttk_SlaveWindow(mgr, index);
	1212	tab = (Tab *)Ttk_ContentData(mgr, index);
	1213	window = Ttk_ContentWindow(mgr, index);
1212	1214
1213	1215	if (objc == 3) {
1214	1216	return TtkEnumerateOptions(interp, tab,
1215		PaneOptionSpecs, nb->notebook.paneOptionTable, slaveWindow);
	1217	PaneOptionSpecs, nb->notebook.paneOptionTable, window);
1216	1218	} else if (objc == 4) {
1217	1219	return TtkGetOptionValue(interp, tab, objv[3],
1218		nb->notebook.paneOptionTable, slaveWindow);
	1220	nb->notebook.paneOptionTable, window);
1219	1221	} /* else */
1220	1222
1221		if (ConfigureTab(interp, nb, tab, slaveWindow, objc-3,objv+3) != TCL_OK) {
	1223	if (ConfigureTab(interp, nb, tab, window, objc-3,objv+3) != TCL_OK) {
1222	1224	return TCL_ERROR;
1223	1225	}
1224	1226

1257	1259
1258	1260	static void NotebookInitialize(Tcl_Interp interp, void recordPtr)
1259	1261	{
1260		Notebook *nb = recordPtr;
	1262	Notebook nb = (Notebook )recordPtr;
1261	1263
1262	1264	nb->notebook.mgr = Ttk_CreateManager(
1263	1265	&NotebookManagerSpec, recordPtr, nb->core.tkwin);

1277	1279
1278	1280	static void NotebookCleanup(void *recordPtr)
1279	1281	{
1280		Notebook *nb = recordPtr;
	1282	Notebook nb = (Notebook )recordPtr;
1281	1283
1282	1284	Ttk_DeleteManager(nb->notebook.mgr);
1283	1285	if (nb->notebook.tabLayout)

1286	1288
1287	1289	static int NotebookConfigure(Tcl_Interp interp, void clientData, int mask)
1288	1290	{
1289		Notebook *nb = clientData;
	1291	Notebook nb = (Notebook )clientData;
1290	1292
1291	1293	/*
1292	1294	* Error-checks:

1310	1312	static Ttk_Layout NotebookGetLayout(
1311	1313	Tcl_Interp interp, Ttk_Theme theme, void recordPtr)
1312	1314	{
1313		Notebook *nb = recordPtr;
	1315	Notebook nb = (Notebook )recordPtr;
1314	1316	Ttk_Layout notebookLayout = TtkWidgetGetLayout(interp, theme, recordPtr);
1315	1317	Ttk_Layout tabLayout;
1316	1318

1338	1340	static void DisplayTab(Notebook *nb, int index, Drawable d)
1339	1341	{
1340	1342	Ttk_Layout tabLayout = nb->notebook.tabLayout;
1341		Tab *tab = Ttk_SlaveData(nb->notebook.mgr, index);
	1343	Tab tab = (Tab )Ttk_ContentData(nb->notebook.mgr, index);
1342	1344	Ttk_State state = TabState(nb, index);
1343	1345
1344	1346	if (tab->state != TAB_STATE_HIDDEN) {

1350	1352
1351	1353	static void NotebookDisplay(void *clientData, Drawable d)
1352	1354	{
1353		Notebook *nb = clientData;
1354		int nSlaves = Ttk_NumberSlaves(nb->notebook.mgr);
	1355	Notebook nb = (Notebook )clientData;
	1356	int nContent = Ttk_NumberContent(nb->notebook.mgr);
1355	1357	int index;
1356	1358
1357	1359	/* Draw notebook background (base layout):

1361	1363	/* Draw tabs from left to right, but draw the current tab last
1362	1364	* so it will overwrite its neighbors.
1363	1365	*/
1364		for (index = 0; index < nSlaves; ++index) {
	1366	for (index = 0; index < nContent; ++index) {
1365	1367	if (index != nb->notebook.currentIndex) {
1366	1368	DisplayTab(nb, index, d);
1367	1369	}

+136

-129

generic/ttk/ttkPanedwindow.c less more

5	5	* TODO: track active/pressed sash.
6	6	*/
7	7
8		#include <string.h>
9		#include <tk.h>
	8	#include "tkInt.h"
10	9	#include "ttkManager.h"
11	10	#include "ttkTheme.h"
12	11	#include "ttkWidget.h"

28	27	* gives the same result as changing the size by X+Y pixels
29	28	* in one step).
30	29	*
31		* The request size is initially set to the slave window's requested size.
	30	* The request size is initially set to the content window's requested size.
32	31	* When the user drags a sash, each pane's request size is set to its
33	32	* actual size. This ensures that panes "stay put" on the next resize.
34	33	*

77	76	static Tk_OptionSpec PanedOptionSpecs[] = {
78	77	{TK_OPTION_STRING_TABLE, "-orient", "orient", "Orient", "vertical",
79	78	Tk_Offset(Paned,paned.orientObj), Tk_Offset(Paned,paned.orient),
80		0,(ClientData)ttkOrientStrings,READONLY_OPTION\|STYLE_CHANGED },
	79	0, (void *)ttkOrientStrings, READONLY_OPTION\|STYLE_CHANGED },
81	80	{TK_OPTION_INT, "-width", "width", "Width", "0",
82	81	-1,Tk_Offset(Paned,paned.width),
83		0,0,GEOMETRY_CHANGED },
	82	0, 0, GEOMETRY_CHANGED },
84	83	{TK_OPTION_INT, "-height", "height", "Height", "0",
85	84	-1,Tk_Offset(Paned,paned.height),
86		0,0,GEOMETRY_CHANGED },
	85	0, 0, GEOMETRY_CHANGED },
87	86
88	87	WIDGET_TAKEFOCUS_FALSE,
89	88	WIDGET_INHERIT_OPTIONS(ttkCoreOptionSpecs)
90	89	};
91	90
92	91	/*------------------------------------------------------------------------
93		* +++ Slave pane record.
	92	* +++ Pane record.
94	93	*/
95	94	typedef struct {
96	95	int reqSize; /* Pane request size */

107	106	/* CreatePane --
108	107	* Create a new pane record.
109	108	*/
110		static Pane CreatePane(Tcl_Interp interp, Paned *pw, Tk_Window slaveWindow)
	109	static Pane CreatePane(Tcl_Interp interp, Paned *pw, Tk_Window window)
111	110	{
112	111	Tk_OptionTable optionTable = pw->paned.paneOptionTable;
113	112	void *record = ckalloc(sizeof(Pane));
114		Pane *pane = record;
	113	Pane pane = (Pane )record;
115	114
116	115	memset(record, 0, sizeof(Pane));
117		if (Tk_InitOptions(interp, record, optionTable, slaveWindow) != TCL_OK) {
	116	if (Tk_InitOptions(interp, record, optionTable, window) != TCL_OK) {
118	117	ckfree(record);
119	118	return NULL;
120	119	}
121	120
122	121	pane->reqSize
123	122	= pw->paned.orient == TTK_ORIENT_HORIZONTAL
124		? Tk_ReqWidth(slaveWindow) : Tk_ReqHeight(slaveWindow);
	123	? Tk_ReqWidth(window) : Tk_ReqHeight(window);
125	124
126	125	return pane;
127	126	}

140	139	* Set pane options.
141	140	*/
142	141	static int ConfigurePane(
143		Tcl_Interp interp, Paned pw, Pane *pane, Tk_Window slaveWindow,
	142	Tcl_Interp interp, Paned pw, Pane *pane, Tk_Window window,
144	143	int objc, Tcl_Obj *const objv[])
145	144	{
146	145	Ttk_Manager *mgr = pw->paned.mgr;

148	147	int mask = 0;
149	148
150	149	if (Tk_SetOptions(interp, (void*)pane, pw->paned.paneOptionTable,
151		objc, objv, slaveWindow, &savedOptions, &mask) != TCL_OK)
	150	objc, objv, window, &savedOptions, &mask) != TCL_OK)
152	151	{
153	152	return TCL_ERROR;
154	153	}

188	187
189	188	static int ShoveUp(Paned *pw, int i, int pos)
190	189	{
191		Pane *pane = Ttk_SlaveData(pw->paned.mgr, i);
	190	Pane pane = (Pane )Ttk_ContentData(pw->paned.mgr, i);
192	191	int sashThickness = pw->paned.sashThickness;
193	192
194	193	if (i == 0) {
195	194	if (pos < 0)
196	195	pos = 0;
197	196	} else {
198		Pane *prevPane = Ttk_SlaveData(pw->paned.mgr, i-1);
	197	Pane prevPane = (Pane )Ttk_ContentData(pw->paned.mgr, i-1);
199	198	if (pos < prevPane->sashPos + sashThickness)
200	199	pos = ShoveUp(pw, i-1, pos - sashThickness) + sashThickness;
201	200	}

208	207	*/
209	208	static int ShoveDown(Paned *pw, int i, int pos)
210	209	{
211		Pane *pane = Ttk_SlaveData(pw->paned.mgr,i);
	210	Pane pane = (Pane )Ttk_ContentData(pw->paned.mgr,i);
212	211	int sashThickness = pw->paned.sashThickness;
213	212
214		if (i == Ttk_NumberSlaves(pw->paned.mgr) - 1) {
215		pos = pane->sashPos; /* Sentinel value == master window size */
	213	if (i == Ttk_NumberContent(pw->paned.mgr) - 1) {
	214	pos = pane->sashPos; /* Sentinel value == container window size */
216	215	} else {
217		Pane *nextPane = Ttk_SlaveData(pw->paned.mgr,i+1);
	216	Pane nextPane = (Pane )Ttk_ContentData(pw->paned.mgr,i+1);
218	217	if (pos + sashThickness > nextPane->sashPos)
219	218	pos = ShoveDown(pw, i+1, pos + sashThickness) - sashThickness;
220	219	}

229	228	*/
230	229	static int PanedSize(void recordPtr, int widthPtr, int *heightPtr)
231	230	{
232		Paned *pw = recordPtr;
233		int nPanes = Ttk_NumberSlaves(pw->paned.mgr);
	231	Paned pw = (Paned )recordPtr;
	232	int nPanes = Ttk_NumberContent(pw->paned.mgr);
234	233	int nSashes = nPanes - 1;
235	234	int sashThickness = pw->paned.sashThickness;
236	235	int width = 0, height = 0;

238	237
239	238	if (pw->paned.orient == TTK_ORIENT_HORIZONTAL) {
240	239	for (index = 0; index < nPanes; ++index) {
241		Pane *pane = Ttk_SlaveData(pw->paned.mgr, index);
242		Tk_Window slaveWindow = Ttk_SlaveWindow(pw->paned.mgr, index);
243
244		if (height < Tk_ReqHeight(slaveWindow))
245		height = Tk_ReqHeight(slaveWindow);
	240	Pane pane = (Pane )Ttk_ContentData(pw->paned.mgr, index);
	241	Tk_Window window = Ttk_ContentWindow(pw->paned.mgr, index);
	242
	243	if (height < Tk_ReqHeight(window))
	244	height = Tk_ReqHeight(window);
246	245	width += pane->reqSize;
247	246	}
248	247	width += nSashes * sashThickness;
249	248	} else {
250	249	for (index = 0; index < nPanes; ++index) {
251		Pane *pane = Ttk_SlaveData(pw->paned.mgr, index);
252		Tk_Window slaveWindow = Ttk_SlaveWindow(pw->paned.mgr, index);
253
254		if (width < Tk_ReqWidth(slaveWindow))
255		width = Tk_ReqWidth(slaveWindow);
	250	Pane pane = (Pane )Ttk_ContentData(pw->paned.mgr, index);
	251	Tk_Window window = Ttk_ContentWindow(pw->paned.mgr, index);
	252
	253	if (width < Tk_ReqWidth(window))
	254	width = Tk_ReqWidth(window);
256	255	height += pane->reqSize;
257	256	}
258	257	height += nSashes * sashThickness;

277	276	int pos = 0;
278	277	int index;
279	278
280		for (index = 0; index < Ttk_NumberSlaves(pw->paned.mgr); ++index) {
281		Pane *pane = Ttk_SlaveData(pw->paned.mgr, index);
	279	for (index = 0; index < Ttk_NumberContent(pw->paned.mgr); ++index) {
	280	Pane pane = (Pane )Ttk_ContentData(pw->paned.mgr, index);
282	281	int size = pane->sashPos - pos;
283	282	pane->reqSize = size >= 0 ? size : 0;
284	283	pos = pane->sashPos + sashThickness;

304	303	static void PlaceSashes(Paned *pw, int width, int height)
305	304	{
306	305	Ttk_Manager *mgr = pw->paned.mgr;
307		int nPanes = Ttk_NumberSlaves(mgr);
	306	int nPanes = Ttk_NumberContent(mgr);
308	307	int sashThickness = pw->paned.sashThickness;
309	308	int available = pw->paned.orient == TTK_ORIENT_HORIZONTAL ? width : height;
310	309	int reqSize = 0, totalWeight = 0;

316	315	/* Compute total required size and total available weight:
317	316	*/
318	317	for (i = 0; i < nPanes; ++i) {
319		Pane *pane = Ttk_SlaveData(mgr, i);
	318	Pane pane = (Pane )Ttk_ContentData(mgr, i);
320	319	reqSize += pane->reqSize;
321	320	totalWeight += pane->weight * (pane->reqSize != 0);
322	321	}

340	339	*/
341	340	pos = 0;
342	341	for (i = 0; i < nPanes; ++i) {
343		Pane *pane = Ttk_SlaveData(mgr, i);
	342	Pane pane = (Pane )Ttk_ContentData(mgr, i);
344	343	int weight = pane->weight * (pane->reqSize != 0);
345	344	int size = pane->reqSize + delta * weight;
346	345

364	363	}
365	364
366	365	/* PlacePanes --
367		* Places slave panes based on sash positions.
	366	* Places panes based on sash positions.
368	367	*/
369	368	static void PlacePanes(Paned *pw)
370	369	{

374	373	int pos = 0;
375	374	int index;
376	375
377		for (index = 0; index < Ttk_NumberSlaves(pw->paned.mgr); ++index) {
378		Pane *pane = Ttk_SlaveData(pw->paned.mgr, index);
	376	for (index = 0; index < Ttk_NumberContent(pw->paned.mgr); ++index) {
	377	Pane pane = (Pane )Ttk_ContentData(pw->paned.mgr, index);
379	378	int size = pane->sashPos - pos;
380	379
381	380	if (size > 0) {
382	381	if (horizontal) {
383		Ttk_PlaceSlave(pw->paned.mgr, index, pos, 0, size, height);
	382	Ttk_PlaceContent(pw->paned.mgr, index, pos, 0, size, height);
384	383	} else {
385		Ttk_PlaceSlave(pw->paned.mgr, index, 0, pos, width, size);
	384	Ttk_PlaceContent(pw->paned.mgr, index, 0, pos, width, size);
386	385	}
387	386	} else {
388		Ttk_UnmapSlave(pw->paned.mgr, index);
	387	Ttk_UnmapContent(pw->paned.mgr, index);
389	388	}
390	389
391	390	pos = pane->sashPos + sashThickness;

396	395	* +++ Manager specification.
397	396	*/
398	397
399		static void PanedPlaceSlaves(void *managerData)
400		{
401		Paned *pw = managerData;
	398	static void PanedPlaceContent(void *managerData)
	399	{
	400	Paned pw = (Paned )managerData;
402	401	PlaceSashes(pw, Tk_Width(pw->core.tkwin), Tk_Height(pw->core.tkwin));
403	402	PlacePanes(pw);
404	403	}
405	404
406	405	static void PaneRemoved(void *managerData, int index)
407	406	{
408		Paned *pw = managerData;
409		Pane *pane = Ttk_SlaveData(pw->paned.mgr, index);
	407	Paned pw = (Paned )managerData;
	408	Pane pane = (Pane )Ttk_ContentData(pw->paned.mgr, index);
410	409	DestroyPane(pw, pane);
411	410	}
412	411
413	412	static int AddPane(
414	413	Tcl_Interp interp, Paned pw,
415		int destIndex, Tk_Window slaveWindow,
	414	int destIndex, Tk_Window window,
416	415	int objc, Tcl_Obj *const objv[])
417	416	{
418	417	Pane *pane;
419		if (!Ttk_Maintainable(interp, slaveWindow, pw->core.tkwin)) {
420		return TCL_ERROR;
421		}
422		if (Ttk_SlaveIndex(pw->paned.mgr, slaveWindow) >= 0) {
	418	if (!Ttk_Maintainable(interp, window, pw->core.tkwin)) {
	419	return TCL_ERROR;
	420	}
	421	if (Ttk_ContentIndex(pw->paned.mgr, window) >= 0) {
423	422	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
424		"%s already added", Tk_PathName(slaveWindow)));
	423	"%s already added", Tk_PathName(window)));
425	424	Tcl_SetErrorCode(interp, "TTK", "PANE", "PRESENT", NULL);
426	425	return TCL_ERROR;
427	426	}
428	427
429		pane = CreatePane(interp, pw, slaveWindow);
	428	pane = CreatePane(interp, pw, window);
430	429	if (!pane) {
431	430	return TCL_ERROR;
432	431	}
433		if (ConfigurePane(interp, pw, pane, slaveWindow, objc, objv) != TCL_OK) {
	432	if (ConfigurePane(interp, pw, pane, window, objc, objv) != TCL_OK) {
434	433	DestroyPane(pw, pane);
435	434	return TCL_ERROR;
436	435	}
437	436
438		Ttk_InsertSlave(pw->paned.mgr, destIndex, slaveWindow, pane);
	437	Ttk_InsertContent(pw->paned.mgr, destIndex, window, pane);
439	438	return TCL_OK;
440	439	}
441	440
442	441	/* PaneRequest --
443		* Only update pane request size if slave is currently unmapped.
444		* Geometry requests from mapped slaves are not directly honored
	442	* Only update pane request size if pane is currently unmapped.
	443	* Geometry requests from mapped panes are not directly honored
445	444	* in order to avoid unexpected pane resizes (esp. while the
446	445	* user is dragging a sash [#1325286]).
447	446	*/
448	447	static int PaneRequest(void *managerData, int index, int width, int height)
449	448	{
450		Paned *pw = managerData;
451		Pane *pane = Ttk_SlaveData(pw->paned.mgr, index);
452		Tk_Window slaveWindow = Ttk_SlaveWindow(pw->paned.mgr, index);
	449	Paned pw = (Paned )managerData;
	450	Pane pane = (Pane )Ttk_ContentData(pw->paned.mgr, index);
	451	Tk_Window window = Ttk_ContentWindow(pw->paned.mgr, index);
453	452	int horizontal = pw->paned.orient == TTK_ORIENT_HORIZONTAL;
454	453
455		if (!Tk_IsMapped(slaveWindow)) {
	454	if (!Tk_IsMapped(window)) {
456	455	pane->reqSize = horizontal ? width : height;
457	456	}
458	457	return 1;
459	458	}
460	459
461	460	static Ttk_ManagerSpec PanedManagerSpec = {
462		{ "panedwindow", Ttk_GeometryRequestProc, Ttk_LostSlaveProc },
	461	{ "panedwindow", Ttk_GeometryRequestProc, Ttk_LostContentProc },
463	462	PanedSize,
464		PanedPlaceSlaves,
	463	PanedPlaceContent,
465	464	PaneRequest,
466	465	PaneRemoved
467	466	};

482	481	static const unsigned PanedEventMask = LeaveWindowMask;
483	482	static void PanedEventProc(ClientData clientData, XEvent *eventPtr)
484	483	{
485		WidgetCore *corePtr = clientData;
	484	WidgetCore corePtr = (WidgetCore )clientData;
486	485	if ( eventPtr->type == LeaveNotify
487	486	&& eventPtr->xcrossing.detail == NotifyInferior)
488	487	{

496	495
497	496	static void PanedInitialize(Tcl_Interp interp, void recordPtr)
498	497	{
499		Paned *pw = recordPtr;
	498	Paned pw = (Paned )recordPtr;
500	499
501	500	Tk_CreateEventHandler(pw->core.tkwin,
502	501	PanedEventMask, PanedEventProc, recordPtr);

508	507
509	508	static void PanedCleanup(void *recordPtr)
510	509	{
511		Paned *pw = recordPtr;
	510	Paned pw = (Paned )recordPtr;
512	511
513	512	if (pw->paned.sashLayout)
514	513	Ttk_FreeLayout(pw->paned.sashLayout);

519	518
520	519	/* Post-configuration hook.
521	520	*/
522		static int PanedPostConfigure(Tcl_Interp interp, void clientData, int mask)
523		{
524		Paned *pw = clientData;
	521	static int PanedPostConfigure(
	522	TCL_UNUSED(Tcl_Interp *),
	523	void *clientData,
	524	int mask)
	525	{
	526	Paned pw = (Paned )clientData;
525	527
526	528	if (mask & GEOMETRY_CHANGED) {
527	529	/* User has changed -width or -height.

542	544	static Ttk_Layout PanedGetLayout(
543	545	Tcl_Interp interp, Ttk_Theme themePtr, void recordPtr)
544	546	{
545		Paned *pw = recordPtr;
	547	Paned pw = (Paned )recordPtr;
546	548	Ttk_Layout panedLayout = TtkWidgetGetLayout(interp, themePtr, recordPtr);
547	549
548	550	if (panedLayout) {

580	582	*/
581	583	static Ttk_Layout SashLayout(Paned *pw, int index)
582	584	{
583		Pane *pane = Ttk_SlaveData(pw->paned.mgr, index);
	585	Pane pane = (Pane )Ttk_ContentData(pw->paned.mgr, index);
584	586	int thickness = pw->paned.sashThickness,
585	587	height = Tk_Height(pw->core.tkwin),
586	588	width = Tk_Width(pw->core.tkwin),

602	604
603	605	static void PanedDisplay(void *recordPtr, Drawable d)
604	606	{
605		Paned *pw = recordPtr;
606		int i, nSashes = Ttk_NumberSlaves(pw->paned.mgr) - 1;
	607	Paned pw = (Paned )recordPtr;
	608	int i, nSashes = Ttk_NumberContent(pw->paned.mgr) - 1;
607	609
608	610	TtkWidgetDisplay(recordPtr, d);
609	611	for (i = 0; i < nSashes; ++i) {

620	622	static int PanedAddCommand(
621	623	void recordPtr, Tcl_Interp interp, int objc, Tcl_Obj *const objv[])
622	624	{
623		Paned *pw = recordPtr;
624		Tk_Window slaveWindow;
	625	Paned pw = (Paned )recordPtr;
	626	Tk_Window window;
625	627
626	628	if (objc < 3) {
627	629	Tcl_WrongNumArgs(interp, 2, objv, "window");
628	630	return TCL_ERROR;
629	631	}
630	632
631		slaveWindow = Tk_NameToWindow(
	633	window = Tk_NameToWindow(
632	634	interp, Tcl_GetString(objv[2]), pw->core.tkwin);
633	635
634		if (!slaveWindow) {
635		return TCL_ERROR;
636		}
637
638		return AddPane(interp, pw, Ttk_NumberSlaves(pw->paned.mgr), slaveWindow,
	636	if (!window) {
	637	return TCL_ERROR;
	638	}
	639
	640	return AddPane(interp, pw, Ttk_NumberContent(pw->paned.mgr), window,
639	641	objc - 3, objv + 3);
640	642	}
641	643
642		/* $pw insert $index $slave ?-option value ...?
643		* Insert new slave, or move existing one.
	644	/* $pw insert $index $window ?-option value ...?
	645	* Insert new content window, or move existing one.
644	646	*/
645	647	static int PanedInsertCommand(
646	648	void recordPtr, Tcl_Interp interp, int objc, Tcl_Obj *const objv[])
647	649	{
648		Paned *pw = recordPtr;
649		int nSlaves = Ttk_NumberSlaves(pw->paned.mgr);
	650	Paned pw = (Paned )recordPtr;
	651	int nContent = Ttk_NumberContent(pw->paned.mgr);
650	652	int srcIndex, destIndex;
651		Tk_Window slaveWindow;
	653	Tk_Window window;
652	654
653	655	if (objc < 4) {
654	656	Tcl_WrongNumArgs(interp, 2,objv, "index slave ?-option value ...?");
655	657	return TCL_ERROR;
656	658	}
657	659
658		slaveWindow = Tk_NameToWindow(
	660	window = Tk_NameToWindow(
659	661	interp, Tcl_GetString(objv[3]), pw->core.tkwin);
660		if (!slaveWindow) {
	662	if (!window) {
661	663	return TCL_ERROR;
662	664	}
663	665
664	666	if (!strcmp(Tcl_GetString(objv[2]), "end")) {
665		destIndex = Ttk_NumberSlaves(pw->paned.mgr);
666		} else if (TCL_OK != Ttk_GetSlaveIndexFromObj(
667		interp,pw->paned.mgr,objv[2],&destIndex))
	667	destIndex = Ttk_NumberContent(pw->paned.mgr);
	668	} else if (TCL_OK != Ttk_GetContentIndexFromObj(
	669	interp,pw->paned.mgr, objv[2], &destIndex))
668	670	{
669	671	return TCL_ERROR;
670	672	}
671	673
672		srcIndex = Ttk_SlaveIndex(pw->paned.mgr, slaveWindow);
673		if (srcIndex < 0) { /* New slave: */
674		return AddPane(interp, pw, destIndex, slaveWindow, objc-4, objv+4);
675		} /* else -- move existing slave: */
676
677		if (destIndex >= nSlaves)
678		destIndex = nSlaves - 1;
679		Ttk_ReorderSlave(pw->paned.mgr, srcIndex, destIndex);
	674	srcIndex = Ttk_ContentIndex(pw->paned.mgr, window);
	675	if (srcIndex < 0) { /* New content: */
	676	return AddPane(interp, pw, destIndex, window, objc-4, objv+4);
	677	} /* else -- move existing content: */
	678
	679	if (destIndex >= nContent)
	680	destIndex = nContent - 1;
	681	Ttk_ReorderContent(pw->paned.mgr, srcIndex, destIndex);
680	682
681	683	return objc == 4 ? TCL_OK :
682	684	ConfigurePane(interp, pw,
683		Ttk_SlaveData(pw->paned.mgr, destIndex),
684		Ttk_SlaveWindow(pw->paned.mgr, destIndex),
685		objc-4,objv+4);
	685	(Pane *)Ttk_ContentData(pw->paned.mgr, destIndex),
	686	Ttk_ContentWindow(pw->paned.mgr, destIndex),
	687	objc-4, objv+4);
686	688	}
687	689
688	690	/* $pw forget $pane

690	692	static int PanedForgetCommand(
691	693	void recordPtr, Tcl_Interp interp, int objc, Tcl_Obj *const objv[])
692	694	{
693		Paned *pw = recordPtr;
	695	Paned pw = (Paned )recordPtr;
694	696	int paneIndex;
695	697
696	698	if (objc != 3) {

698	700	return TCL_ERROR;
699	701	}
700	702
701		if (TCL_OK != Ttk_GetSlaveIndexFromObj(
	703	if (TCL_OK != Ttk_GetContentIndexFromObj(
702	704	interp, pw->paned.mgr, objv[2], &paneIndex))
703	705	{
704	706	return TCL_ERROR;
705	707	}
706		Ttk_ForgetSlave(pw->paned.mgr, paneIndex);
	708	Ttk_ForgetContent(pw->paned.mgr, paneIndex);
707	709
708	710	return TCL_OK;
709	711	}

717	719	static const char *whatTable[] = { "element", "sash", NULL };
718	720	enum { IDENTIFY_ELEMENT, IDENTIFY_SASH };
719	721	int what = IDENTIFY_SASH;
720		Paned *pw = recordPtr;
	722	Paned pw = (Paned )recordPtr;
721	723	int sashThickness = pw->paned.sashThickness;
722		int nSashes = Ttk_NumberSlaves(pw->paned.mgr) - 1;
	724	int nSashes = Ttk_NumberContent(pw->paned.mgr) - 1;
723	725	int x, y, pos;
724	726	int index;
725	727

738	740
739	741	pos = pw->paned.orient == TTK_ORIENT_HORIZONTAL ? x : y;
740	742	for (index = 0; index < nSashes; ++index) {
741		Pane *pane = Ttk_SlaveData(pw->paned.mgr, index);
	743	Pane pane = (Pane )Ttk_ContentData(pw->paned.mgr, index);
742	744	if (pane->sashPos <= pos && pos <= pane->sashPos + sashThickness) {
743	745	/* Found it. */
744	746	switch (what) {

768	770	static int PanedPaneCommand(
769	771	void recordPtr, Tcl_Interp interp, int objc, Tcl_Obj *const objv[])
770	772	{
771		Paned *pw = recordPtr;
	773	Paned pw = (Paned )recordPtr;
772	774	int paneIndex;
773		Tk_Window slaveWindow;
	775	Tk_Window window;
774	776	Pane *pane;
775	777
776	778	if (objc < 3) {

778	780	return TCL_ERROR;
779	781	}
780	782
781		if (TCL_OK != Ttk_GetSlaveIndexFromObj(
782		interp,pw->paned.mgr,objv[2],&paneIndex))
	783	if (TCL_OK != Ttk_GetContentIndexFromObj(
	784	interp,pw->paned.mgr, objv[2], &paneIndex))
783	785	{
784	786	return TCL_ERROR;
785	787	}
786	788
787		pane = Ttk_SlaveData(pw->paned.mgr, paneIndex);
788		slaveWindow = Ttk_SlaveWindow(pw->paned.mgr, paneIndex);
	789	pane = (Pane *)Ttk_ContentData(pw->paned.mgr, paneIndex);
	790	window = Ttk_ContentWindow(pw->paned.mgr, paneIndex);
789	791
790	792	switch (objc) {
791	793	case 3:
792	794	return TtkEnumerateOptions(interp, pane, PaneOptionSpecs,
793		pw->paned.paneOptionTable, slaveWindow);
	795	pw->paned.paneOptionTable, window);
794	796	case 4:
795	797	return TtkGetOptionValue(interp, pane, objv[3],
796		pw->paned.paneOptionTable, slaveWindow);
	798	pw->paned.paneOptionTable, window);
797	799	default:
798		return ConfigurePane(interp, pw, pane, slaveWindow, objc-3,objv+3);
	800	return ConfigurePane(interp, pw, pane, window, objc-3,objv+3);
799	801	}
800	802	}
801	803

805	807	static int PanedPanesCommand(
806	808	void recordPtr, Tcl_Interp interp, int objc, Tcl_Obj *const objv[])
807	809	{
808		Paned *pw = recordPtr;
	810	Paned pw = (Paned )recordPtr;
809	811	Ttk_Manager *mgr = pw->paned.mgr;
810	812	Tcl_Obj *panes;
811	813	int i;

816	818	}
817	819
818	820	panes = Tcl_NewListObj(0, NULL);
819		for (i = 0; i < Ttk_NumberSlaves(mgr); ++i) {
820		const char *pathName = Tk_PathName(Ttk_SlaveWindow(mgr,i));
	821	for (i = 0; i < Ttk_NumberContent(mgr); ++i) {
	822	const char *pathName = Tk_PathName(Ttk_ContentWindow(mgr,i));
821	823	Tcl_ListObjAppendElement(interp, panes, Tcl_NewStringObj(pathName,-1));
822	824	}
823	825	Tcl_SetObjResult(interp, panes);

832	834	static int PanedSashposCommand(
833	835	void recordPtr, Tcl_Interp interp, int objc, Tcl_Obj *const objv[])
834	836	{
835		Paned *pw = recordPtr;
	837	Paned pw = (Paned )recordPtr;
836	838	int sashIndex, position = -1;
837	839	Pane *pane;
838	840

843	845	if (Tcl_GetIntFromObj(interp, objv[2], &sashIndex) != TCL_OK) {
844	846	return TCL_ERROR;
845	847	}
846		if (sashIndex < 0 \|\| sashIndex >= Ttk_NumberSlaves(pw->paned.mgr) - 1) {
	848	if (sashIndex < 0 \|\| sashIndex >= Ttk_NumberContent(pw->paned.mgr) - 1) {
847	849	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
848	850	"sash index %d out of range", sashIndex));
849	851	Tcl_SetErrorCode(interp, "TTK", "PANE", "SASH_INDEX", NULL);
850	852	return TCL_ERROR;
851	853	}
852	854
853		pane = Ttk_SlaveData(pw->paned.mgr, sashIndex);
	855	pane = (Pane *)Ttk_ContentData(pw->paned.mgr, sashIndex);
854	856
855	857	if (objc == 3) {
856	858	Tcl_SetObjResult(interp, Tcl_NewIntObj(pane->sashPos));

923	925	static Ttk_ElementOptionSpec SashElementOptions[] = {
924	926	{ "-sashthickness", TK_OPTION_INT,
925	927	Tk_Offset(SashElement,thicknessObj), "5" },
926		{ NULL, 0, 0, NULL }
	928	{ NULL, TK_OPTION_BOOLEAN, 0, NULL }
927	929	};
928	930
929	931	static void SashElementSize(
930		void clientData, void elementRecord, Tk_Window tkwin,
931		int widthPtr, int heightPtr, Ttk_Padding *paddingPtr)
932		{
933		SashElement *sash = elementRecord;
	932	TCL_UNUSED(void *),
	933	void *elementRecord,
	934	TCL_UNUSED(Tk_Window),
	935	int *widthPtr,
	936	int *heightPtr,
	937	TCL_UNUSED(Ttk_Padding *))
	938	{
	939	SashElement sash = (SashElement )elementRecord;
934	940	int thickness = DEFAULT_SASH_THICKNESS;
	941
935	942	Tcl_GetIntFromObj(NULL, sash->thicknessObj, &thickness);
936	943	widthPtr = heightPtr = thickness;
937	944	}

+36

-28

generic/ttk/ttkProgress.c less more

3	3	* ttk::progressbar widget.
4	4	*/
5	5
6		#include <math.h>
7		#include <tk.h>
8
	6	#include "tkInt.h"
9	7	#include "ttkTheme.h"
10	8	#include "ttkWidget.h"
11	9

47	45	{
48	46	{TK_OPTION_STRING_TABLE, "-orient", "orient", "Orient",
49	47	"horizontal", Tk_Offset(Progressbar,progress.orientObj), -1,
50		0, (ClientData)ttkOrientStrings, STYLE_CHANGED },
	48	0, (void *)ttkOrientStrings, STYLE_CHANGED },
51	49	{TK_OPTION_PIXELS, "-length", "length", "Length",
52	50	DEF_PROGRESSBAR_LENGTH, Tk_Offset(Progressbar,progress.lengthObj), -1,
53	51	0, 0, GEOMETRY_CHANGED },
54	52	{TK_OPTION_STRING_TABLE, "-mode", "mode", "ProgressMode", "determinate",
55	53	Tk_Offset(Progressbar,progress.modeObj),
56	54	Tk_Offset(Progressbar,progress.mode),
57		0, (ClientData)ProgressbarModeStrings, 0 },
	55	0, (void *)ProgressbarModeStrings, 0 },
58	56	{TK_OPTION_DOUBLE, "-maximum", "maximum", "Maximum",
59	57	"100", Tk_Offset(Progressbar,progress.maximumObj), -1,
60	58	0, 0, 0 },

99	97	*/
100	98	static void AnimateProgressProc(ClientData clientData)
101	99	{
102		Progressbar *pb = clientData;
	100	Progressbar pb = (Progressbar )clientData;
103	101
104	102	pb->progress.timer = 0;
105
106	103	if (AnimationEnabled(pb)) {
107	104	int phase = 0;
108	105	Tcl_GetIntFromObj(NULL, pb->progress.phaseObj, &phase);

110	107	/*
111	108	* Update -phase:
112	109	*/
	110
113	111	++phase;
114		if (pb->progress.maxPhase)
115		phase %= pb->progress.maxPhase;
	112	if (phase > pb->progress.maxPhase) {
	113	phase = 0;
	114	}
116	115	Tcl_DecrRefCount(pb->progress.phaseObj);
117	116	pb->progress.phaseObj = Tcl_NewIntObj(phase);
118	117	Tcl_IncrRefCount(pb->progress.phaseObj);

120	119	/*
121	120	* Reschedule:
122	121	*/
	122
123	123	pb->progress.timer = Tcl_CreateTimerHandler(
124	124	pb->progress.period, AnimateProgressProc, clientData);
125
126	125	TtkRedisplayWidget(&pb->core);
127	126	}
128	127	}

136	135	if (AnimationEnabled(pb)) {
137	136	if (pb->progress.timer == 0) {
138	137	pb->progress.timer = Tcl_CreateTimerHandler(
139		pb->progress.period, AnimateProgressProc, (ClientData)pb);
	138	pb->progress.period, AnimateProgressProc, pb);
140	139	}
141	140	} else {
142	141	if (pb->progress.timer != 0) {

152	151
153	152	static void VariableChanged(void recordPtr, const char value)
154	153	{
155		Progressbar *pb = recordPtr;
	154	Progressbar pb = (Progressbar )recordPtr;
156	155	Tcl_Obj *newValue;
157	156	double scratch;
158	157

185	184	* +++ Widget class methods:
186	185	*/
187	186
188		static void ProgressbarInitialize(Tcl_Interp interp, void recordPtr)
189		{
190		Progressbar *pb = recordPtr;
	187	static void ProgressbarInitialize(Tcl_Interp dummy, void recordPtr)
	188	{
	189	Progressbar pb = (Progressbar )recordPtr;
	190	(void)dummy;
	191
191	192	pb->progress.variableTrace = 0;
192	193	pb->progress.timer = 0;
193	194	}
194	195
195	196	static void ProgressbarCleanup(void *recordPtr)
196	197	{
197		Progressbar *pb = recordPtr;
	198	Progressbar pb = (Progressbar )recordPtr;
198	199	if (pb->progress.variableTrace)
199	200	Ttk_UntraceVariable(pb->progress.variableTrace);
200	201	if (pb->progress.timer)

208	209	*/
209	210	static int ProgressbarConfigure(Tcl_Interp interp, void recordPtr, int mask)
210	211	{
211		Progressbar *pb = recordPtr;
	212	Progressbar pb = (Progressbar )recordPtr;
212	213	Tcl_Obj *varName = pb->progress.variableObj;
213	214	Ttk_TraceHandle *vt = 0;
214	215

234	235	* Post-configuration hook:
235	236	*/
236	237	static int ProgressbarPostConfigure(
237		Tcl_Interp interp, void recordPtr, int mask)
238		{
239		Progressbar *pb = recordPtr;
	238	Tcl_Interp dummy, void recordPtr, int mask)
	239	{
	240	Progressbar pb = (Progressbar )recordPtr;
240	241	int status = TCL_OK;
	242	(void)dummy;
	243	(void)mask;
241	244
242	245	if (pb->progress.variableTrace) {
243	246	status = Ttk_FireTrace(pb->progress.variableTrace);

265	268	*/
266	269	static int ProgressbarSize(void recordPtr, int widthPtr, int *heightPtr)
267	270	{
268		Progressbar *pb = recordPtr;
269		int length = 100, orient = TTK_ORIENT_HORIZONTAL;
	271	Progressbar pb = (Progressbar )recordPtr;
	272	int length = 100;
	273	int orient = TTK_ORIENT_HORIZONTAL;
270	274
271	275	TtkWidgetSize(recordPtr, widthPtr, heightPtr);
272	276

333	337
334	338	static void ProgressbarDoLayout(void *recordPtr)
335	339	{
336		Progressbar *pb = recordPtr;
	340	Progressbar pb = (Progressbar )recordPtr;
337	341	WidgetCore *corePtr = &pb->core;
338	342	Ttk_Element pbar = Ttk_FindElement(corePtr->layout, "pbar");
339	343	double value = 0.0, maximum = 100.0;

365	369	static Ttk_Layout ProgressbarGetLayout(
366	370	Tcl_Interp interp, Ttk_Theme theme, void recordPtr)
367	371	{
368		Progressbar *pb = recordPtr;
	372	Progressbar pb = (Progressbar )recordPtr;
369	373	Ttk_Layout layout = TtkWidgetGetOrientedLayout(
370	374	interp, theme, recordPtr, pb->progress.orientObj);
371	375

395	399	static int ProgressbarStepCommand(
396	400	void recordPtr, Tcl_Interp interp, int objc, Tcl_Obj *const objv[])
397	401	{
398		Progressbar *pb = recordPtr;
	402	Progressbar pb = (Progressbar )recordPtr;
399	403	double value = 0.0, stepAmount = 1.0;
400		Tcl_Obj *newValueObj;
	404	Tcl_Obj *newValueObj;
401	405
402	406	if (objc == 3) {
403	407	if (Tcl_GetDoubleFromObj(interp, objv[2], &stepAmount) != TCL_OK) {

424	428
425	429	TtkRedisplayWidget(&pb->core);
426	430
427		/* Update value by setting the linked -variable, if there is one:
	431	/* Update value by setting the linked -variable, if there is one:
428	432	*/
429	433	if (pb->progress.variableTrace) {
430	434	int result = Tcl_ObjSetVar2(

445	449	}
446	450
447	451	/* $sb start\|stop ?args? --
448		* Change [$sb $cmd ...] to [ttk::progressbar::$cmd ...]
	452	* Change [$sb $cmd ...] to [ttk::progressbar::$cmd ...]
449	453	* and pass to interpreter.
450	454	*/
451	455	static int ProgressbarStartStopCommand(

471	475	static int ProgressbarStartCommand(
472	476	void recordPtr, Tcl_Interp interp, int objc, Tcl_Obj *const objv[])
473	477	{
	478	(void)recordPtr;
	479
474	480	return ProgressbarStartStopCommand(
475	481	interp, "::ttk::progressbar::start", objc, objv);
476	482	}

478	484	static int ProgressbarStopCommand(
479	485	void recordPtr, Tcl_Interp interp, int objc, Tcl_Obj *const objv[])
480	486	{
	487	(void)recordPtr;
	488
481	489	return ProgressbarStartStopCommand(
482	490	interp, "::ttk::progressbar::stop", objc, objv);
483	491	}

+30

-28

generic/ttk/ttkScale.c less more

3	3	* ttk::scale widget.
4	4	*/
5	5
6		#include <tk.h>
7		#include <string.h>
8		#include <stdio.h>
	6	#include "tkInt.h"
9	7	#include "ttkTheme.h"
10	8	#include "ttkWidget.h"
11	9

54	52	static Tk_OptionSpec ScaleOptionSpecs[] =
55	53	{
56	54	{TK_OPTION_STRING, "-command", "command", "Command", "",
57		Tk_Offset(Scale,scale.commandObj), -1,
	55	Tk_Offset(Scale,scale.commandObj), -1,
58	56	TK_OPTION_NULL_OK,0,0},
59	57	{TK_OPTION_STRING, "-variable", "variable", "Variable", "",
60		Tk_Offset(Scale,scale.variableObj), -1,
	58	Tk_Offset(Scale,scale.variableObj), -1,
61	59	0,0,0},
62	60	{TK_OPTION_STRING_TABLE, "-orient", "orient", "Orient", "horizontal",
63	61	Tk_Offset(Scale,scale.orientObj),
64		Tk_Offset(Scale,scale.orient), 0,
65		(ClientData)ttkOrientStrings, STYLE_CHANGED },
	62	Tk_Offset(Scale,scale.orient), 0,
	63	(void *)ttkOrientStrings, STYLE_CHANGED },
66	64
67	65	{TK_OPTION_DOUBLE, "-from", "from", "From", "0",
68	66	Tk_Offset(Scale,scale.fromObj), -1, 0, 0, 0},

71	69	{TK_OPTION_DOUBLE, "-value", "value", "Value", "0",
72	70	Tk_Offset(Scale,scale.valueObj), -1, 0, 0, 0},
73	71	{TK_OPTION_PIXELS, "-length", "length", "Length",
74		DEF_SCALE_LENGTH, Tk_Offset(Scale,scale.lengthObj), -1, 0, 0,
	72	DEF_SCALE_LENGTH, Tk_Offset(Scale,scale.lengthObj), -1, 0, 0,
75	73	GEOMETRY_CHANGED},
76	74
77	75	{TK_OPTION_STRING, "-state", "state", "State",

88	86	/* ScaleVariableChanged --
89	87	* Variable trace procedure for scale -variable;
90	88	* Updates the scale's value.
91		* If the linked variable is not a valid double,
	89	* If the linked variable is not a valid double,
92	90	* sets the 'invalid' state.
93	91	*/
94	92	static void ScaleVariableChanged(void recordPtr, const char value)
95	93	{
96		Scale *scale = recordPtr;
	94	Scale scale = (Scale )recordPtr;
97	95	double v;
98	96
99	97	if (value == NULL \|\| Tcl_GetDouble(0, value, &v) != TCL_OK) {

111	109	/* ScaleInitialize --
112	110	* Scale widget initialization hook.
113	111	*/
114		static void ScaleInitialize(Tcl_Interp interp, void recordPtr)
115		{
116		Scale *scalePtr = recordPtr;
	112	static void ScaleInitialize(Tcl_Interp dummy, void recordPtr)
	113	{
	114	Scale scalePtr = (Scale )recordPtr;
	115	(void)dummy;
	116
117	117	TtkTrackElementState(&scalePtr->core);
118	118	}
119	119
120	120	static void ScaleCleanup(void *recordPtr)
121	121	{
122		Scale *scale = recordPtr;
	122	Scale scale = (Scale )recordPtr;
123	123
124	124	if (scale->scale.variableTrace) {
125	125	Ttk_UntraceVariable(scale->scale.variableTrace);

132	132	*/
133	133	static int ScaleConfigure(Tcl_Interp interp, void recordPtr, int mask)
134	134	{
135		Scale *scale = recordPtr;
	135	Scale scale = (Scale )recordPtr;
136	136	Tcl_Obj *varName = scale->scale.variableObj;
137	137	Ttk_TraceHandle *vt = 0;
138	138

162	162	* Post-configuration hook.
163	163	*/
164	164	static int ScalePostConfigure(
165		Tcl_Interp interp, void recordPtr, int mask)
166		{
167		Scale *scale = recordPtr;
	165	Tcl_Interp dummy, void recordPtr, int mask)
	166	{
	167	Scale scale = (Scale )recordPtr;
168	168	int status = TCL_OK;
	169	(void)dummy;
	170	(void)mask;
169	171
170	172	if (scale->scale.variableTrace) {
171	173	status = Ttk_FireTrace(scale->scale.variableTrace);

188	190	/* ScaleGetLayout --
189	191	* getLayout hook.
190	192	*/
191		static Ttk_Layout
	193	static Ttk_Layout
192	194	ScaleGetLayout(Tcl_Interp interp, Ttk_Theme theme, void recordPtr)
193	195	{
194		Scale *scalePtr = recordPtr;
	196	Scale scalePtr = (Scale )recordPtr;
195	197	return TtkWidgetGetOrientedLayout(
196	198	interp, theme, recordPtr, scalePtr->scale.orientObj);
197	199	}

252	254	}
253	255
254	256	/* $scale get ?x y? --
255		* Returns the current value of the scale widget, or if $x and
	257	* Returns the current value of the scale widget, or if $x and
256	258	* $y are specified, the value represented by point @x,y.
257	259	*/
258	260	static int
259	261	ScaleGetCommand(
260	262	void recordPtr, Tcl_Interp interp, int objc, Tcl_Obj *const objv[])
261	263	{
262		Scale *scalePtr = recordPtr;
	264	Scale scalePtr = (Scale )recordPtr;
263	265	int x, y, r = TCL_OK;
264	266	double value = 0;
265	267

287	289	ScaleSetCommand(
288	290	void recordPtr, Tcl_Interp interp, int objc, Tcl_Obj *const objv[])
289	291	{
290		Scale *scalePtr = recordPtr;
	292	Scale scalePtr = (Scale )recordPtr;
291	293	double from = 0.0, to = 1.0, value;
292	294	int result = TCL_OK;
293	295

355	357	ScaleCoordsCommand(
356	358	void recordPtr, Tcl_Interp interp, int objc, Tcl_Obj *const objv[])
357	359	{
358		Scale *scalePtr = recordPtr;
	360	Scale scalePtr = (Scale )recordPtr;
359	361	double value;
360	362	int r = TCL_OK;
361	363

382	384
383	385	static void ScaleDoLayout(void *clientData)
384	386	{
385		WidgetCore *corePtr = clientData;
	387	WidgetCore corePtr = (WidgetCore )clientData;
386	388	Ttk_Element slider = Ttk_FindElement(corePtr->layout, "slider");
387	389
388	390	Ttk_PlaceLayout(corePtr->layout,corePtr->state,Ttk_WinBox(corePtr->tkwin));

390	392	/* Adjust the slider position:
391	393	*/
392	394	if (slider) {
393		Scale *scalePtr = clientData;
	395	Scale scalePtr = (Scale )clientData;
394	396	Ttk_Box troughBox = TroughBox(scalePtr);
395	397	Ttk_Box sliderBox = Ttk_ElementParcel(slider);
396	398	double value = 0.0;

417	419	*/
418	420	static int ScaleSize(void clientData, int widthPtr, int *heightPtr)
419	421	{
420		WidgetCore *corePtr = clientData;
421		Scale *scalePtr = clientData;
	422	WidgetCore corePtr = (WidgetCore )clientData;
	423	Scale scalePtr = (Scale )clientData;
422	424	int length;
423	425
424	426	Ttk_LayoutSize(corePtr->layout, corePtr->state, widthPtr, heightPtr);

+6

-3

generic/ttk/ttkScroll.c less more

103	103	Tcl_Release(corePtr);
104	104
105	105	if (code != TCL_OK && !Tcl_InterpDeleted(interp)) {
106		/* Disable the -scrollcommand, add to stack trace:
	106	/* Add error to stack trace.
	107	* Also set the SCROLL_UPDATE_REQUIRED flag so that a later call to
	108	* TtkScrolled has an effect. Indeed, the error in the -scrollcommand
	109	* callback may later be gone, for instance the callback proc got
	110	* defined in the meantime.
107	111	*/
108		ckfree(s->scrollCmd);
109		s->scrollCmd = 0;
110	112
111	113	Tcl_AddErrorInfo(interp, /* @@@ "horizontal" / "vertical" */
112	114	"\n (scrolling command executed by ");
113	115	Tcl_AddErrorInfo(interp, Tk_PathName(h->corePtr->tkwin));
114	116	Tcl_AddErrorInfo(interp, ")");
	117	TtkScrollbarUpdateRequired(h);
115	118	}
116	119	return code;
117	120	}

+18

-19

generic/ttk/ttkScrollbar.c less more

3	3	* ttk::scrollbar widget.
4	4	*/
5	5
6		#include <tk.h>
7
	6	#include "tkInt.h"
8	7	#include "ttkTheme.h"
9	8	#include "ttkWidget.h"
10	9

21	20	double first; /* top fraction */
22	21	double last; /* bottom fraction */
23	22
24		Ttk_Box troughBox; /* trough parcel */
	23	Ttk_Box troughBox; /* trough parcel */
25	24	int minSize; /* minimum size of thumb */
26	25	} ScrollbarPart;
27	26

39	38	{TK_OPTION_STRING_TABLE, "-orient", "orient", "Orient", "vertical",
40	39	Tk_Offset(Scrollbar,scrollbar.orientObj),
41	40	Tk_Offset(Scrollbar,scrollbar.orient),
42		0,(ClientData)ttkOrientStrings,STYLE_CHANGED },
	41	0, (void *)ttkOrientStrings, STYLE_CHANGED },
43	42
44	43	WIDGET_TAKEFOCUS_FALSE,
45	44	WIDGET_INHERIT_OPTIONS(ttkCoreOptionSpecs)

49	48	* +++ Widget hooks.
50	49	*/
51	50
52		static void
53		ScrollbarInitialize(Tcl_Interp interp, void recordPtr)
54		{
55		Scrollbar *sb = recordPtr;
	51	static void
	52	ScrollbarInitialize(Tcl_Interp dummy, void recordPtr)
	53	{
	54	Scrollbar sb = (Scrollbar )recordPtr;
	55	(void)dummy;
	56
56	57	sb->scrollbar.first = 0.0;
57	58	sb->scrollbar.last = 1.0;
58	59

62	63	static Ttk_Layout ScrollbarGetLayout(
63	64	Tcl_Interp interp, Ttk_Theme theme, void recordPtr)
64	65	{
65		Scrollbar *sb = recordPtr;
	66	Scrollbar sb = (Scrollbar )recordPtr;
66	67	return TtkWidgetGetOrientedLayout(
67	68	interp, theme, recordPtr, sb->scrollbar.orientObj);
68	69	}

76	77	*/
77	78	static void ScrollbarDoLayout(void *recordPtr)
78	79	{
79		Scrollbar *sb = recordPtr;
	80	Scrollbar sb = (Scrollbar )recordPtr;
80	81	WidgetCore *corePtr = &sb->core;
81	82	Ttk_Element thumb;
82	83	Ttk_Box thumbBox;

132	133	ScrollbarSetCommand(
133	134	void recordPtr, Tcl_Interp interp, int objc, Tcl_Obj *const objv[])
134	135	{
135		Scrollbar *scrollbar = recordPtr;
	136	Scrollbar scrollbar = (Scrollbar )recordPtr;
136	137	Tcl_Obj firstObj, lastObj;
137	138	double first, last;
138	139

183	184	ScrollbarGetCommand(
184	185	void recordPtr, Tcl_Interp interp, int objc, Tcl_Obj *const objv[])
185	186	{
186		Scrollbar *scrollbar = recordPtr;
	187	Scrollbar scrollbar = (Scrollbar )recordPtr;
187	188	Tcl_Obj *result[2];
188	189
189	190	if (objc != 2) {

206	207	ScrollbarDeltaCommand(
207	208	void recordPtr, Tcl_Interp interp, int objc, Tcl_Obj *const objv[])
208	209	{
209		Scrollbar *sb = recordPtr;
	210	Scrollbar sb = (Scrollbar )recordPtr;
210	211	double dx, dy;
211	212	double delta = 0.0;
212	213

240	241
241	242	/* $sb fraction $x $y --
242	243	* Returns a real number between 0 and 1 indicating where the
243		* point given by x and y lies in the trough area of the scrollbar.
	244	* point given by x and y lies in the trough area of the scrollbar.
244	245	*/
245	246	static int
246	247	ScrollbarFractionCommand(
247	248	void recordPtr, Tcl_Interp interp, int objc, Tcl_Obj *const objv[])
248	249	{
249		Scrollbar *sb = recordPtr;
	250	Scrollbar sb = (Scrollbar )recordPtr;
250	251	Ttk_Box b = sb->scrollbar.troughBox;
251	252	int minSize = sb->scrollbar.minSize;
252	253	double x, y;

314	315	TTK_GROUP("Vertical.Scrollbar.trough", TTK_FILL_Y,
315	316	TTK_NODE("Vertical.Scrollbar.uparrow", TTK_PACK_TOP)
316	317	TTK_NODE("Vertical.Scrollbar.downarrow", TTK_PACK_BOTTOM)
317		TTK_NODE(
318		"Vertical.Scrollbar.thumb", TTK_PACK_TOP\|TTK_EXPAND\|TTK_FILL_BOTH))
	318	TTK_NODE("Vertical.Scrollbar.thumb", TTK_FILL_BOTH))
319	319	TTK_END_LAYOUT
320	320
321	321	TTK_BEGIN_LAYOUT(HorizontalScrollbarLayout)
322	322	TTK_GROUP("Horizontal.Scrollbar.trough", TTK_FILL_X,
323	323	TTK_NODE("Horizontal.Scrollbar.leftarrow", TTK_PACK_LEFT)
324	324	TTK_NODE("Horizontal.Scrollbar.rightarrow", TTK_PACK_RIGHT)
325		TTK_NODE(
326		"Horizontal.Scrollbar.thumb", TTK_PACK_LEFT\|TTK_EXPAND\|TTK_FILL_BOTH))
	325	TTK_NODE("Horizontal.Scrollbar.thumb", TTK_FILL_BOTH))
327	326	TTK_END_LAYOUT
328	327
329	328	/*------------------------------------------------------------------------

+2

-3

generic/ttk/ttkSeparator.c less more

3	3	* ttk::separator and ttk::sizegrip widgets.
4	4	*/
5	5
6		#include <tk.h>
7
	6	#include "tkInt.h"
8	7	#include "ttkTheme.h"
9	8	#include "ttkWidget.h"
10	9

26	25	{TK_OPTION_STRING_TABLE, "-orient", "orient", "Orient", "horizontal",
27	26	Tk_Offset(Separator,separator.orientObj),
28	27	Tk_Offset(Separator,separator.orient),
29		0,(ClientData)ttkOrientStrings,STYLE_CHANGED },
	28	0, (void *)ttkOrientStrings, STYLE_CHANGED },
30	29
31	30	WIDGET_TAKEFOCUS_FALSE,
32	31	WIDGET_INHERIT_OPTIONS(ttkCoreOptionSpecs)

+24

-21

generic/ttk/ttkSquare.c less more

2	2	* Minimal sample ttk widget.
3	3	*/
4	4
5		#include <tk.h>
	5	#include "tkInt.h"
6	6	#include "ttkTheme.h"
7	7	#include "ttkWidget.h"
8	8

55	55	{TK_OPTION_BORDER, "-foreground", "foreground", "Foreground",
56	56	DEFAULT_BACKGROUND, Tk_Offset(Square,square.foregroundObj),
57	57	-1, 0, 0, 0},
58
	58
59	59	{TK_OPTION_PIXELS, "-width", "width", "Width",
60	60	"50", Tk_Offset(Square,square.widthObj), -1, 0, 0,
61	61	GEOMETRY_CHANGED},
62	62	{TK_OPTION_PIXELS, "-height", "height", "Height",
63	63	"50", Tk_Offset(Square,square.heightObj), -1, 0, 0,
64	64	GEOMETRY_CHANGED},
65
	65
66	66	{TK_OPTION_STRING, "-padding", "padding", "Pad", NULL,
67		Tk_Offset(Square,square.paddingObj), -1,
	67	Tk_Offset(Square,square.paddingObj), -1,
68	68	TK_OPTION_NULL_OK,0,GEOMETRY_CHANGED },
69
	69
70	70	{TK_OPTION_RELIEF, "-relief", "relief", "Relief",
71	71	NULL, Tk_Offset(Square,square.reliefObj), -1, TK_OPTION_NULL_OK, 0, 0},
72
	72
73	73	{TK_OPTION_ANCHOR, "-anchor", "anchor", "Anchor",
74	74	NULL, Tk_Offset(Square,square.anchorObj), -1, TK_OPTION_NULL_OK, 0, 0},
75
	75
76	76	WIDGET_TAKEFOCUS_TRUE,
77	77	WIDGET_INHERIT_OPTIONS(ttkCoreOptionSpecs)
78	78	};

108	108	*/
109	109
110	110	if (squareNode) {
111		Square *squarePtr = clientData;
	111	Square squarePtr = (Square )clientData;
112	112	Tk_Anchor anchor = TK_ANCHOR_CENTER;
113	113	Ttk_Box b;
114	114

137	137	};
138	138
139	139	/*
140		* The Widget specification structure holds all the implementation
	140	* The Widget specification structure holds all the implementation
141	141	* information about this widget and this is what must be registered
142	142	* with Tk in the package initialization code (see bottom).
143	143	*/

158	158	TtkWidgetDisplay /* displayProc */
159	159	};
160	160
161		/* ----------------------------------------------------------------------
	161	/* ----------------------------------------------------------------------
162	162	* Square element
163	163	*
164	164	* In this section we demonstrate what is required to create a new themed

175	175	Tcl_Obj *heightObj;
176	176	} SquareElement;
177	177
178		static Ttk_ElementOptionSpec SquareElementOptions[] =
	178	static Ttk_ElementOptionSpec SquareElementOptions[] =
179	179	{
180	180	{ "-background", TK_OPTION_BORDER, Tk_Offset(SquareElement,borderObj),
181	181	DEFAULT_BACKGROUND },

187	187	"raised" },
188	188	{ "-width", TK_OPTION_PIXELS, Tk_Offset(SquareElement,widthObj), "20"},
189	189	{ "-height", TK_OPTION_PIXELS, Tk_Offset(SquareElement,heightObj), "20"},
190		{ NULL, 0, 0, NULL }
	190	{ NULL, TK_OPTION_BOOLEAN, 0, NULL }
191	191	};
192	192
193	193	/*

197	197	*/
198	198
199	199	static void SquareElementSize(
200		void clientData, void elementRecord, Tk_Window tkwin,
	200	void dummy, void elementRecord, Tk_Window tkwin,
201	201	int widthPtr, int heightPtr, Ttk_Padding *paddingPtr)
202	202	{
203		SquareElement *square = elementRecord;
	203	SquareElement square = (SquareElement )elementRecord;
204	204	int borderWidth = 0;
	205	(void)dummy;
205	206
206	207	Tcl_GetIntFromObj(NULL, square->borderWidthObj, &borderWidth);
207	208	*paddingPtr = Ttk_UniformPadding((short)borderWidth);

214	215	*/
215	216
216	217	static void SquareElementDraw(
217		void clientData, void elementRecord, Tk_Window tkwin,
	218	void dummy, void elementRecord, Tk_Window tkwin,
218	219	Drawable d, Ttk_Box b, unsigned int state)
219	220	{
220		SquareElement *square = elementRecord;
	221	SquareElement square = (SquareElement )elementRecord;
221	222	Tk_3DBorder foreground = NULL;
222	223	int borderWidth = 1, relief = TK_RELIEF_FLAT;
	224	(void)dummy;
	225	(void)state;
223	226
224	227	foreground = Tk_Get3DBorderFromObj(tkwin, square->foregroundObj);
225	228	Tcl_GetIntFromObj(NULL, square->borderWidthObj, &borderWidth);

247	250	* engine is similar to the Tk pack geometry manager. Read the documentation
248	251	* for the details. In this example we just need to have the square element
249	252	* that has been defined for this widget placed on a background. We will
250		* also need some padding to keep it away from the edges.
	253	* also need some padding to keep it away from the edges.
251	254	*/
252	255
253	256	TTK_BEGIN_LAYOUT(SquareLayout)

256	259	TTK_NODE("Square.square", 0))
257	260	TTK_END_LAYOUT
258	261
259		/* ----------------------------------------------------------------------
	262	/* ----------------------------------------------------------------------
260	263	*
261	264	* Widget initialization.
262	265	*
263	266	* This file defines a new element and a new widget. We need to register
264		* the element with the themes that will need it. In this case we will
	267	* the element with the themes that will need it. In this case we will
265	268	* register with the default theme that is the root of the theme inheritance
266	269	* tree. This means all themes will find this element.
267	270	* We then need to register the widget class style. This is the layout

286	289
287	290	/* register the new elements for this theme engine */
288	291	Ttk_RegisterElement(interp, theme, "square", &SquareElementSpec, NULL);
289
	292
290	293	/* register the layout for this theme */
291	294	Ttk_RegisterLayout(theme, "TSquare", SquareLayout);
292
	295
293	296	/* register the widget */
294	297	RegisterWidget(interp, "ttk::square", &SquareWidgetSpec);
295	298

+1

-3

generic/ttk/ttkState.c less more

4	4	*
5	5	*/
6	6
7		#include <string.h>
8
9		#include <tk.h>
	7	#include "tkInt.h"
10	8	#include "ttkTheme.h"
11	9
12	10	/*

+1

-1

generic/ttk/ttkStubInit.c less more

2	2	* It is compiled and linked in with the ttk package proper.
3	3	*/
4	4
5		#include "tk.h"
	5	#include "tkInt.h"
6	6	#include "ttkTheme.h"
7	7
8	8	MODULE_SCOPE const TtkStubs ttkStubs;

+4

-4

generic/ttk/ttkStubLib.c less more

5	5	#undef USE_TCL_STUBS
6	6	#define USE_TCL_STUBS
7	7
8		#include "tk.h"
	8	#include "tkInt.h"
9	9
10	10	#define USE_TTK_STUBS 1
11	11	#include "ttkTheme.h"

35	35	int exact = 0;
36	36	const char *packageName = "Ttk";
37	37	const char *errMsg = NULL;
38		ClientData pkgClientData = NULL;
	38	void *pkgClientData = NULL;
39	39	const char *actualVersion = Tcl_PkgRequireEx(
40	40	interp, packageName, version, exact, &pkgClientData);
41		const TtkStubs *stubsPtr = pkgClientData;
	41	const TtkStubs stubsPtr = (const TtkStubs )pkgClientData;
42	42
43	43	if (!actualVersion) {
44	44	return NULL;

66	66	"Error loading ", packageName, " package",
67	67	" (requested version '", version,
68	68	"', loaded version '", actualVersion, "'): ",
69		errMsg,
	69	errMsg,
70	70	NULL);
71	71	return NULL;
72	72	}

+9

-11

generic/ttk/ttkTagSet.c less more

3	3	* Copyright (C) 2005, Joe English. Freely redistributable.
4	4	*/
5	5
6		#include <string.h> /* for memset() */
7		#include <tcl.h>
8		#include <tk.h>
	6	#include "tkInt.h"
9	7
10	8	#include "ttkTheme.h"
11	9	#include "ttkWidget.h"

33	31	*/
34	32	static Ttk_Tag NewTag(Ttk_TagTable tagTable, const char *tagName)
35	33	{
36		Ttk_Tag tag = ckalloc(sizeof(*tag));
	34	Ttk_Tag tag = (Ttk_Tag)ckalloc(sizeof(*tag));
37	35	tag->tagRecord = ckalloc(tagTable->recordSize);
38	36	memset(tag->tagRecord, 0, tagTable->recordSize);
39	37	/* Don't need Tk_InitOptions() here, all defaults should be NULL. */

57	55	Tcl_Interp *interp, Tk_Window tkwin,
58	56	Tk_OptionSpec optionSpecs[], int recordSize)
59	57	{
60		Ttk_TagTable tagTable = ckalloc(sizeof(*tagTable));
	58	Ttk_TagTable tagTable = (Ttk_TagTable)ckalloc(sizeof(*tagTable));
61	59	tagTable->tkwin = tkwin;
62	60	tagTable->optionSpecs = optionSpecs;
63	61	tagTable->optionTable = Tk_CreateOptionTable(interp, optionSpecs);

74	72
75	73	entryPtr = Tcl_FirstHashEntry(&tagTable->tags, &search);
76	74	while (entryPtr != NULL) {
77		DeleteTag(tagTable, Tcl_GetHashValue(entryPtr));
	75	DeleteTag(tagTable, (Ttk_Tag)Tcl_GetHashValue(entryPtr));
78	76	entryPtr = Tcl_NextHashEntry(&search);
79	77	}
80	78

89	87	&tagTable->tags, tagName, &isNew);
90	88
91	89	if (isNew) {
92		tagName = Tcl_GetHashKey(&tagTable->tags, entryPtr);
	90	tagName = (char *)Tcl_GetHashKey(&tagTable->tags, entryPtr);
93	91	Tcl_SetHashValue(entryPtr, NewTag(tagTable,tagName));
94	92	}
95		return Tcl_GetHashValue(entryPtr);
	93	return (Ttk_Tag)Tcl_GetHashValue(entryPtr);
96	94	}
97	95
98	96	Ttk_Tag Ttk_GetTagFromObj(Ttk_TagTable tagTable, Tcl_Obj *objPtr)

115	113	Ttk_TagSet Ttk_GetTagSetFromObj(
116	114	Tcl_Interp interp, Ttk_TagTable tagTable, Tcl_Obj objPtr)
117	115	{
118		Ttk_TagSet tagset = ckalloc(sizeof(*tagset));
	116	Ttk_TagSet tagset = (Ttk_TagSet)ckalloc(sizeof(*tagset));
119	117	Tcl_Obj **objv;
120	118	int i, objc;
121	119

130	128	return NULL;
131	129	}
132	130
133		tagset->tags = ckalloc((objc+1) * sizeof(Ttk_Tag));
	131	tagset->tags = (Ttk_Tag )ckalloc((objc+1) sizeof(Ttk_Tag));
134	132	for (i=0; i<objc; ++i) {
135	133	tagset->tags[i] = Ttk_GetTagFromObj(tagTable, objv[i]);
136	134	}

187	185	return 0;
188	186	}
189	187	}
190		tagset->tags = ckrealloc(tagset->tags,
	188	tagset->tags = (Ttk_Tag *)ckrealloc(tagset->tags,
191	189	(tagset->nTags+1)*sizeof(tagset->tags[0]));
192	190	tagset->tags[tagset->nTags++] = tag;
193	191	return 1;

+74

-71

generic/ttk/ttkTheme.c less more

14	14
15	15	#define PKG_ASSOC_KEY "Ttk"
16	16
17		#ifdef MAC_OSX_TK
18		extern void TkMacOSXFlushWindows(void);
19		#define UPDATE_WINDOWS() TkMacOSXFlushWindows()
20		#else
21		#define UPDATE_WINDOWS()
22		#endif
23
24	17	/*------------------------------------------------------------------------
25	18	* +++ Styles.
26	19	*

41	34	Ttk_ResourceCache cache; /* Back-pointer to resource cache */
42	35	} Style;
43	36
44		static Style *NewStyle()
45		{
46		Style *stylePtr = ckalloc(sizeof(Style));
	37	static Style *NewStyle(void)
	38	{
	39	Style stylePtr = (Style )ckalloc(sizeof(Style));
47	40
48	41	stylePtr->styleName = NULL;
49	42	stylePtr->parentStyle = NULL;

62	55
63	56	entryPtr = Tcl_FirstHashEntry(&stylePtr->settingsTable, &search);
64	57	while (entryPtr != NULL) {
65		Ttk_StateMap stateMap = Tcl_GetHashValue(entryPtr);
	58	Ttk_StateMap stateMap = (Ttk_StateMap)Tcl_GetHashValue(entryPtr);
66	59	Tcl_DecrRefCount(stateMap);
67	60	entryPtr = Tcl_NextHashEntry(&search);
68	61	}

70	63
71	64	entryPtr = Tcl_FirstHashEntry(&stylePtr->defaultsTable, &search);
72	65	while (entryPtr != NULL) {
73		Tcl_Obj *defaultValue = Tcl_GetHashValue(entryPtr);
	66	Tcl_Obj defaultValue = (Tcl_Obj )Tcl_GetHashValue(entryPtr);
74	67	Tcl_DecrRefCount(defaultValue);
75	68	entryPtr = Tcl_NextHashEntry(&search);
76	69	}

91	84	Tcl_HashEntry *entryPtr =
92	85	Tcl_FindHashEntry(&style->settingsTable, optionName);
93	86	if (entryPtr) {
94		Ttk_StateMap stateMap = Tcl_GetHashValue(entryPtr);
	87	Ttk_StateMap stateMap = (Ttk_StateMap)Tcl_GetHashValue(entryPtr);
95	88	return Ttk_StateMapLookup(NULL, stateMap, state);
96	89	}
97	90	style = style->parentStyle;

109	102	Tcl_HashEntry *entryPtr =
110	103	Tcl_FindHashEntry(&style->defaultsTable, optionName);
111	104	if (entryPtr)
112		return Tcl_GetHashValue(entryPtr);
	105	return (Tcl_Obj *)Tcl_GetHashValue(entryPtr);
113	106	style= style->parentStyle;
114	107	}
115	108	return 0;

182	175	static OptionMap
183	176	BuildOptionMap(Ttk_ElementClass *elementClass, Tk_OptionTable optionTable)
184	177	{
185		OptionMap optionMap = ckalloc(
	178	OptionMap optionMap = (OptionMap)ckalloc(
186	179	sizeof(const Tk_OptionSpec) * elementClass->nResources + 1);
187	180	int i;
188	181

210	203	optionMap = BuildOptionMap(elementClass, optionTable);
211	204	Tcl_SetHashValue(entryPtr, optionMap);
212	205	} else {
213		optionMap = Tcl_GetHashValue(entryPtr);
	206	optionMap = (OptionMap)Tcl_GetHashValue(entryPtr);
214	207	}
215	208
216	209	return optionMap;

224	217	static Ttk_ElementClass *
225	218	NewElementClass(const char name, Ttk_ElementSpec specPtr,void *clientData)
226	219	{
227		Ttk_ElementClass *elementClass = ckalloc(sizeof(Ttk_ElementClass));
	220	Ttk_ElementClass elementClass = (Ttk_ElementClass )ckalloc(sizeof(Ttk_ElementClass));
228	221	int i;
229	222
230	223	elementClass->name = name;

240	233
241	234	/* Initialize default values:
242	235	*/
243		elementClass->defaultValues =
	236	elementClass->defaultValues = (Tcl_Obj **)
244	237	ckalloc(elementClass->nResources * sizeof(Tcl_Obj *) + 1);
245	238	for (i=0; i < elementClass->nResources; ++i) {
246	239	const char *defaultValue = specPtr->options[i].defaultValue;

297	290	* +++ Themes.
298	291	*/
299	292
300		static int ThemeEnabled(Ttk_Theme theme, void *clientData) { return 1; }
	293	static int ThemeEnabled(
	294	TCL_UNUSED(Ttk_Theme),
	295	TCL_UNUSED(void *))
	296	{
301	297	/* Default ThemeEnabledProc -- always return true */
	298	return 1;
	299	}
302	300
303	301	typedef struct Ttk_Theme_
304	302	{

313	311
314	312	static Theme *NewTheme(Ttk_ResourceCache cache, Ttk_Theme parent)
315	313	{
316		Theme *themePtr = ckalloc(sizeof(Theme));
	314	Theme themePtr = (Theme )ckalloc(sizeof(Theme));
317	315	Tcl_HashEntry *entryPtr;
318	316	int unused;
319	317

330	328	entryPtr = Tcl_CreateHashEntry(&themePtr->styleTable, ".", &unused);
331	329	themePtr->rootStyle = NewStyle();
332	330	themePtr->rootStyle->styleName =
333		Tcl_GetHashKey(&themePtr->styleTable, entryPtr);
	331	(const char *)Tcl_GetHashKey(&themePtr->styleTable, entryPtr);
334	332	themePtr->rootStyle->cache = themePtr->cache;
335	333	Tcl_SetHashValue(entryPtr, themePtr->rootStyle);
336	334

347	345	*/
348	346	entryPtr = Tcl_FirstHashEntry(&themePtr->elementTable, &search);
349	347	while (entryPtr != NULL) {
350		Ttk_ElementClass *elementClass = Tcl_GetHashValue(entryPtr);
	348	Ttk_ElementClass elementClass = (Ttk_ElementClass )Tcl_GetHashValue(entryPtr);
351	349	FreeElementClass(elementClass);
352	350	entryPtr = Tcl_NextHashEntry(&search);
353	351	}

358	356	*/
359	357	entryPtr = Tcl_FirstHashEntry(&themePtr->styleTable, &search);
360	358	while (entryPtr != NULL) {
361		Style *stylePtr = Tcl_GetHashValue(entryPtr);
	359	Style stylePtr = (Style )Tcl_GetHashValue(entryPtr);
362	360	FreeStyle(stylePtr);
363	361	entryPtr = Tcl_NextHashEntry(&search);
364	362	}

390	388	} Cleanup;
391	389
392	390	/*------------------------------------------------------------------------
393		* +++ Master style package data structure.
	391	* +++ Style package data structure.
394	392	*/
395	393	typedef struct
396	394	{

404	402	int themeChangePending; /* scheduled ThemeChangedProc call? */
405	403	} StylePackageData;
406	404
407		static void ThemeChangedProc(ClientData); /* Forward */
	405	static void ThemeChangedProc(void ); / Forward */
408	406
409	407	/* Ttk_StylePkgFree --
410	408	* Cleanup procedure for StylePackageData.
411	409	*/
412		static void Ttk_StylePkgFree(ClientData clientData, Tcl_Interp *interp)
413		{
414		StylePackageData *pkgPtr = clientData;
	410	static void Ttk_StylePkgFree(
	411	ClientData clientData,
	412	TCL_UNUSED(Tcl_Interp *))
	413	{
	414	StylePackageData pkgPtr = (StylePackageData )clientData;
415	415	Tcl_HashSearch search;
416	416	Tcl_HashEntry *entryPtr;
417	417	Cleanup *cleanup;

428	428	*/
429	429	entryPtr = Tcl_FirstHashEntry(&pkgPtr->themeTable, &search);
430	430	while (entryPtr != NULL) {
431		Theme *themePtr = Tcl_GetHashValue(entryPtr);
	431	Theme themePtr = (Theme )Tcl_GetHashValue(entryPtr);
432	432	FreeTheme(themePtr);
433	433	entryPtr = Tcl_NextHashEntry(&search);
434	434	}

470	470
471	471	static StylePackageData GetStylePackageData(Tcl_Interp interp)
472	472	{
473		return Tcl_GetAssocData(interp, PKG_ASSOC_KEY, NULL);
	473	return (StylePackageData *)Tcl_GetAssocData(interp, PKG_ASSOC_KEY, NULL);
474	474	}
475	475
476	476	/*

485	485	void Ttk_RegisterCleanup(
486	486	Tcl_Interp interp, ClientData clientData, Ttk_CleanupProc cleanupProc)
487	487	{
488		StylePackageData *pkgPtr = GetStylePackageData(interp);
489		Cleanup cleanup = ckalloc(sizeof(cleanup));
	488	StylePackageData pkgPtr = (StylePackageData )GetStylePackageData(interp);
	489	Cleanup cleanup = (Cleanup )ckalloc(sizeof(*cleanup));
490	490
491	491	cleanup->clientData = clientData;
492	492	cleanup->cleanupProc = cleanupProc;

509	509	static void ThemeChangedProc(ClientData clientData)
510	510	{
511	511	static char ThemeChangedScript[] = "ttk::ThemeChanged";
512		StylePackageData *pkgPtr = clientData;
	512	StylePackageData pkgPtr = (StylePackageData )clientData;
513	513
514	514	int code = Tcl_EvalEx(pkgPtr->interp, ThemeChangedScript, -1, TCL_EVAL_GLOBAL);
515	515	if (code != TCL_OK) {
516	516	Tcl_BackgroundException(pkgPtr->interp, code);
517	517	}
518	518	pkgPtr->themeChangePending = 0;
519		UPDATE_WINDOWS();
520	519	}
521	520
522	521	/*

590	589
591	590	static Ttk_Theme LookupTheme(
592	591	Tcl_Interp interp, / where to leave error messages */
593		StylePackageData pkgPtr, / style package master record */
	592	StylePackageData pkgPtr, / style package record */
594	593	const char name) / theme name */
595	594	{
596	595	Tcl_HashEntry *entryPtr;

603	602	return NULL;
604	603	}
605	604
606		return Tcl_GetHashValue(entryPtr);
	605	return (Ttk_Theme)Tcl_GetHashValue(entryPtr);
607	606	}
608	607
609	608	/*

711	710	stylePtr->parentStyle = themePtr->rootStyle;
712	711	}
713	712
714		stylePtr->styleName = Tcl_GetHashKey(&themePtr->styleTable, entryPtr);
	713	stylePtr->styleName = (const char *)Tcl_GetHashKey(&themePtr->styleTable, entryPtr);
715	714	stylePtr->cache = stylePtr->parentStyle->cache;
716	715	Tcl_SetHashValue(entryPtr, stylePtr);
717	716	return stylePtr;
718	717	}
719		return Tcl_GetHashValue(entryPtr);
	718	return (Ttk_Style)Tcl_GetHashValue(entryPtr);
720	719	}
721	720
722	721	/* FindLayoutTemplate --

762	761	*/
763	762	entryPtr = Tcl_FindHashEntry(&themePtr->elementTable, elementName);
764	763	if (entryPtr) {
765		return Tcl_GetHashValue(entryPtr);
	764	return (Ttk_ElementClass *)Tcl_GetHashValue(entryPtr);
766	765	}
767	766
768	767	/*

773	772	entryPtr = Tcl_FindHashEntry(&themePtr->elementTable, dot);
774	773	}
775	774	if (entryPtr) {
776		return Tcl_GetHashValue(entryPtr);
	775	return (Ttk_ElementClass *)Tcl_GetHashValue(entryPtr);
777	776	}
778	777
779	778	/*

789	788	*/
790	789	entryPtr = Tcl_FindHashEntry(&themePtr->elementTable, "");
791	790	/* ASSERT: entryPtr != 0 */
792		return Tcl_GetHashValue(entryPtr);
	791	return (Ttk_ElementClass *)Tcl_GetHashValue(entryPtr);
793	792	}
794	793
795	794	const char Ttk_ElementClassName(Ttk_ElementClass elementClass)

806	805	Ttk_ElementFactory factory, void *clientData)
807	806	{
808	807	StylePackageData *pkgPtr = GetStylePackageData(interp);
809		FactoryRec recPtr = ckalloc(sizeof(recPtr));
	808	FactoryRec recPtr = (FactoryRec )ckalloc(sizeof(*recPtr));
810	809	Tcl_HashEntry *entryPtr;
811	810	int newEntry;
812	811

827	826	* (style element create $name) "from" $theme ?$element?
828	827	*/
829	828	static int Ttk_CloneElement(
830		Tcl_Interp interp, void clientData,
	829	Tcl_Interp interp, TCL_UNUSED(void ),
831	830	Ttk_Theme theme, const char *elementName,
832	831	int objc, Tcl_Obj *const objv[])
833	832	{

902	901	return 0;
903	902	}
904	903
905		name = Tcl_GetHashKey(&theme->elementTable, entryPtr);
	904	name = (char *)Tcl_GetHashKey(&theme->elementTable, entryPtr);
906	905	elementClass = NewElementClass(name, specPtr, clientData);
907	906	Tcl_SetHashValue(entryPtr, elementClass);
908	907

991	990	int i;
992	991	for (i=0; i<nResources; ++i, ++elementOption) {
993	992	Tcl_Obj dest = (Tcl_Obj )
994		(elementRecord + elementOption->offset);
	993	((char *)elementRecord + elementOption->offset);
995	994	const char *optionName = elementOption->optionName;
996	995	Tcl_Obj *dynamicSetting = Ttk_StyleMap(style, optionName, state);
997	996	Tcl_Obj *widgetValue = 0;

999	998
1000	999	if (optionMap[i]) {
1001	1000	widgetValue = (Tcl_Obj *)
1002		(widgetRecord + optionMap[i]->objOffset);
	1001	((char *)widgetRecord + optionMap[i]->objOffset);
1003	1002	}
1004	1003
1005	1004	if (widgetValue) {

1141	1140	Tcl_HashEntry *entryPtr = Tcl_FirstHashEntry(ht, &search);
1142	1141
1143	1142	while (entryPtr != NULL) {
1144		Tcl_Obj *nameObj = Tcl_NewStringObj(Tcl_GetHashKey(ht, entryPtr),-1);
	1143	Tcl_Obj nameObj = Tcl_NewStringObj((const char )Tcl_GetHashKey(ht, entryPtr),-1);
1145	1144	Tcl_ListObjAppendElement(interp, result, nameObj);
1146	1145	entryPtr = Tcl_NextHashEntry(&search);
1147	1146	}

1161	1160	Tcl_HashEntry *entryPtr = Tcl_FirstHashEntry(ht, &search);
1162	1161
1163	1162	while (entryPtr != NULL) {
1164		Tcl_Obj *nameObj = Tcl_NewStringObj(Tcl_GetHashKey(ht, entryPtr),-1);
1165		Tcl_Obj *valueObj = Tcl_GetHashValue(entryPtr);
	1163	Tcl_Obj nameObj = Tcl_NewStringObj((const char )Tcl_GetHashKey(ht, entryPtr),-1);
	1164	Tcl_Obj valueObj = (Tcl_Obj )Tcl_GetHashValue(entryPtr);
1166	1165	Tcl_ListObjAppendElement(NULL, result, nameObj);
1167	1166	Tcl_ListObjAppendElement(NULL, result, valueObj);
1168	1167	entryPtr = Tcl_NextHashEntry(&search);

1178	1177	*/
1179	1178	static int
1180	1179	StyleMapCmd(
1181		ClientData clientData, /* Master StylePackageData pointer */
	1180	ClientData clientData, /* StylePackageData pointer */
1182	1181	Tcl_Interp interp, / Current interpreter */
1183	1182	int objc, /* Number of arguments */
1184	1183	Tcl_Obj const objv[]) / Argument objects */
1185	1184	{
1186		StylePackageData *pkgPtr = clientData;
	1185	StylePackageData pkgPtr = (StylePackageData )clientData;
1187	1186	Ttk_Theme theme = pkgPtr->currentTheme;
1188	1187	const char *styleName;
1189	1188	Style *stylePtr;

1247	1246	static int StyleConfigureCmd(
1248	1247	ClientData clientData, Tcl_Interp interp, int objc, Tcl_Obj const objv[])
1249	1248	{
1250		StylePackageData *pkgPtr = clientData;
	1249	StylePackageData pkgPtr = (StylePackageData )clientData;
1251	1250	Ttk_Theme theme = pkgPtr->currentTheme;
1252	1251	const char *styleName;
1253	1252	Style *stylePtr;

1302	1301	static int StyleLookupCmd(
1303	1302	ClientData clientData, Tcl_Interp interp, int objc, Tcl_Obj const objv[])
1304	1303	{
1305		StylePackageData *pkgPtr = clientData;
	1304	StylePackageData pkgPtr = (StylePackageData )clientData;
1306	1305	Ttk_Theme theme = pkgPtr->currentTheme;
1307	1306	Ttk_Style style = NULL;
1308	1307	const char *optionName;

1344	1343	static int StyleThemeCurrentCmd(
1345	1344	ClientData clientData, Tcl_Interp interp, int objc, Tcl_Obj const objv[])
1346	1345	{
1347		StylePackageData *pkgPtr = clientData;
	1346	StylePackageData pkgPtr = (StylePackageData )clientData;
1348	1347	Tcl_HashSearch search;
1349	1348	Tcl_HashEntry *entryPtr = NULL;
1350	1349	const char *name = NULL;

1356	1355
1357	1356	entryPtr = Tcl_FirstHashEntry(&pkgPtr->themeTable, &search);
1358	1357	while (entryPtr != NULL) {
1359		Theme *ptr = Tcl_GetHashValue(entryPtr);
	1358	Theme ptr = (Theme )Tcl_GetHashValue(entryPtr);
1360	1359	if (ptr == pkgPtr->currentTheme) {
1361		name = Tcl_GetHashKey(&pkgPtr->themeTable, entryPtr);
	1360	name = (char *)Tcl_GetHashKey(&pkgPtr->themeTable, entryPtr);
1362	1361	break;
1363	1362	}
1364	1363	entryPtr = Tcl_NextHashEntry(&search);

1380	1379	static int StyleThemeCreateCmd(
1381	1380	ClientData clientData, Tcl_Interp interp, int objc, Tcl_Obj const objv[])
1382	1381	{
1383		StylePackageData *pkgPtr = clientData;
	1382	StylePackageData pkgPtr = (StylePackageData )clientData;
1384	1383	static const char *optStrings[] =
1385	1384	{ "-parent", "-settings", NULL };
1386	1385	enum { OP_PARENT, OP_SETTINGS };

1442	1441	* Return list of registered themes.
1443	1442	*/
1444	1443	static int StyleThemeNamesCmd(
1445		ClientData clientData, Tcl_Interp interp, int objc, Tcl_Obj const objv[])
1446		{
1447		StylePackageData *pkgPtr = clientData;
	1444	ClientData clientData,
	1445	Tcl_Interp *interp,
	1446	TCL_UNUSED(int),
	1447	TCL_UNUSED(Tcl_Obj const ))
	1448	{
	1449	StylePackageData pkgPtr = (StylePackageData )clientData;
	1450
1448	1451	return TtkEnumerateHashTable(interp, &pkgPtr->themeTable);
1449	1452	}
1450	1453

1455	1458	*/
1456	1459	static int
1457	1460	StyleThemeSettingsCmd(
1458		ClientData clientData, /* Master StylePackageData pointer */
	1461	ClientData clientData, /* StylePackageData pointer */
1459	1462	Tcl_Interp interp, / Current interpreter */
1460	1463	int objc, /* Number of arguments */
1461	1464	Tcl_Obj const objv[]) / Argument objects */
1462	1465	{
1463		StylePackageData *pkgPtr = clientData;
	1466	StylePackageData pkgPtr = (StylePackageData )clientData;
1464	1467	Ttk_Theme oldTheme = pkgPtr->currentTheme;
1465	1468	Ttk_Theme newTheme;
1466	1469	int status;

1486	1489	static int StyleElementCreateCmd(
1487	1490	ClientData clientData, Tcl_Interp interp, int objc, Tcl_Obj const objv[])
1488	1491	{
1489		StylePackageData *pkgPtr = clientData;
	1492	StylePackageData pkgPtr = (StylePackageData )clientData;
1490	1493	Ttk_Theme theme = pkgPtr->currentTheme;
1491	1494	const char elementName, factoryName;
1492	1495	Tcl_HashEntry *entryPtr;

1509	1512	return TCL_ERROR;
1510	1513	}
1511	1514
1512		recPtr = Tcl_GetHashValue(entryPtr);
	1515	recPtr = (FactoryRec *)Tcl_GetHashValue(entryPtr);
1513	1516
1514	1517	return recPtr->factory(interp, recPtr->clientData,
1515	1518	theme, elementName, objc - 5, objv + 5);

1521	1524	static int StyleElementNamesCmd(
1522	1525	ClientData clientData, Tcl_Interp interp, int objc, Tcl_Obj const objv[])
1523	1526	{
1524		StylePackageData *pkgPtr = clientData;
	1527	StylePackageData pkgPtr = (StylePackageData )clientData;
1525	1528	Ttk_Theme theme = pkgPtr->currentTheme;
1526	1529
1527	1530	if (objc != 3) {

1537	1540	static int StyleElementOptionsCmd(
1538	1541	ClientData clientData, Tcl_Interp interp, int objc, Tcl_Obj const objv[])
1539	1542	{
1540		StylePackageData *pkgPtr = clientData;
	1543	StylePackageData pkgPtr = (StylePackageData )clientData;
1541	1544	Ttk_Theme theme = pkgPtr->currentTheme;
1542	1545	const char *elementName;
1543	1546	Ttk_ElementClass *elementClass;

1575	1578	static int StyleLayoutCmd(
1576	1579	ClientData clientData, Tcl_Interp interp, int objc, Tcl_Obj const objv[])
1577	1580	{
1578		StylePackageData *pkgPtr = clientData;
	1581	StylePackageData pkgPtr = (StylePackageData )clientData;
1579	1582	Ttk_Theme theme = pkgPtr->currentTheme;
1580	1583	const char *layoutName;
1581	1584	Ttk_LayoutTemplate layoutTemplate;

1613	1616	*/
1614	1617	static int
1615	1618	StyleThemeUseCmd(
1616		ClientData clientData, /* Master StylePackageData pointer */
	1619	ClientData clientData, /* StylePackageData pointer */
1617	1620	Tcl_Interp interp, / Current interpreter */
1618	1621	int objc, /* Number of arguments */
1619	1622	Tcl_Obj const objv[]) / Argument objects */
1620	1623	{
1621		StylePackageData *pkgPtr = clientData;
	1624	StylePackageData pkgPtr = (StylePackageData )clientData;
1622	1625	Ttk_Theme theme;
1623	1626
1624	1627	if (objc < 3 \|\| objc > 4) {

1670	1673
1671	1674	static int
1672	1675	StyleObjCmd(
1673		ClientData clientData, /* Master StylePackageData pointer */
	1676	ClientData clientData, /* StylePackageData pointer */
1674	1677	Tcl_Interp interp, / Current interpreter */
1675	1678	int objc, /* Number of arguments */
1676	1679	Tcl_Obj const objv[]) / Argument objects */

1713	1716	{
1714	1717	Tcl_Namespace *nsPtr;
1715	1718
1716		StylePackageData *pkgPtr = ckalloc(sizeof(StylePackageData));
	1719	StylePackageData pkgPtr = (StylePackageData )ckalloc(sizeof(StylePackageData));
1717	1720
1718	1721	pkgPtr->interp = interp;
1719	1722	Tcl_InitHashTable(&pkgPtr->themeTable, TCL_STRING_KEYS);

+10

-8

generic/ttk/ttkTrace.c less more

2	2	*
3	3	* Simplified interface to Tcl_TraceVariable.
4	4	*
5		* PROBLEM: Can't distinguish "variable does not exist" (which is OK)
	5	* PROBLEM: Can't distinguish "variable does not exist" (which is OK)
6	6	* from other errors (which are not).
7	7	*/
8	8
9		#include <tk.h>
	9	#include "tkInt.h"
10	10	#include "ttkTheme.h"
11	11	#include "ttkWidget.h"
12	12

29	29	const char name2, / (unused) */
30	30	int flags) /* Information about what happened. */
31	31	{
32		Ttk_TraceHandle *tracePtr = clientData;
	32	Ttk_TraceHandle tracePtr = (Ttk_TraceHandle )clientData;
33	33	const char name, value;
34	34	Tcl_Obj *valuePtr;
	35	(void)name1;
	36	(void)name2;
35	37
36	38	if (Tcl_InterpDeleted(interp)) {
37	39	return NULL;

50	52	*/
51	53	if (tracePtr->interp == NULL) {
52	54	Tcl_DecrRefCount(tracePtr->varnameObj);
53		ckfree((ClientData)tracePtr);
	55	ckfree(tracePtr);
54	56	return NULL;
55	57	}
56	58	Tcl_TraceVar2(interp, name, NULL,

84	86	Ttk_TraceProc callback,
85	87	void *clientData)
86	88	{
87		Ttk_TraceHandle h = ckalloc(sizeof(h));
	89	Ttk_TraceHandle h = (Ttk_TraceHandle )ckalloc(sizeof(*h));
88	90	int status;
89	91
90	92	h->interp = interp;

95	97
96	98	status = Tcl_TraceVar2(interp, Tcl_GetString(varnameObj),
97	99	NULL, TCL_GLOBAL_ONLY\|TCL_TRACE_WRITES\|TCL_TRACE_UNSETS,
98		VarTraceProc, (ClientData)h);
	100	VarTraceProc, h);
99	101
100	102	if (status != TCL_OK) {
101	103	Tcl_DecrRefCount(h->varnameObj);

136	138	*/
137	139	while ((cd = Tcl_VarTraceInfo(h->interp, Tcl_GetString(h->varnameObj),
138	140	TCL_GLOBAL_ONLY, VarTraceProc, cd)) != NULL) {
139		if (cd == (ClientData) h) {
	141	if (cd == h) {
140	142	break;
141	143	}
142	144	}

151	153	}
152	154	Tcl_UntraceVar2(h->interp, Tcl_GetString(h->varnameObj),
153	155	NULL, TCL_GLOBAL_ONLY\|TCL_TRACE_WRITES\|TCL_TRACE_UNSETS,
154		VarTraceProc, (ClientData)h);
	156	VarTraceProc, h);
155	157	Tcl_DecrRefCount(h->varnameObj);
156	158	ckfree(h);
157	159	}

+1

-1

generic/ttk/ttkTrack.c less more

22	22	* TODO: Handle "chords" properly (e.g., <B1-ButtonPress-2>)
23	23	*/
24	24
25		#include <tk.h>
	25	#include "tkInt.h"
26	26	#include "ttkTheme.h"
27	27	#include "ttkWidget.h"
28	28

+2

-6

generic/ttk/ttkTreeview.c less more

3	3	* ttk::treeview widget implementation.
4	4	*/
5	5
6		#include <string.h>
7		#include <stdio.h>
8	6	#include "tkInt.h"
9	7	#include "ttkTheme.h"
10	8	#include "ttkWidget.h"

1778	1776	x+indent, y, colwidth-indent, rowHeight);
1779	1777	if (item->textObj) { displayItem.textObj = item->textObj; }
1780	1778	if (item->imageObj) { displayItem.imageObj = item->imageObj; }
1781		/* ??? displayItem.anchorObj = 0; <<NOTE-ANCHOR>> */
	1779	displayItem.anchorObj = tv->tree.column0.anchorObj;
1782	1780	DisplayLayout(tv->tree.itemLayout, &displayItem, state, parcel, d);
1783	1781	x += colwidth;
1784	1782	}

2841	2839	TtkRedisplayWidget(&tv->core);
2842	2840	}
2843	2841	}
2844		tv->tree.yscroll.total = CountRows(tv->tree.root) - 1;
2845	2842
2846	2843	/* Make sure item is visible:
2847	2844	*/

3320	3317	TTK_GROUP("Treeitem.padding", TTK_FILL_BOTH,
3321	3318	TTK_NODE("Treeitem.indicator", TTK_PACK_LEFT)
3322	3319	TTK_NODE("Treeitem.image", TTK_PACK_LEFT)
3323		TTK_GROUP("Treeitem.focus", TTK_PACK_LEFT,
3324		TTK_NODE("Treeitem.text", TTK_PACK_LEFT))))
	3320	TTK_NODE("Treeitem.text", TTK_FILL_BOTH)))
3325	3321
3326	3322	TTK_LAYOUT("Cell",
3327	3323	TTK_GROUP("Treedata.padding", TTK_FILL_BOTH,

+6

-4

generic/ttk/ttkWidget.c less more

3	3	* Core widget utilities.
4	4	*/
5	5
6		#include <string.h>
7	6	#include "tkInt.h"
8	7	#include "ttkTheme.h"
9	8	#include "ttkWidget.h"

262	261
263	262	static void CoreEventProc(ClientData clientData, XEvent *eventPtr)
264	263	{
265		WidgetCore *corePtr = clientData;
	264	WidgetCore corePtr = (WidgetCore )clientData;
266	265
267	266	switch (eventPtr->type)
268	267	{

309	308	corePtr->state \|= TTK_STATE_HOVER;
310	309	TtkRedisplayWidget(corePtr);
311	310	break;
312		case VirtualEvent:
313		if (!strcmp("ThemeChanged", ((XVirtualEvent *)(eventPtr))->name)) {
	311	case VirtualEvent: {
	312	const char name = ((XVirtualEvent )eventPtr)->name;
	313	if ((name != NULL) && !strcmp("ThemeChanged", name)) {
314	314	(void)UpdateLayout(corePtr->interp, corePtr);
315	315	SizeChanged(corePtr);
316	316	TtkRedisplayWidget(corePtr);
317	317	}
	318	break;
	319	}
318	320	default:
319	321	/* can't happen... */
320	322	break;

+2

-2

generic/ttk/ttkWidget.h less more

110	110
111	111	/* WIDGET_TAKEFOCUS_TRUE --
112	112	* WIDGET_TAKEFOCUS_FALSE --
113		* Add one or the other of these to each OptionSpecs table
114		* to indicate whether the widget should take focus
	113	* Add one or the other of these to each OptionSpecs table
	114	* to indicate whether the widget should take focus
115	115	* during keyboard traversal.
116	116	*/
117	117	#define WIDGET_TAKEFOCUS_TRUE \

+6

-6

library/bgerror.tcl less more

40	40	set w .bgerrorDialog
41	41	set caption [option get $w.function text {}]
42	42	set command [option get $w.function command {}]
43		if { ($caption eq "") \|\| ($command eq "") } {
	43	if {($caption eq "") \|\| ($command eq "")} {
44	44	grid forget $w.function
45	45	}
46	46	lappend command [$w.top.info.text get 1.0 end-1c]

49	49	}
50	50
51	51	proc ::tk::dialog::error::SaveToLog {text} {
52		if { $::tcl_platform(platform) eq "windows" } {
	52	if {$::tcl_platform(platform) eq "windows"} {
53	53	set allFiles .
54	54	} else {
55	55	set allFiles *

128	128	set lines 0
129	129	set maxLine 45
130	130	foreach line [split $err \n] {
131		if { [string length $line] > $maxLine } {
132		append displayedErr "[string range $line 0 [expr {$maxLine-3}]]..."
	131	if {[string length $line] > $maxLine} {
	132	append displayedErr "[string range $line 0 $maxLine-3]..."
133	133	break
134	134	}
135		if { $lines > 4 } {
	135	if {$lines > 4} {
136	136	append displayedErr "..."
137	137	break
138	138	} else {

181	181	pack $W.text -side left -expand yes -fill both
182	182	$W.text insert 0.0 "$err\n$info"
183	183	$W.text mark set insert 0.0
184		bind $W.text <ButtonPress-1> { focus %W }
	184	bind $W.text <Button-1> {focus %W}
185	185	$W.text configure -state disabled
186	186
187	187	# 2. Fill the top part with bitmap and message

+3

-3

library/clrpick.tcl less more

395	395
396	396	# Draw the selection polygons
397	397	CreateSelector $w $sel $c
398		$sel bind $data($c,index) <ButtonPress-1> \
	398	$sel bind $data($c,index) <Button-1> \
399	399	[list tk::dialog::color::StartMove $w $sel $c %x $data(selPad) 1]
400	400	$sel bind $data($c,index) <B1-Motion> \
401	401	[list tk::dialog::color::MoveSelector $w $sel $c %x $data(selPad)]

408	408	set data($c,clickRegion) [$sel create rectangle 0 0 \
409	409	$data(canvasWidth) $height -fill {} -outline {}]
410	410
411		bind $col <ButtonPress-1> \
	411	bind $col <Button-1> \
412	412	[list tk::dialog::color::StartMove $w $sel $c %x $data(colorPad)]
413	413	bind $col <B1-Motion> \
414	414	[list tk::dialog::color::MoveSelector $w $sel $c %x $data(colorPad)]
415	415	bind $col <ButtonRelease-1> \
416	416	[list tk::dialog::color::ReleaseMouse $w $sel $c %x $data(colorPad)]
417	417
418		$sel bind $data($c,clickRegion) <ButtonPress-1> \
	418	$sel bind $data($c,clickRegion) <Button-1> \
419	419	[list tk::dialog::color::StartMove $w $sel $c %x $data(selPad)]
420	420	$sel bind $data($c,clickRegion) <B1-Motion> \
421	421	[list tk::dialog::color::MoveSelector $w $sel $c %x $data(selPad)]

+6

-3

library/comdlg.tcl less more

28	28	# {....}
29	29	# }
30	30	#
31		# flags = currently unused.
	31	# flags = a list of flags. Currently supported flags are:
	32	# DONTSETDEFAULTS = skip default values setting
32	33	#
33	34	# argList = The list of "-option value" pairs.
34	35	#

62	63
63	64	# 2: set the default values
64	65	#
65		foreach cmdsw [array names cmd] {
66		set data($cmdsw) $def($cmdsw)
	66	if {"DONTSETDEFAULTS" ni $flags} {
	67	foreach cmdsw [array names cmd] {
	68	set data($cmdsw) $def($cmdsw)
	69	}
67	70	}
68	71
69	72	# 3: parse the argument list

+5

-5

library/console.tcl less more

130	130	default { set preferred {} }
131	131	}
132	132	foreach {family size} $preferred {
133		if {[lsearch -exact $families $family] != -1} {
	133	if {$family in $families} {
134	134	font configure TkConsoleFont -family $family -size $size
135	135	break
136	136	}

591	591	}
592	592	bind Console <F9> {
593	593	eval destroy [winfo child .]
594		source [file join $tk_library console.tcl]
	594	source -encoding utf-8 [file join $tk_library console.tcl]
595	595	}
596	596	if {[tk windowingsystem] eq "aqua"} {
597	597	bind Console <Command-q> {

739	739	}
740	740	proc ::tk::console::FontchooserVisibility {index} {
741	741	if {[tk fontchooser configure -visible]} {
742		.menubar.edit entryconfigure $index -label [msgcat::mc "Hide Fonts"]
743		} else {
744		.menubar.edit entryconfigure $index -label [msgcat::mc "Show Fonts"]
	742	.menubar.edit entryconfigure $index -label [::tk::msgcat::mc "Hide Fonts"]
	743	} else {
	744	.menubar.edit entryconfigure $index -label [::tk::msgcat::mc "Show Fonts"]
745	745	}
746	746	}
747	747	proc ::tk::console::FontchooserFocus {w isFocusIn} {

+4

-4

library/demos/arrow.tcl less more

153	153	$c bind box <Leave> "$c itemconfigure current $demo_arrowInfo(boxStyle)"
154	154	$c bind box <B1-Enter> " "
155	155	$c bind box <B1-Leave> " "
156		$c bind box1 <1> {set demo_arrowInfo(motionProc) arrowMove1}
157		$c bind box2 <1> {set demo_arrowInfo(motionProc) arrowMove2}
158		$c bind box3 <1> {set demo_arrowInfo(motionProc) arrowMove3}
	156	$c bind box1 <Button-1> {set demo_arrowInfo(motionProc) arrowMove1}
	157	$c bind box2 <Button-1> {set demo_arrowInfo(motionProc) arrowMove2}
	158	$c bind box3 <Button-1> {set demo_arrowInfo(motionProc) arrowMove3}
159	159	$c bind box <B1-Motion> "\$demo_arrowInfo(motionProc) $c %x %y"
160		bind $c <Any-ButtonRelease-1> "arrowSetup $c"
	160	bind $c <ButtonRelease-1> "arrowSetup $c"
161	161
162	162	# arrowMove1 --
163	163	# This procedure is called for each mouse motion event on box1 (the

+8

-8

library/demos/bind.tcl less more

62	62	# Create bindings for tags.
63	63
64	64	foreach tag {d1 d2 d3 d4 d5 d6} {
65		$w.text tag bind $tag <Any-Enter> "$w.text tag configure $tag $bold"
66		$w.text tag bind $tag <Any-Leave> "$w.text tag configure $tag $normal"
	65	$w.text tag bind $tag <Enter> "$w.text tag configure $tag $bold"
	66	$w.text tag bind $tag <Leave> "$w.text tag configure $tag $normal"
67	67	}
68	68	# Main widget program sets variable tk_demoDirectory
69		$w.text tag bind d1 <1> {source [file join $tk_demoDirectory items.tcl]}
70		$w.text tag bind d2 <1> {source [file join $tk_demoDirectory plot.tcl]}
71		$w.text tag bind d3 <1> {source [file join $tk_demoDirectory ctext.tcl]}
72		$w.text tag bind d4 <1> {source [file join $tk_demoDirectory arrow.tcl]}
73		$w.text tag bind d5 <1> {source [file join $tk_demoDirectory ruler.tcl]}
74		$w.text tag bind d6 <1> {source [file join $tk_demoDirectory cscroll.tcl]}
	69	$w.text tag bind d1 <Button-1> {source -encoding utf-8 [file join $tk_demoDirectory items.tcl]}
	70	$w.text tag bind d2 <Button-1> {source -encoding utf-8 [file join $tk_demoDirectory plot.tcl]}
	71	$w.text tag bind d3 <Button-1> {source -encoding utf-8 [file join $tk_demoDirectory ctext.tcl]}
	72	$w.text tag bind d4 <Button-1> {source -encoding utf-8 [file join $tk_demoDirectory arrow.tcl]}
	73	$w.text tag bind d5 <Button-1> {source -encoding utf-8 [file join $tk_demoDirectory ruler.tcl]}
	74	$w.text tag bind d6 <Button-1> {source -encoding utf-8 [file join $tk_demoDirectory cscroll.tcl]}
75	75
76	76	$w.text mark set insert 0.0
77	77	$w.text configure -state disabled

+1

-1

library/demos/colors.tcl less more

31	31	-width 20 -height 16 -setgrid 1
32	32	pack $w.frame.list $w.frame.scroll -side left -fill y -expand 1
33	33
34		bind $w.frame.list <Double-1> {
	34	bind $w.frame.list <Double-Button-1> {
35	35	tk_setPalette [selection get]
36	36	}
37	37	$w.frame.list insert 0 gray60 gray70 gray80 gray85 gray90 gray95 \

+47

-17

library/demos/cscroll.tcl less more

52	52	}
53	53	}
54	54
55		$c bind all <Any-Enter> "scrollEnter $c"
56		$c bind all <Any-Leave> "scrollLeave $c"
57		$c bind all <1> "scrollButton $c"
58		bind $c <2> "$c scan mark %x %y"
59		bind $c <B2-Motion> "$c scan dragto %x %y"
60		if {[tk windowingsystem] eq "aqua"} {
	55	$c bind all <Enter> "scrollEnter $c"
	56	$c bind all <Leave> "scrollLeave $c"
	57	$c bind all <Button-1> "scrollButton $c"
	58	if {([tk windowingsystem] eq "aqua") && ![package vsatisfies [package provide Tk] 8.7-]} {
	59	bind $c <Button-3> "$c scan mark %x %y"
	60	bind $c <B3-Motion> "$c scan dragto %x %y"
61	61	bind $c <MouseWheel> {
62		%W yview scroll [expr {-(%D)}] units
	62	%W yview scroll [expr {-%D}] units
63	63	}
64	64	bind $c <Option-MouseWheel> {
65		%W yview scroll [expr {-10 * (%D)}] units
	65	%W yview scroll [expr {-10*%D}] units
66	66	}
67	67	bind $c <Shift-MouseWheel> {
68		%W xview scroll [expr {-(%D)}] units
	68	%W xview scroll [expr {-%D}] units
69	69	}
70	70	bind $c <Shift-Option-MouseWheel> {
71		%W xview scroll [expr {-10 * (%D)}] units
	71	%W xview scroll [expr {-10*%D}] units
72	72	}
73	73	} else {
	74	bind $c <Button-2> "$c scan mark %x %y"
	75	bind $c <B2-Motion> "$c scan dragto %x %y"
	76	# We must make sure that positive and negative movements are rounded
	77	# equally to integers, avoiding the problem that
	78	# (int)1/-30 = -1,
	79	# but
	80	# (int)-1/-30 = 0
	81	# The following code ensure equal +/- behaviour.
74	82	bind $c <MouseWheel> {
75		%W yview scroll [expr {-(%D / 30)}] units
	83	if {%D >= 0} {
	84	%W yview scroll [expr {%D/-30}] units
	85	} else {
	86	%W yview scroll [expr {(%D-29)/-30}] units
	87	}
	88	}
	89	bind $c <Option-MouseWheel> {
	90	if {%D >= 0} {
	91	%W yview scroll [expr {%D/-3}] units
	92	} else {
	93	%W yview scroll [expr {(%D-2)/-3}] units
	94	}
76	95	}
77	96	bind $c <Shift-MouseWheel> {
78		%W xview scroll [expr {-(%D / 30)}] units
	97	if {%D >= 0} {
	98	%W xview scroll [expr {%D/-30}] units
	99	} else {
	100	%W xview scroll [expr {(%D-29)/-30}] units
	101	}
	102	}
	103	bind $c <Shift-Option-MouseWheel> {
	104	if {%D >= 0} {
	105	%W xview scroll [expr {%D/-3}] units
	106	} else {
	107	%W xview scroll [expr {(%D-2)/-3}] units
	108	}
79	109	}
80	110	}
81	111
82		if {[tk windowingsystem] eq "x11"} {
	112	if {[tk windowingsystem] eq "x11" && ![package vsatisfies [package provide Tk] 8.7-]} {
83	113	# Support for mousewheels on Linux/Unix commonly comes through mapping
84	114	# the wheel to the extended buttons. If you have a mousewheel, find
85	115	# Linux configuration info at:
86	116	# http://linuxreviews.org/howtos/xfree/mouse/
87		bind $c <4> {
	117	bind $c <Button-4> {
88	118	if {!$tk_strictMotif} {
89	119	%W yview scroll -5 units
90	120	}
91	121	}
92		bind $c <Shift-4> {
	122	bind $c <Shift-Button-4> {
93	123	if {!$tk_strictMotif} {
94	124	%W xview scroll -5 units
95	125	}
96	126	}
97		bind $c <5> {
	127	bind $c <Button-5> {
98	128	if {!$tk_strictMotif} {
99	129	%W yview scroll 5 units
100	130	}
101	131	}
102		bind $c <Shift-5> {
	132	bind $c <Shift-Button-5> {
103	133	if {!$tk_strictMotif} {
104	134	%W xview scroll 5 units
105	135	}

+11

-7

library/demos/ctext.tcl less more

40	40	# First, create the text item and give it bindings so it can be edited.
41	41
42	42	$c addtag text withtag [$c create text 250 200 -text "This is just a string of text to demonstrate the text facilities of canvas widgets. Bindings have been defined to support editing (see above)." -width 440 -anchor n -font $textFont -justify left]
43		$c bind text <1> "textB1Press $c %x %y"
	43	$c bind text <Button-1> "textB1Press $c %x %y"
44	44	$c bind text <B1-Motion> "textB1Move $c %x %y"
45		$c bind text <Shift-1> "$c select adjust current @%x,%y"
	45	$c bind text <Shift-Button-1> "$c select adjust current @%x,%y"
46	46	$c bind text <Shift-B1-Motion> "textB1Move $c %x %y"
47		$c bind text <KeyPress> "textInsert $c %A"
	47	$c bind text <Key> "textInsert $c %A"
48	48	$c bind text <Return> "textInsert $c \\n"
49	49	$c bind text <Control-h> "textBs $c"
50	50	$c bind text <BackSpace> "textBs $c"
51	51	$c bind text <Delete> "textDel $c"
52		$c bind text <2> "textPaste $c @%x,%y"
	52	if {[tk windowingsystem] eq "aqua" && ![package vsatisfies [package provide Tk] 8.7-]} {
	53	$c bind text <Button-3> "textPaste $c @%x,%y"
	54	} else {
	55	$c bind text <Button-2> "textPaste $c @%x,%y"
	56	}
53	57
54	58	# Next, create some items that allow the text's anchor position
55	59	# to be edited.

57	61	proc mkTextConfigBox {w x y option value color} {
58	62	set item [$w create rect $x $y [expr {$x+30}] [expr {$y+30}] \
59	63	-outline black -fill $color -width 1]
60		$w bind $item <1> "$w itemconf text $option $value"
	64	$w bind $item <Button-1> "$w itemconf text $option $value"
61	65	$w addtag config withtag $item
62	66	}
63	67	proc mkTextConfigPie {w x y a option value color} {
64	68	set item [$w create arc $x $y [expr {$x+90}] [expr {$y+90}] \
65	69	-start [expr {$a-15}] -extent 30 -outline black -fill $color \
66	70	-width 1]
67		$w bind $item <1> "$w itemconf text $option $value"
	71	$w bind $item <Button-1> "$w itemconf text $option $value"
68	72	$w addtag config withtag $item
69	73	}
70	74

83	87	set item [$c create rect \
84	88	[expr {$x+40}] [expr {$y+40}] [expr {$x+50}] [expr {$y+50}] \
85	89	-outline black -fill red]
86		$c bind $item <1> "$c itemconf text -anchor center"
	90	$c bind $item <Button-1> "$c itemconf text -anchor center"
87	91	$c create text [expr {$x+45}] [expr {$y-5}] \
88	92	-text {Text Position} -anchor s -font {Times 20} -fill brown
89	93

+7

-7

library/demos/dialog1.tcl less more

1	1	#
2	2	# This demonstration script creates a dialog box with a local grab.
3	3
4		interp create slave
5		load {} Tk slave
6		slave eval {
7		wm title . slave
	4	interp create child
	5	load {} Tk child
	6	child eval {
	7	wm title . child
8	8	wm geometry . +700+30
9	9	pack [text .t -width 30 -height 10]
10	10	}
11	11
12	12	after idle {.dialog1.msg configure -wraplength 4i}
13		set i [tk_dialog .dialog1 "Dialog with local grab" {This is a modal dialog box. It uses Tk's "grab" command to create a "local grab" on the dialog box. The grab prevents any mouse or keyboard events from getting to any other windows in the application until you have answered the dialog by invoking one of the buttons below. However, you can still interact with other applications. For example, you should be able to edit text in the window named "slave" which was created by a slave interpreter.} \
	13	set i [tk_dialog .dialog1 "Dialog with local grab" {This is a modal dialog box. It uses Tk's "grab" command to create a "local grab" on the dialog box. The grab prevents any mouse or keyboard events from getting to any other windows in the application until you have answered the dialog by invoking one of the buttons below. However, you can still interact with other applications. For example, you should be able to edit text in the window named "child" which was created by a child interpreter.} \
14	14	info 0 OK Cancel {Show Code}]
15	15
16	16	switch $i {

19	19	2 {showCode .dialog1}
20	20	}
21	21
22		if {[interp exists slave]} {
23		interp delete slave
	22	if {[interp exists child]} {
	23	interp delete child
24	24	}

+1

-1

library/demos/entry1.tcl less more

15	15	wm iconname $w "entry1"
16	16	positionWindow $w
17	17
18		label $w.msg -font $font -wraplength 5i -justify left -text "Three different entries are displayed below. You can add characters by pointing, clicking and typing. The normal Motif editing characters are supported, along with many Emacs bindings. For example, Backspace and Control-h delete the character to the left of the insertion cursor and Delete and Control-d delete the chararacter to the right of the insertion cursor. For entries that are too large to fit in the window all at once, you can scan through the entries by dragging with mouse button2 pressed."
	18	label $w.msg -font $font -wraplength 5i -justify left -text "Three different entries are displayed below. You can add characters by pointing, clicking and typing. The normal Motif editing characters are supported, along with many Emacs bindings. For example, Backspace and Control-h delete the character to the left of the insertion cursor and Delete and Control-d delete the chararacter to the right of the insertion cursor. For entries that are too large to fit in the window all at once, you can scan through the entries by dragging with mouse the middle mouse button pressed."
19	19	pack $w.msg -side top
20	20
21	21	## See Code / Dismiss buttons

+1

-1

library/demos/entry2.tcl less more

15	15	wm iconname $w "entry2"
16	16	positionWindow $w
17	17
18		label $w.msg -font $font -wraplength 5i -justify left -text "Three different entries are displayed below, with a scrollbar for each entry. You can add characters by pointing, clicking and typing. The normal Motif editing characters are supported, along with many Emacs bindings. For example, Backspace and Control-h delete the character to the left of the insertion cursor and Delete and Control-d delete the chararacter to the right of the insertion cursor. For entries that are too large to fit in the window all at once, you can scan through the entries with the scrollbars, or by dragging with mouse button2 pressed."
	18	label $w.msg -font $font -wraplength 5i -justify left -text "Three different entries are displayed below, with a scrollbar for each entry. You can add characters by pointing, clicking and typing. The normal Motif editing characters are supported, along with many Emacs bindings. For example, Backspace and Control-h delete the character to the left of the insertion cursor and Delete and Control-d delete the chararacter to the right of the insertion cursor. For entries that are too large to fit in the window all at once, you can scan through the entries with the scrollbars, or by dragging with the middle mouse button pressed."
19	19	pack $w.msg -side top
20	20
21	21	## See Code / Dismiss buttons

+1

-1

library/demos/entry3.tcl less more

101	101
102	102	proc validatePhoneChange {W vmode idx char} {
103	103	global phoneNumberMap entry3content
104		if {$idx == -1} {return 1}
	104	if {$idx < 0} {return 1}
105	105	after idle [list $W configure -validate $vmode -invcmd bell]
106	106	if {
107	107	!($idx<3 \|\| $idx==6 \|\| $idx==7 \|\| $idx==11 \|\| $idx>15) &&

+10

-5

library/demos/floor.tcl less more

1353	1353
1354	1354	# Set up event bindings for canvas:
1355	1355
1356		$c bind floor1 <1> "floorDisplay $c 1"
1357		$c bind floor2 <1> "floorDisplay $c 2"
1358		$c bind floor3 <1> "floorDisplay $c 3"
	1356	$c bind floor1 <Button-1> "floorDisplay $c 1"
	1357	$c bind floor2 <Button-1> "floorDisplay $c 2"
	1358	$c bind floor3 <Button-1> "floorDisplay $c 3"
1359	1359	$c bind room <Enter> "newRoom $c"
1360	1360	$c bind room <Leave> {set currentRoom ""}
1361		bind $c <2> "$c scan mark %x %y"
1362		bind $c <B2-Motion> "$c scan dragto %x %y"
	1361	if {[tk windowingsystem] eq "aqua" && ![package vsatisfies [package provide Tk] 8.7-]} {
	1362	bind $c <Button-3> "$c scan mark %x %y"
	1363	bind $c <B3-Motion> "$c scan dragto %x %y"
	1364	} else {
	1365	bind $c <Button-2> "$c scan mark %x %y"
	1366	bind $c <B2-Motion> "$c scan dragto %x %y"
	1367	}
1363	1368	bind $c <Destroy> "unset currentRoom"
1364	1369	set currentRoom ""
1365	1370	trace variable currentRoom w "roomChanged $c"

+2

-4

library/demos/fontchoose.tcl less more

54	54	grid $f.font - -sticky e
55	55	grid columnconfigure $f 0 -weight 1
56	56	grid rowconfigure $f 0 -weight 1
57		bind $w <Visibility> {
58		bind %W <Visibility> {}
59		grid propagate %W.f 0
60		}
61	57
62	58	## See Code / Dismiss buttons
63	59	set btns [addSeeDismiss $w.buttons $w]

66	62	grid $btns -sticky ew
67	63	grid columnconfigure $w 0 -weight 1
68	64	grid rowconfigure $w 0 -weight 1
	65	update idletasks
	66	grid propagate $f 0

+6

-6

library/demos/goldberg.tcl less more

104	104	$w.c yview moveto .05
105	105	pack $w.c -in $w.screen -side top -fill both -expand 1
106	106
107		bind $w.c <3> [list $w.pause invoke]
	107	bind $w.c <Button-3> [list $w.pause invoke]
108	108	bind $w.c <Destroy> {
109	109	after cancel $animationCallbacks(goldberg)
110	110	unset animationCallbacks(goldberg)

161	161	grid $w.speed -in $w.ctrl -row 99 -sticky ew -pady {0 5}
162	162	pack $w.speed.scale -fill both -expand 1
163	163	grid $w.about -in $w.ctrl -row 100 -sticky ew
164		bind $w.reset <3> {set S(mode) -1} ;# Debugging
	164	bind $w.reset <Button-3> {set S(mode) -1} ;# Debugging
165	165
166	166	## See Code / Dismiss buttons hack!
167	167	set btns [addSeeDismiss $w.ctrl.buttons $w]

341	341	set xy {719 119 763 119}
342	342	$w.c create line $xy -tag I0 -fill $color -width 5 -arrow last \
343	343	-arrowshape {18 18 5}
344		$w.c bind I0 <1> Start
	344	$w.c bind I0 <Button-1> Start
345	345	}
346	346	proc Move0 {w {step {}}} {
347	347	set step [GetStep 0 $step]

371	371
372	372	set xy [box 812 122 9]
373	373	$w.c create oval $xy -tag I1 -fill $color2 -outline {}
374		$w.c bind I1 <1> Start
	374	$w.c bind I1 <Button-1> Start
375	375	}
376	376	proc Move1 {w {step {}}} {
377	377	set step [GetStep 1 $step]

1619	1619	$w.c delete I24 I26
1620	1620	$w.c create text 430 755 -anchor s -tag I26 \
1621	1621	-text "click to continue" -font {{Times Roman} 24 bold}
1622		bind $w.c <1> [list Reset $w]
	1622	bind $w.c <Button-1> [list Reset $w]
1623	1623	return 4
1624	1624	}
1625	1625

1674	1674	proc Reset {w} {
1675	1675	global S
1676	1676	DrawAll $w
1677		bind $w.c <1> {}
	1677	bind $w.c <Button-1> {}
1678	1678	set S(mode) $::MSTART
1679	1679	set S(active) 0
1680	1680	}

+1

-1

library/demos/image2.tcl less more

94	94	ttk::scrollbar $w.f.scroll -command "$w.f.list yview"
95	95	pack $w.f.list $w.f.scroll -side left -fill y -expand 1
96	96	$w.f.list insert 0 earth.gif earthris.gif teapot.ppm
97		bind $w.f.list <Double-1> "loadImage $w %x %y"
	97	bind $w.f.list <Double-Button-1> "loadImage $w %x %y"
98	98
99	99	catch {image delete image2a}
100	100	image create photo image2a

+17

-10

library/demos/items.tcl less more

16	16	positionWindow $w
17	17	set c $w.frame.c
18	18
19		label $w.msg -font $font -wraplength 5i -justify left -text "This window contains a canvas widget with examples of the various kinds of items supported by canvases. The following operations are supported:\n Button-1 drag:\tmoves item under pointer.\n Button-2 drag:\trepositions view.\n Button-3 drag:\tstrokes out area.\n Ctrl+f:\t\tprints items under area."
	19	label $w.msg -font $font -wraplength 5i -justify left -text "This window contains a canvas widget with examples of the various kinds of items supported by canvases. The following operations are supported:\n Left-Button drag:\tmoves item under pointer.\n Middle-Button drag:\trepositions view.\n Right-Button drag:\tstrokes out area.\n Ctrl+f:\t\tprints items under area."
20	20	pack $w.msg -side top
21	21
22	22	## See Code / Dismiss buttons

170	170
171	171	# Set up event bindings for canvas:
172	172
173		$c bind item <Any-Enter> "itemEnter $c"
174		$c bind item <Any-Leave> "itemLeave $c"
175		bind $c <2> "$c scan mark %x %y"
176		bind $c <B2-Motion> "$c scan dragto %x %y"
177		bind $c <3> "itemMark $c %x %y"
178		bind $c <B3-Motion> "itemStroke $c %x %y"
	173	$c bind item <Enter> "itemEnter $c"
	174	$c bind item <Leave> "itemLeave $c"
	175	if {[tk windowingsystem] eq "aqua" && ![package vsatisfies [package provide Tk] 8.7-]} {
	176	bind $c <Button-2> "itemMark $c %x %y"
	177	bind $c <B2-Motion> "itemStroke $c %x %y"
	178	bind $c <Button-3> "$c scan mark %x %y"
	179	bind $c <B3-Motion> "$c scan dragto %x %y"
	180	} else {
	181	bind $c <Button-2> "$c scan mark %x %y"
	182	bind $c <B2-Motion> "$c scan dragto %x %y"
	183	bind $c <Button-3> "itemMark $c %x %y"
	184	bind $c <B3-Motion> "itemStroke $c %x %y"
	185	}
179	186	bind $c <<NextChar>> "itemsUnderArea $c"
180		bind $c <1> "itemStartDrag $c %x %y"
	187	bind $c <Button-1> "itemStartDrag $c %x %y"
181	188	bind $c <B1-Motion> "itemDrag $c %x %y"
182	189
183	190	# Utility procedures for highlighting the item under the pointer:

249	256	set area [$c find withtag area]
250	257	set items ""
251	258	foreach i [$c find enclosed $areaX1 $areaY1 $areaX2 $areaY2] {
252		if {[lsearch [$c gettags $i] item] != -1} {
	259	if {[lsearch [$c gettags $i] item] >= 0} {
253	260	lappend items $i
254	261	}
255	262	}
256	263	puts stdout "Items enclosed by area: $items"
257	264	set items ""
258	265	foreach i [$c find overlapping $areaX1 $areaY1 $areaX2 $areaY2] {
259		if {[lsearch [$c gettags $i] item] != -1} {
	266	if {[lsearch [$c gettags $i] item] >= 0} {
260	267	lappend items $i
261	268	}
262	269	}

+2

-2

library/demos/ixset less more

53	53	global screencyc ; set screencyc 600
54	54
55	55	set xfd [open "\|xset q" r]
56		while {[gets $xfd line] > -1} {
	56	while {[gets $xfd line] >= 0} {
57	57	switch -- [lindex $line 0] {
58	58	auto {
59	59	set rpt [lindex $line 1]

196	196
197	197	bind . <Return> {.buttons.ok flash; .buttons.ok invoke}
198	198	bind . <Escape> {.buttons.quit flash; .buttons.quit invoke}
199		bind . <1> {
	199	bind . <Button-1> {
200	200	if {![string match .buttons* %W]} {
201	201	.buttons.apply configure -state normal
202	202	.buttons.cancel configure -state normal

+6

-6

library/demos/knightstour.tcl less more

20	20	# If you let it repeat then it will choose random start positions
21	21	# for each new tour.
22	22
23		package require Tk 8.5
	23	package require Tk
24	24
25	25	# Return a list of accessible squares from a given square
26	26	proc ValidMoves {square} {

28	28	foreach pair {{-1 -2} {-2 -1} {-2 1} {-1 2} {1 2} {2 1} {2 -1} {1 -2}} {
29	29	set col [expr {($square % 8) + [lindex $pair 0]}]
30	30	set row [expr {($square / 8) + [lindex $pair 1]}]
31		if {$row > -1 && $row < 8 && $col > -1 && $col < 8} {
	31	if {$row >= 0 && $row < 8 && $col >= 0 && $col < 8} {
32	32	lappend moves [expr {$row * 8 + $col}]
33	33	}
34	34	}

40	40	variable visited
41	41	set moves 0
42	42	foreach test [ValidMoves $square] {
43		if {[lsearch -exact -integer $visited $test] == -1} {
	43	if {[lsearch -exact -integer $visited $test] < 0} {
44	44	incr moves
45	45	}
46	46	}

54	54	set minimum 9
55	55	set nextSquare -1
56	56	foreach testSquare [ValidMoves $square] {
57		if {[lsearch -exact -integer $visited $testSquare] == -1} {
	57	if {[lsearch -exact -integer $visited $testSquare] < 0} {
58	58	set count [CheckSquare $testSquare]
59	59	if {$count < $minimum} {
60	60	set minimum $count

189	189	ttk::button $dlg.tf.b1 -text Start -command [list Tour $dlg]
190	190	ttk::button $dlg.tf.b2 -text Exit -command [list Exit $dlg]
191	191	set square 0
192		for {set row 7} {$row != -1} {incr row -1} {
	192	for {set row 7} {$row >= 0} {incr row -1} {
193	193	for {set col 0} {$col < 8} {incr col} {
194	194	if {(($col & 1) ^ ($row & 1))} {
195	195	set fill tan3 ; set dfill tan4

217	217	-fill black -activefill "#600000"
218	218	}
219	219	$c moveto knight {}[lrange [$c coords [expr {1 + int(rand() 64)}]] 0 1]
220		$c bind knight <ButtonPress-1> [namespace code [list DragStart %W %x %y]]
	220	$c bind knight <Button-1> [namespace code [list DragStart %W %x %y]]
221	221	$c bind knight <Motion> [namespace code [list DragMotion %W %x %y]]
222	222	$c bind knight <ButtonRelease-1> [namespace code [list DragEnd %W %x %y]]
223	223

+19

-4

library/demos/menu.tcl less more

62	62	}
63	63	foreach i {A B C D E F} {
64	64	$m add command -label "Print letter \"$i\"" -underline 14 \
65		-accelerator Meta+$i -command "puts $i" -accelerator $modifier+$i
	65	-accelerator $modifier+$i -command "puts $i"
66	66	bind $w <$modifier-[string tolower $i]> "puts $i"
67	67	}
68	68

143	143	set m $w.menu.colors
144	144	$w.menu add cascade -label "Colors" -menu $m -underline 1
145	145	menu $m -tearoff 1
146		foreach i {red orange yellow green blue} {
147		$m add command -label $i -background $i -command [list \
148		puts "You invoked \"$i\"" ]
	146	if {[tk windowingsystem] eq "aqua"} {
	147	# Aqua ignores the -background and -foreground options, but a compound
	148	# button can be used for selecting colors.
	149	foreach i {red orange yellow green blue} {
	150	image create photo image_$i -height 16 -width 16
	151	image_$i put black -to 0 0 16 1
	152	image_$i put black -to 0 1 1 16
	153	image_$i put black -to 0 15 16 16
	154	image_$i put black -to 15 1 16 16
	155	image_$i put $i -to 1 1 15 15
	156	$m add command -label $i -image image_$i -compound left -command [list \
	157	puts "You invoked \"$i\"" ]
	158	}
	159	} else {
	160	foreach i {red orange yellow green blue} {
	161	$m add command -label $i -background $i -command [list \
	162	puts "You invoked \"$i\"" ]
	163	}
149	164	}
150	165
151	166	$w configure -menu $w.menu

+1

-1

library/demos/pendulum.tcl less more

112	112	after cancel $animationCallbacks(pendulum)
113	113	unset animationCallbacks(pendulum)
114	114	}
115		bind $w.c <1> {
	115	bind $w.c <Button-1> {
116	116	after cancel $animationCallbacks(pendulum)
117	117	showPendulum %W at %x %y
118	118	}

+3

-3

library/demos/plot.tcl less more

54	54	$c addtag point withtag $item
55	55	}
56	56
57		$c bind point <Any-Enter> "$c itemconfig current -fill red"
58		$c bind point <Any-Leave> "$c itemconfig current -fill SkyBlue2"
59		$c bind point <1> "plotDown $c %x %y"
	57	$c bind point <Enter> "$c itemconfig current -fill red"
	58	$c bind point <Leave> "$c itemconfig current -fill SkyBlue2"
	59	$c bind point <Button-1> "plotDown $c %x %y"
60	60	$c bind point <ButtonRelease-1> "$c dtag selected"
61	61	bind $c <B1-Motion> "plotMove $c %x %y"
62	62

+3

-3

library/demos/ruler.tcl less more

76	76	$c addtag well withtag [rulerMkTab $c [winfo pixels $c 13.5c] \
77	77	[winfo pixels $c .65c]]
78	78
79		$c bind well <1> "rulerNewTab $c %x %y"
80		$c bind tab <1> "rulerSelectTab $c %x %y"
	79	$c bind well <Button-1> "rulerNewTab $c %x %y"
	80	$c bind tab <Button-1> "rulerSelectTab $c %x %y"
81	81	bind $c <B1-Motion> "rulerMoveTab $c %x %y"
82		bind $c <Any-ButtonRelease-1> "rulerReleaseTab $c"
	82	bind $c <ButtonRelease-1> "rulerReleaseTab $c"
83	83
84	84	# rulerNewTab --
85	85	# Does all the work of creating a tab stop, including creating the

+1

-1

library/demos/square less more

17	17	pack .s -expand yes -fill both
18	18	wm minsize . 1 1
19	19
20		bind .s <1> {center %x %y}
	20	bind .s <Button-1> {center %x %y}
21	21	bind .s <B1-Motion> {center %x %y}
22	22	bind .s a animate
23	23	focus .s

+59

-59

library/demos/tclIndex less more

5	5	# element name is the name of a command and the value is
6	6	# a script that loads the command.
7	7
8		set auto_index(arrowSetup) [list source [file join $dir arrow.tcl]]
9		set auto_index(arrowMove1) [list source [file join $dir arrow.tcl]]
10		set auto_index(arrowMove2) [list source [file join $dir arrow.tcl]]
11		set auto_index(arrowMove3) [list source [file join $dir arrow.tcl]]
12		set auto_index(textLoadFile) [list source [file join $dir search.tcl]]
13		set auto_index(textSearch) [list source [file join $dir search.tcl]]
14		set auto_index(textToggle) [list source [file join $dir search.tcl]]
15		set auto_index(itemEnter) [list source [file join $dir items.tcl]]
16		set auto_index(itemLeave) [list source [file join $dir items.tcl]]
17		set auto_index(itemMark) [list source [file join $dir items.tcl]]
18		set auto_index(itemStroke) [list source [file join $dir items.tcl]]
19		set auto_index(itemsUnderArea) [list source [file join $dir items.tcl]]
20		set auto_index(itemStartDrag) [list source [file join $dir items.tcl]]
21		set auto_index(itemDrag) [list source [file join $dir items.tcl]]
22		set auto_index(butPress) [list source [file join $dir items.tcl]]
23		set auto_index(loadDir) [list source [file join $dir image2.tcl]]
24		set auto_index(loadImage) [list source [file join $dir image2.tcl]]
25		set auto_index(rulerMkTab) [list source [file join $dir ruler.tcl]]
26		set auto_index(rulerNewTab) [list source [file join $dir ruler.tcl]]
27		set auto_index(rulerSelectTab) [list source [file join $dir ruler.tcl]]
28		set auto_index(rulerMoveTab) [list source [file join $dir ruler.tcl]]
29		set auto_index(rulerReleaseTab) [list source [file join $dir ruler.tcl]]
30		set auto_index(mkTextConfig) [list source [file join $dir ctext.tcl]]
31		set auto_index(textEnter) [list source [file join $dir ctext.tcl]]
32		set auto_index(textInsert) [list source [file join $dir ctext.tcl]]
33		set auto_index(textPaste) [list source [file join $dir ctext.tcl]]
34		set auto_index(textB1Press) [list source [file join $dir ctext.tcl]]
35		set auto_index(textB1Move) [list source [file join $dir ctext.tcl]]
36		set auto_index(textBs) [list source [file join $dir ctext.tcl]]
37		set auto_index(textDel) [list source [file join $dir ctext.tcl]]
38		set auto_index(bitmapRow) [list source [file join $dir bitmap.tcl]]
39		set auto_index(scrollEnter) [list source [file join $dir cscroll.tcl]]
40		set auto_index(scrollLeave) [list source [file join $dir cscroll.tcl]]
41		set auto_index(scrollButton) [list source [file join $dir cscroll.tcl]]
42		set auto_index(textWindOn) [list source [file join $dir twind.tcl]]
43		set auto_index(textWindOff) [list source [file join $dir twind.tcl]]
44		set auto_index(textWindPlot) [list source [file join $dir twind.tcl]]
45		set auto_index(embPlotDown) [list source [file join $dir twind.tcl]]
46		set auto_index(embPlotMove) [list source [file join $dir twind.tcl]]
47		set auto_index(textWindDel) [list source [file join $dir twind.tcl]]
48		set auto_index(embDefBg) [list source [file join $dir twind.tcl]]
49		set auto_index(floorDisplay) [list source [file join $dir floor.tcl]]
50		set auto_index(newRoom) [list source [file join $dir floor.tcl]]
51		set auto_index(roomChanged) [list source [file join $dir floor.tcl]]
52		set auto_index(bg1) [list source [file join $dir floor.tcl]]
53		set auto_index(bg2) [list source [file join $dir floor.tcl]]
54		set auto_index(bg3) [list source [file join $dir floor.tcl]]
55		set auto_index(fg1) [list source [file join $dir floor.tcl]]
56		set auto_index(fg2) [list source [file join $dir floor.tcl]]
57		set auto_index(fg3) [list source [file join $dir floor.tcl]]
58		set auto_index(setWidth) [list source [file join $dir hscale.tcl]]
59		set auto_index(plotDown) [list source [file join $dir plot.tcl]]
60		set auto_index(plotMove) [list source [file join $dir plot.tcl]]
61		set auto_index(puzzleSwitch) [list source [file join $dir puzzle.tcl]]
62		set auto_index(setHeight) [list source [file join $dir vscale.tcl]]
63		set auto_index(showMessageBox) [list source [file join $dir msgbox.tcl]]
64		set auto_index(setColor) [list source [file join $dir clrpick.tcl]]
65		set auto_index(setColor_helper) [list source [file join $dir clrpick.tcl]]
66		set auto_index(fileDialog) [list source [file join $dir filebox.tcl]]
	8	set auto_index(arrowSetup) [list source -encoding utf-8 [file join $dir arrow.tcl]]
	9	set auto_index(arrowMove1) [list source -encoding utf-8 [file join $dir arrow.tcl]]
	10	set auto_index(arrowMove2) [list source -encoding utf-8 [file join $dir arrow.tcl]]
	11	set auto_index(arrowMove3) [list source -encoding utf-8 [file join $dir arrow.tcl]]
	12	set auto_index(textLoadFile) [list source -encoding utf-8 [file join $dir search.tcl]]
	13	set auto_index(textSearch) [list source -encoding utf-8 [file join $dir search.tcl]]
	14	set auto_index(textToggle) [list source -encoding utf-8 [file join $dir search.tcl]]
	15	set auto_index(itemEnter) [list source -encoding utf-8 [file join $dir items.tcl]]
	16	set auto_index(itemLeave) [list source -encoding utf-8 [file join $dir items.tcl]]
	17	set auto_index(itemMark) [list source -encoding utf-8 [file join $dir items.tcl]]
	18	set auto_index(itemStroke) [list source -encoding utf-8 [file join $dir items.tcl]]
	19	set auto_index(itemsUnderArea) [list source -encoding utf-8 [file join $dir items.tcl]]
	20	set auto_index(itemStartDrag) [list source -encoding utf-8 [file join $dir items.tcl]]
	21	set auto_index(itemDrag) [list source -encoding utf-8 [file join $dir items.tcl]]
	22	set auto_index(butPress) [list source -encoding utf-8 [file join $dir items.tcl]]
	23	set auto_index(loadDir) [list source -encoding utf-8 [file join $dir image2.tcl]]
	24	set auto_index(loadImage) [list source -encoding utf-8 [file join $dir image2.tcl]]
	25	set auto_index(rulerMkTab) [list source -encoding utf-8 [file join $dir ruler.tcl]]
	26	set auto_index(rulerNewTab) [list source -encoding utf-8 [file join $dir ruler.tcl]]
	27	set auto_index(rulerSelectTab) [list source -encoding utf-8 [file join $dir ruler.tcl]]
	28	set auto_index(rulerMoveTab) [list source -encoding utf-8 [file join $dir ruler.tcl]]
	29	set auto_index(rulerReleaseTab) [list source -encoding utf-8 [file join $dir ruler.tcl]]
	30	set auto_index(mkTextConfig) [list source -encoding utf-8 [file join $dir ctext.tcl]]
	31	set auto_index(textEnter) [list source -encoding utf-8 [file join $dir ctext.tcl]]
	32	set auto_index(textInsert) [list source -encoding utf-8 [file join $dir ctext.tcl]]
	33	set auto_index(textPaste) [list source -encoding utf-8 [file join $dir ctext.tcl]]
	34	set auto_index(textB1Press) [list source -encoding utf-8 [file join $dir ctext.tcl]]
	35	set auto_index(textB1Move) [list source -encoding utf-8 [file join $dir ctext.tcl]]
	36	set auto_index(textBs) [list source -encoding utf-8 [file join $dir ctext.tcl]]
	37	set auto_index(textDel) [list source -encoding utf-8 [file join $dir ctext.tcl]]
	38	set auto_index(bitmapRow) [list source -encoding utf-8 [file join $dir bitmap.tcl]]
	39	set auto_index(scrollEnter) [list source -encoding utf-8 [file join $dir cscroll.tcl]]
	40	set auto_index(scrollLeave) [list source -encoding utf-8 [file join $dir cscroll.tcl]]
	41	set auto_index(scrollButton) [list source -encoding utf-8 [file join $dir cscroll.tcl]]
	42	set auto_index(textWindOn) [list source -encoding utf-8 [file join $dir twind.tcl]]
	43	set auto_index(textWindOff) [list source -encoding utf-8 [file join $dir twind.tcl]]
	44	set auto_index(textWindPlot) [list source -encoding utf-8 [file join $dir twind.tcl]]
	45	set auto_index(embPlotDown) [list source -encoding utf-8 [file join $dir twind.tcl]]
	46	set auto_index(embPlotMove) [list source -encoding utf-8 [file join $dir twind.tcl]]
	47	set auto_index(textWindDel) [list source -encoding utf-8 [file join $dir twind.tcl]]
	48	set auto_index(embDefBg) [list source -encoding utf-8 [file join $dir twind.tcl]]
	49	set auto_index(floorDisplay) [list source -encoding utf-8 [file join $dir floor.tcl]]
	50	set auto_index(newRoom) [list source -encoding utf-8 [file join $dir floor.tcl]]
	51	set auto_index(roomChanged) [list source -encoding utf-8 [file join $dir floor.tcl]]
	52	set auto_index(bg1) [list source -encoding utf-8 [file join $dir floor.tcl]]
	53	set auto_index(bg2) [list source -encoding utf-8 [file join $dir floor.tcl]]
	54	set auto_index(bg3) [list source -encoding utf-8 [file join $dir floor.tcl]]
	55	set auto_index(fg1) [list source -encoding utf-8 [file join $dir floor.tcl]]
	56	set auto_index(fg2) [list source -encoding utf-8 [file join $dir floor.tcl]]
	57	set auto_index(fg3) [list source -encoding utf-8 [file join $dir floor.tcl]]
	58	set auto_index(setWidth) [list source -encoding utf-8 [file join $dir hscale.tcl]]
	59	set auto_index(plotDown) [list source -encoding utf-8 [file join $dir plot.tcl]]
	60	set auto_index(plotMove) [list source -encoding utf-8 [file join $dir plot.tcl]]
	61	set auto_index(puzzleSwitch) [list source -encoding utf-8 [file join $dir puzzle.tcl]]
	62	set auto_index(setHeight) [list source -encoding utf-8 [file join $dir vscale.tcl]]
	63	set auto_index(showMessageBox) [list source -encoding utf-8 [file join $dir msgbox.tcl]]
	64	set auto_index(setColor) [list source -encoding utf-8 [file join $dir clrpick.tcl]]
	65	set auto_index(setColor_helper) [list source -encoding utf-8 [file join $dir clrpick.tcl]]
	66	set auto_index(fileDialog) [list source -encoding utf-8 [file join $dir filebox.tcl]]

+2

-2

library/demos/tcolor less more

6	6	# create colors using either the RGB, HSB, or CYM color spaces
7	7	# and apply the color to existing applications.
8	8
9		package require Tk 8.4
	9	package require Tk
10	10	wm title . "Color Editor"
11	11
12	12	# Global variables that control the program:

89	89	grid columnconfigure . 0 -weight 1
90	90	listbox .names.lb -width 20 -height 12 -yscrollcommand ".names.s set" \
91	91	-exportselection false
92		bind .names.lb <Double-1> {
	92	bind .names.lb <Double-Button-1> {
93	93	tc_loadNamedColor [.names.lb get [.names.lb curselection]]
94	94	}
95	95	scrollbar .names.s -orient vertical -command ".names.lb yview"

+5

-3

library/demos/text.tcl less more

56	56
57	57	1. Scrolling. Use the scrollbar to adjust the view in the text window.
58	58
59		2. Scanning. Press mouse button 2 in the text window and drag up or down.
60		This will drag the text at high speed to allow you to scan its contents.
	59	2. Scanning. Press the middle mouse button in the text window and drag up
	60	or down. This will drag the text at high speed to allow you to scan its
	61	contents.
61	62
62	63	3. Insert text. Press mouse button 1 to set the insertion cursor, then
63	64	type text. What you type will be added to the widget.

76	77
77	78	6. Copy the selection. To copy the selection into this window, select
78	79	what you want to copy (either here or in another application), then
79		click button 2 to copy the selection to the point of the mouse cursor.
	80	click the middle mouse button to copy the selection to the point of the
	81	mouse cursor.
80	82
81	83	7. Edit. Text widgets support the standard Motif editing characters
82	84	plus many Emacs editing characters. Backspace and Control-h erase the

+1

-0

library/demos/tree.tcl less more

38	38	set path [$tree set $node fullpath]
39	39	$tree delete [$tree children $node]
40	40	foreach f [lsort -dictionary [glob -nocomplain -dir $path *]] {
	41	set f [file normalize $f]
41	42	set type [file type $f]
42	43	set id [$tree insert $node end -text [file tail $f] \
43	44	-values [list $f $type]]

+3

-3

library/demos/twind.tcl less more

264	264	$c addtag point withtag $item
265	265	}
266	266
267		$c bind point <Any-Enter> "$c itemconfig current -fill red"
268		$c bind point <Any-Leave> "$c itemconfig current -fill SkyBlue2"
269		$c bind point <1> "embPlotDown $c %x %y"
	267	$c bind point <Enter> "$c itemconfig current -fill red"
	268	$c bind point <Leave> "$c itemconfig current -fill SkyBlue2"
	269	$c bind point <Button-1> "embPlotDown $c %x %y"
270	270	$c bind point <ButtonRelease-1> "$c dtag selected"
271	271	bind $c <B1-Motion> "embPlotMove $c %x %y"
272	272	return $c

+14

-10

library/demos/unicodeout.tcl less more

108	108	}
109	109	addSample $w "Trad. Chinese" "\u4E2D\u570B\u7684\u6F22\u5B57"
110	110	addSample $w "Simpl. Chinese" "\u6C49\u8BED"
111		addSample $w French "Langue fran\u00E7aise"
	111	addSample $w French "Langue fran\xE7aise"
112	112	addSample $w Greek \
113		"\u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AE " \
114		"\u03B3\u03BB\u03CE\u03C3\u03C3\u03B1"
	113	"\u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AE " \
	114	"\u03B3\u03BB\u03CE\u03C3\u03C3\u03B1"
115	115	if {[usePresentationFormsFor Hebrew]} {
116	116	# Visual order (pre-layouted)
117	117	addSample $w Hebrew \

122	122	"\u05DB\u05EA\u05D1 \u05E2\u05D1\u05E8\u05D9\u05EA"
123	123	}
124	124	addSample $w Hindi \
125		"\u0939\u093f\u0928\u094d\u0926\u0940 \u092d\u093e\u0937\u093e"
126		addSample $w Icelandic "\u00CDslenska"
	125	"\u0939\u093F\u0928\u094D\u0926\u0940 \u092D\u093E\u0937\u093E"
	126	addSample $w Icelandic "\xCDslenska"
127	127	addSample $w Japanese \
128		"\u65E5\u672C\u8A9E\u306E\u3072\u3089\u304C\u306A, " \
129		"\u6F22\u5B57\u3068\u30AB\u30BF\u30AB\u30CA"
	128	"\u65E5\u672C\u8A9E\u306E\u3072\u3089\u304C\u306A, " \
	129	"\u6F22\u5B57\u3068\u30AB\u30BF\u30AB\u30CA"
130	130	addSample $w Korean "\uB300\uD55C\uBBFC\uAD6D\uC758 \uD55C\uAE00"
131	131	addSample $w Russian \
132	132	"\u0420\u0443\u0441\u0441\u043A\u0438\u0439 \u044F\u0437\u044B\u043A"
133		if {[tk windowingsystem] ne "x11"} {
134		addSample $w Emoji \
135		"\uD83D\uDE00\uD83D\uDCA9\uD83D\uDC4D\uD83C\uDDF3\uD83C\uDDF1"
	133	if {([tk windowingsystem] ne "x11") \|\| (![catch {tk::pkgconfig get fontsystem} fs] && ($fs eq "xft"))} {
	134	if {[package vsatisfies [package provide Tcl] 8.7-]} {
	135	addSample $w Emoji "😀💩👍🇳🇱"
	136	} else {
	137	addSample $w Emoji \
	138	"\uD83D\uDE00\uD83D\uDCA9\uD83D\uDC4D\uD83C\uDDF3\uD83C\uDDF1"
	139	}
136	140	}
137	141
138	142	## We're done processing, so change things back to normal running...

+24

-11

library/demos/widget less more

82	82
83	83	# Note that this is run through the message catalog! This is because this is
84	84	# actually an image of a word.
85		image create photo ::img::new -format GIF -data [mc {
86		R0lGODlhHgAOALMPALMAANyIiOu7u8dEROaqqvru7sxVVeGZmbgREfXd3b0iItZ3
87		d8IzM9FmZvDMzP///yH5BAEAAA8ALAAAAAAeAA4AAASa8MlJq7046827WVOCHEkw
88		nANhUgJlEBIABJIwL3K+4IcUALCHjfbItYZDSgJgkBiYPmBMAUAkkLPKs/BAyLgM
89		wAQwOAAY2ByCaw4QAFQSoDEePJ6DmU1xInYZTw5nOEFFdgVUelkVDTIMd3AKFGQ1
90		MgI2AwEmQW8APZ0gdRONAks5nhIFVVxdAAkUAS2pAVwFl7ITB4UqHb0XEQA7
	85	image create photo ::img::new -format PNG -data [mc {
	86	iVBORw0KGgoAAAANSUhEUgAAAB4AAAAOCAYAAAA45qw5AAACMElEQVR4AeVTAwxd
	87	QRCc2tZHGtQ2w9q2bdsOa9u2bUW1bdt2Z372JZe6DapJLqtb3h7+T8yKi5j4CsYD
	88	EUQXxETclT7kWOlH2VV+tFkdQHPSwksSISF+BauCqL0qgOcMWgGfgEkaMsHxqUBk
	89	3plE/sOnh/qDPAPJH/CKFBivGHWzFwBRnHhlqbu1Mh6CoFNnC/JshQ9p4YC2lrKt
	90	DCAV+THiVejyhMjAbrNSrroiEfKR9g7ZfCgOog8QfnUQV62wAk68ndQ9ZbyoWO1H
	91	Y6eDY1LCQL6a9ApOp9Hi1T0+gQq2JKMlky/oTKQliKWxEZvyG575kpW4pl1aZnQK
	92	CLOVt45Lkp8uXp2SL8KO6uitNTZLdpK6s+I/eZbhpmsmWeOGOVQNKYLITzpKPAO3
	93	tY7LSNZ7ccSLxX9y3uuOxRkg3dKESMoCHvL+GRVCutXsB3guLgDCeXOv4iWWkvwG
	94	BaS+PmlpK6SI9ApI2oC2UtrwZQEkhkH+NtolVlQXJl1I+QltuU3XEc721bIRFpa8
	95	IA5iqTo6vNNWmkNBLQbPeXwF2g17Q94nTQAfY3YzeY+WSu8MDzQ2kpELUhSGJUHE
	96	0zeR3rY1L+Xl5G/re+jbiK6KhThwwInsts1fbMUUcpZszKeVtggZEiGdZDe5AtHh
	97	7vL4CGiRvvKPS8FAvq9Nr4ZkFadR2y6kggu1z4vlyIbBp6BugQ8JLEg4bTkD9eMZ
	98	QZ8hpJ3VvTtuvbWrY/ElvP/9R+Aj3603+iE3fkEAAAAASUVORK5CYII=
91	99	}]
92	100
93	101	#----------------------------------------------------------------

185	193	-foreground blue -underline 1
186	194	.t tag configure visited -lmargin1 1c -lmargin2 1c \
187	195	-foreground #303080 -underline 1
	196	if {[tk windowingsystem] eq "aqua"} {
	197	.t tag configure demo -foreground systemLinkColor
	198	.t tag configure visited -foreground purple
	199	}
188	200	.t tag configure hot -foreground red -underline 1
189	201	}
190	202	.t tag bind demo <ButtonRelease-1> {

503	515	.t configure -cursor [::ttk::cursor busy]
504	516	update
505	517	set demo [string range [lindex $tags $i] 5 end]
506		uplevel 1 [list source [file join $tk_demoDirectory $demo.tcl]]
	518	uplevel 1 [list source -encoding utf-8 [file join $tk_demoDirectory $demo.tcl]]
507	519	update
508	520	.t configure -cursor $cursor
509	521

611	623	wm title $top [mc "Demo code: %s" [file join $tk_demoDirectory $file]]
612	624	wm iconname $top $file
613	625	set id [open [file join $tk_demoDirectory $file]]
	626	fconfigure $id -encoding utf-8 -eofchar \032
614	627	$top.f.text delete 1.0 end
615	628	$top.f.text insert 1.0 [read $id]
616	629	$top.f.text mark set insert 1.0

709	722	proc tkAboutDialog {} {
710	723	tk_messageBox -icon info -type ok -title [mc "About Widget Demo"] \
711	724	-message [mc "Tk widget demonstration application"] -detail \
712		"[mc "Copyright \u00a9 %s" {1996-1997 Sun Microsystems, Inc.}]
713		[mc "Copyright \u00a9 %s" {1997-2000 Ajuba Solutions, Inc.}]
714		[mc "Copyright \u00a9 %s" {2001-2009 Donal K. Fellows}]
715		[mc "Copyright \u00a9 %s" {2002-2007 Daniel A. Steffen}]"
	725	"[mc "Copyright \xA9 %s" {1996-1997 Sun Microsystems, Inc.}]
	726	[mc "Copyright \xA9 %s" {1997-2000 Ajuba Solutions, Inc.}]
	727	[mc "Copyright \xA9 %s" {2001-2009 Donal K. Fellows}]
	728	[mc "Copyright \xA9 %s" {2002-2007 Daniel A. Steffen}]"
716	729	}
717	730
718	731	# Local Variables:

+51

-47

library/entry.tcl less more

57	57	}
58	58	bind Entry <<Clear>> {
59	59	# ignore if there is no selection
60		catch { %W delete sel.first sel.last }
	60	catch {%W delete sel.first sel.last}
61	61	}
62	62	bind Entry <<PasteSelection>> {
63	63	if {$tk_strictMotif \|\| ![info exists tk::Priv(mouseMoved)]

73	73
74	74	# Standard Motif bindings:
75	75
76		bind Entry <1> {
	76	bind Entry <Button-1> {
77	77	tk::EntryButton1 %W %x
78	78	%W selection clear
79	79	}

81	81	set tk::Priv(x) %x
82	82	tk::EntryMouseSelect %W %x
83	83	}
84		bind Entry <Double-1> {
	84	bind Entry <Double-Button-1> {
85	85	set tk::Priv(selectMode) word
86	86	tk::EntryMouseSelect %W %x
87	87	catch {%W icursor sel.last}
88	88	}
89		bind Entry <Triple-1> {
	89	bind Entry <Triple-Button-1> {
90	90	set tk::Priv(selectMode) line
91	91	tk::EntryMouseSelect %W %x
92	92	catch {%W icursor sel.last}
93	93	}
94		bind Entry <Shift-1> {
	94	bind Entry <Shift-Button-1> {
95	95	set tk::Priv(selectMode) char
96	96	%W selection adjust @%x
97	97	}
98		bind Entry <Double-Shift-1> {
	98	bind Entry <Double-Shift-Button-1> {
99	99	set tk::Priv(selectMode) word
100	100	tk::EntryMouseSelect %W %x
101	101	}
102		bind Entry <Triple-Shift-1> {
	102	bind Entry <Triple-Shift-Button-1> {
103	103	set tk::Priv(selectMode) line
104	104	tk::EntryMouseSelect %W %x
105	105	}

113	113	bind Entry <ButtonRelease-1> {
114	114	tk::CancelRepeat
115	115	}
116		bind Entry <Control-1> {
	116	bind Entry <Control-Button-1> {
117	117	%W icursor @%x
118	118	}
119	119
120	120	bind Entry <<PrevChar>> {
121		tk::EntrySetCursor %W [expr {[%W index insert] - 1}]
	121	tk::EntrySetCursor %W [expr {[%W index insert]-1}]
122	122	}
123	123	bind Entry <<NextChar>> {
124		tk::EntrySetCursor %W [expr {[%W index insert] + 1}]
	124	tk::EntrySetCursor %W [expr {[%W index insert]+1}]
125	125	}
126	126	bind Entry <<SelectPrevChar>> {
127		tk::EntryKeySelect %W [expr {[%W index insert] - 1}]
	127	tk::EntryKeySelect %W [expr {[%W index insert]-1}]
128	128	tk::EntrySeeInsert %W
129	129	}
130	130	bind Entry <<SelectNextChar>> {
131		tk::EntryKeySelect %W [expr {[%W index insert] + 1}]
	131	tk::EntryKeySelect %W [expr {[%W index insert]+1}]
132	132	tk::EntrySeeInsert %W
133	133	}
134	134	bind Entry <<PrevWord>> {

189	189	bind Entry <<SelectNone>> {
190	190	%W selection clear
191	191	}
192		bind Entry <KeyPress> {
	192	bind Entry <Key> {
193	193	tk::CancelRepeat
194	194	tk::EntryInsert %W %A
195	195	}
196	196
197	197	# Ignore all Alt, Meta, and Control keypresses unless explicitly bound.
198	198	# Otherwise, if a widget binding for one of these is defined, the
199		# <KeyPress> class binding will also fire and insert the character,
	199	# <Key> class binding will also fire and insert the character,
200	200	# which is wrong. Ditto for Escape, Return, and Tab.
201	201
202		bind Entry <Alt-KeyPress> {# nothing}
203		bind Entry <Meta-KeyPress> {# nothing}
204		bind Entry <Control-KeyPress> {# nothing}
	202	bind Entry <Alt-Key> {# nothing}
	203	bind Entry <Meta-Key> {# nothing}
	204	bind Entry <Control-Key> {# nothing}
205	205	bind Entry <Escape> {# nothing}
206	206	bind Entry <Return> {# nothing}
207	207	bind Entry <KP_Enter> {# nothing}

209	209	bind Entry <Prior> {# nothing}
210	210	bind Entry <Next> {# nothing}
211	211	if {[tk windowingsystem] eq "aqua"} {
212		bind Entry <Command-KeyPress> {# nothing}
	212	bind Entry <Command-Key> {# nothing}
213	213	}
214	214	# Tk-on-Cocoa generates characters for these two keys. [Bug 2971663]
215	215	bind Entry <<NextLine>> {# nothing}

277	277	dict set ::tk::Priv(IMETextMark) "%W" [%W index insert]
278	278	}
279	279	bind Entry <<TkEndIMEMarkedText>> {
280		if { [catch {dict get $::tk::Priv(IMETextMark) "%W"} mark] } {
	280	if {[catch {dict get $::tk::Priv(IMETextMark) "%W"} mark]} {
281	281	bell
282	282	} else {
283	283	%W selection range $mark insert

292	292
293	293	# A few additional bindings of my own.
294	294
295		bind Entry <2> {
296		if {!$tk_strictMotif} {
297		::tk::EntryScanMark %W %x
298		}
299		}
300		bind Entry <B2-Motion> {
301		if {!$tk_strictMotif} {
302		::tk::EntryScanDrag %W %x
	295	if {[tk windowingsystem] ne "aqua"} {
	296	bind Entry <Button-2> {
	297	if {!$tk_strictMotif} {
	298	::tk::EntryScanMark %W %x
	299	}
	300	}
	301	bind Entry <B2-Motion> {
	302	if {!$tk_strictMotif} {
	303	::tk::EntryScanDrag %W %x
	304	}
	305	}
	306	} else {
	307	bind Entry <Button-3> {
	308	if {!$tk_strictMotif} {
	309	::tk::EntryScanMark %W %x
	310	}
	311	}
	312	bind Entry <B3-Motion> {
	313	if {!$tk_strictMotif} {
	314	::tk::EntryScanDrag %W %x
	315	}
303	316	}
304	317	}
305	318

377	390	word {
378	391	if {$cur < $anchor} {
379	392	set before [tcl_wordBreakBefore [$w get] $cur]
380		set after [tcl_wordBreakAfter [$w get] [expr {$anchor-1}]]
	393	set after [tcl_wordBreakAfter [$w get] $anchor-1]
381	394	} elseif {$cur > $anchor} {
382	395	set before [tcl_wordBreakBefore [$w get] $anchor]
383		set after [tcl_wordBreakAfter [$w get] [expr {$cur - 1}]]
	396	set after [tcl_wordBreakAfter [$w get] $cur-1]
384	397	} else {
385	398	if {[$w index @$Priv(pressX)] < $anchor} {
386	399	incr anchor -1

504	517	if {[$w selection present]} {
505	518	$w delete sel.first sel.last
506	519	} else {
507		set x [expr {[$w index insert] - 1}]
508		if {$x >= 0} {
509		$w delete $x
	520	set x [$w index insert]
	521	if {$x > 0} {
	522	$w delete [expr {$x-1}]
510	523	}
511	524	if {[$w index @0] >= [$w index insert]} {
512	525	set range [$w xview]

561	574	if {$i < [$w index end]} {
562	575	incr i
563	576	}
	577	if {$i < 2} {
	578	return
	579	}
564	580	set first [expr {$i-2}]
565		if {$first < 0} {
566		return
567		}
568	581	set data [$w get]
569		set new [string index $data [expr {$i-1}]][string index $data $first]
	582	set new [string index $data $i-1][string index $data $first]
570	583	$w delete $first $i
571	584	$w insert insert $new
572	585	EntrySeeInsert $w

646	659	proc ::tk::EntryScanDrag {w x} {
647	660	# Make sure these exist, as some weird situations can trigger the
648	661	# motion binding without the initial press. [Bug #220269]
649		if {![info exists ::tk::Priv(x)]} { set ::tk::Priv(x) $x }
	662	if {![info exists ::tk::Priv(x)]} {set ::tk::Priv(x) $x}
650	663	# allow for a delta
651	664	if {abs($x-$::tk::Priv(x)) > 2} {
652	665	set ::tk::Priv(mouseMoved) 1

663	676
664	677	proc ::tk::EntryGetSelection {w} {
665	678	set entryString [string range [$w get] [$w index sel.first] \
666		[expr {[$w index sel.last] - 1}]]
	679	[$w index sel.last]-1]
667	680	if {[$w cget -show] ne ""} {
668	681	return [string repeat [string index [$w cget -show] 0] \
669	682	[string length $entryString]]
670	683	}
671	684	return $entryString
672	685	}
673
674
675
676
677
678
679
680
681

+26

-23

library/fontchooser.tcl less more

13	13	set S(W) .__tk__fontchooser
14	14	set S(fonts) [lsort -dictionary [font families]]
15	15	set S(styles) [list \
16		[::msgcat::mc "Regular"] \
17		[::msgcat::mc "Italic"] \
18		[::msgcat::mc "Bold"] \
19		[::msgcat::mc "Bold Italic"] \
20		]
	16	[::msgcat::mc "Regular"] \
	17	[::msgcat::mc "Italic"] \
	18	[::msgcat::mc "Bold"] \
	19	[::msgcat::mc "Bold Italic"] \
	20	]
21	21
22	22	set S(sizes) {8 9 10 11 12 14 16 18 20 22 24 26 28 36 48 72}
23	23	set S(strike) 0

35	35
36	36	# Canonical versions of font families, styles, etc. for easier searching
37	37	set S(fonts,lcase) {}
38		foreach font $S(fonts) { lappend S(fonts,lcase) [string tolower $font]}
	38	foreach font $S(fonts) {lappend S(fonts,lcase) [string tolower $font]}
39	39	set S(styles,lcase) {}
40		foreach style $S(styles) { lappend S(styles,lcase) [string tolower $style]}
	40	foreach style $S(styles) {lappend S(styles,lcase) [string tolower $style]}
41	41	set S(sizes,lcase) $S(sizes)
42	42
43	43	::ttk::style layout FontchooserFrame {

110	110
111	111	set cache [dict create -parent $S(-parent) -title $S(-title) \
112	112	-font $S(-font) -command $S(-command)]
113		set r [tclParseConfigSpec [namespace which -variable S] $specs "" $args]
	113	set r [tclParseConfigSpec [namespace which -variable S] $specs DONTSETDEFAULTS $args]
114	114	if {![winfo exists $S(-parent)]} {
115	115	set code [list TK LOOKUP WINDOW $S(-parent)]
116	116	set err "bad window path name \"$S(-parent)\""

120	120	if {[string trim $S(-title)] eq ""} {
121	121	set S(-title) [::msgcat::mc "Font"]
122	122	}
123		if {[winfo exists $S(W)] && [lsearch $args -font] != -1} {
	123	if {[winfo exists $S(W)] && ("-font" in $args)} {
124	124	Init $S(-font)
125	125	event generate $S(-parent) <<TkFontchooserFontChanged>>
126	126	}

144	144	wm title $S(W) $S(-title)
145	145	wm transient $S(W) [winfo toplevel $S(-parent)]
146	146
	147	set scaling [tk scaling]
	148	set sizeWidth [expr {int([string length [::msgcat::mc "&Size:"]] * $scaling)}]
	149
147	150	set outer [::ttk::frame $S(W).outer -padding {10 10}]
148	151	::tk::AmpWidget ::ttk::label $S(W).font -text [::msgcat::mc "&Font:"]
149	152	::tk::AmpWidget ::ttk::label $S(W).style -text [::msgcat::mc "Font st&yle:"]
150		::tk::AmpWidget ::ttk::label $S(W).size -text [::msgcat::mc "&Size:"]
	153	::tk::AmpWidget ::ttk::label $S(W).size -text [::msgcat::mc "&Size:"] -width $sizeWidth
151	154	ttk::entry $S(W).efont -width 18 \
152	155	-textvariable [namespace which -variable S](font)
153	156	ttk::entry $S(W).estyle -width 10 \

198	201	set minsize(sizes) \
199	202	[expr {[font measure TkDefaultFont "-99"] + $scroll_width}]
200	203	set min [expr {$minsize(gap) * 4}]
201		foreach {what width} [array get minsize] { incr min $width }
	204	foreach {what width} [array get minsize] {incr min $width}
202	205	wm minsize $S(W) $min 260
203	206
204	207	bind $S(W) <Return> [namespace code [list Done 1]]

276	279	# Arguments:
277	280	# ok true if user pressed OK
278	281	#
279		proc ::tk::::fontchooser::Done {ok} {
	282	proc ::tk::fontchooser::Done {ok} {
280	283	variable S
281	284
282	285	if {! $ok} {

326	329	set S(size) $F(-size)
327	330	set S(strike) $F(-overstrike)
328	331	set S(under) $F(-underline)
329		set S(style) "Regular"
	332	set S(style) [::msgcat::mc "Regular"]
330	333	if {$F(-weight) eq "bold" && $F(-slant) eq "italic"} {
331		set S(style) "Bold Italic"
	334	set S(style) [::msgcat::mc "Bold Italic"]
332	335	} elseif {$F(-weight) eq "bold"} {
333		set S(style) "Bold"
	336	set S(style) [::msgcat::mc "Bold"]
334	337	} elseif {$F(-slant) eq "italic"} {
335		set S(style) "Italic"
	338	set S(style) [::msgcat::mc "Italic"]
336	339	}
337	340
338	341	set S(first) 0

380	383	$S(W).l${var}s selection clear 0 end
381	384	set n [lsearch -exact $S(${var}s,lcase) $value]
382	385	$S(W).l${var}s selection set $n
383		if {$n != -1} {
	386	if {$n >= 0} {
384	387	set S($var) [lindex $S(${var}s) $n]
385	388	$S(W).e$var icursor end
386	389	$S(W).e$var selection clear

395	398	}
396	399	$S(W).l${var}s see $n
397	400	}
398		if {!$bad} { Update }
	401	if {!$bad} {Update}
399	402	$S(W).ok configure -state $nstate
400	403	}
401	404

407	410	variable S
408	411
409	412	set S(result) [list $S(font) $S(size)]
410		if {$S(style) eq "Bold"} { lappend S(result) bold }
411		if {$S(style) eq "Italic"} { lappend S(result) italic }
412		if {$S(style) eq "Bold Italic"} { lappend S(result) bold italic}
413		if {$S(strike)} { lappend S(result) overstrike}
414		if {$S(under)} { lappend S(result) underline}
	413	if {$S(style) eq [::msgcat::mc "Bold"]} {lappend S(result) bold}
	414	if {$S(style) eq [::msgcat::mc "Italic"]} {lappend S(result) italic}
	415	if {$S(style) eq [::msgcat::mc "Bold Italic"]} {lappend S(result) bold italic}
	416	if {$S(strike)} {lappend S(result) overstrike}
	417	if {$S(under)} {lappend S(result) underline}
415	418
416	419	$S(sample) configure -font $S(result)
417	420	}

+2

-2

library/iconlist.tcl less more

25	25	# <path> selection includes <item>
26	26	# <path> selection set <first> ?<last>?
27	27
28		package require Tk 8.6
	28	package require Tk
29	29
30	30	::tk::Megawidget create ::tk::IconList ::tk::FocusableWidget {
31	31	variable w canvas sbar accel accelCB fill font index \

696	696	}
697	697	}
698	698
699		if {$theIndex > -1} {
	699	if {$theIndex >= 0} {
700	700	$w selection clear 0 end
701	701	$w selection set $theIndex
702	702	$w selection anchor $theIndex

+3

-3

library/listbox.tcl less more

310	310	set Priv(listboxSelection) [$w curselection]
311	311	}
312	312	while {($i < $el) && ($i < $anchor)} {
313		if {[lsearch $Priv(listboxSelection) $i] >= 0} {
	313	if {$i in $Priv(listboxSelection)} {
314	314	$w selection set $i
315	315	}
316	316	incr i
317	317	}
318	318	while {($i > $el) && ($i > $anchor)} {
319		if {[lsearch $Priv(listboxSelection) $i] >= 0} {
	319	if {$i in $Priv(listboxSelection)} {
320	320	$w selection set $i
321	321	}
322	322	incr i -1

516	516	}
517	517	$w selection clear $first $last
518	518	while {$first <= $last} {
519		if {[lsearch $Priv(listboxSelection) $first] >= 0} {
	519	if {$first in $Priv(listboxSelection)} {
520	520	$w selection set $first
521	521	}
522	522	incr first

+1

-1

library/megawidget.tcl less more

9	9	# this file, and for a DISCLAIMER OF ALL WARRANTIES.
10	10	#
11	11
12		package require Tk 8.6
	12	package require Tk
13	13
14	14	::oo::class create ::tk::Megawidget {
15	15	superclass ::oo::class

+1

-1

library/menu.tcl less more

137	137	bind Menu <Motion> {
138	138	tk::MenuMotion %W %x %y %s
139	139	}
140		bind Menu <ButtonPress> {
	140	bind Menu <Button> {
141	141	tk::MenuButtonDown %W
142	142	}
143	143	bind Menu <ButtonRelease> {

+47

-47

library/safetk.tcl less more

13	13	# Note: It is now ok to let untrusted code being executed
14	14	# between the creation of the interp and the actual loading
15	15	# of Tk in that interp because the C side Tk_Init will
16		# now look up the master interp and ask its safe::TkInit
	16	# now look up the parent interp and ask its safe::TkInit
17	17	# for the actual parameters to use for it's initialization (if allowed),
18		# not relying on the slave state.
	18	# not relying on the child state.
19	19	#
20	20
21	21	# We use opt (optional arguments parsing)

28	28	}
29	29
30	30	#
31		# tkInterpInit : prepare the slave interpreter for tk loading
	31	# tkInterpInit : prepare the child interpreter for tk loading
32	32	# most of the real job is done by loadTk
33		# returns the slave name (tkInterpInit does)
34		#
35		proc ::safe::tkInterpInit {slave argv} {
	33	# returns the child name (tkInterpInit does)
	34	#
	35	proc ::safe::tkInterpInit {child argv} {
36	36	global env tk_library
37	37
38	38	# We have to make sure that the tk_library variable is normalized.
39	39	set tk_library [file normalize $tk_library]
40	40
41	41	# Clear Tk's access for that interp (path).
42		allowTk $slave $argv
	42	allowTk $child $argv
43	43
44	44	# Ensure tk_library and subdirs (eg, ttk) are on the access path
45		::interp eval $slave [list set tk_library [::safe::interpAddToAccessPath $slave $tk_library]]
	45	::interp eval $child [list set tk_library [::safe::interpAddToAccessPath $child $tk_library]]
46	46	foreach subdir [::safe::AddSubDirs [list $tk_library]] {
47		::safe::interpAddToAccessPath $slave $subdir
48		}
49		return $slave
	47	::safe::interpAddToAccessPath $child $subdir
	48	}
	49	return $child
50	50	}
51	51
52	52
53	53	# tkInterpLoadTk:
54	54	# Do additional configuration as needed (calling tkInterpInit)
55		# and actually load Tk into the slave.
	55	# and actually load Tk into the child.
56	56	#
57	57	# Either contained in the specified windowId (-use) or
58	58	# creating a decorated toplevel for it.

61	61	proc ::safe::loadTk {} {}
62	62
63	63	::tcl::OptProc ::safe::loadTk {
64		{slave -interp "name of the slave interpreter"}
	64	{child -interp "name of the child interpreter"}
65	65	{-use -windowId {} "window Id to use (new toplevel otherwise)"}
66	66	{-display -displayName {} "display name to use (current one otherwise)"}
67	67	} {
68	68	set displayGiven [::tcl::OptProcArgGiven "-display"]
69	69	if {!$displayGiven} {
70	70	# Try to get the current display from "."
71		# (which might not exist if the master is tk-less)
	71	# (which might not exist if the parent is tk-less)
72	72	if {[catch {set display [winfo screen .]}]} {
73	73	if {[info exists ::env(DISPLAY)]} {
74	74	set display $::env(DISPLAY)
75	75	} else {
76		Log $slave "no winfo screen . nor env(DISPLAY)" WARNING
	76	Log $child "no winfo screen . nor env(DISPLAY)" WARNING
77	77	set display ":0.0"
78	78	}
79	79	}
80	80	}
81	81
82	82	# Get state for access to the cleanupHook.
83		namespace upvar ::safe S$slave state
	83	namespace upvar ::safe S$child state
84	84
85	85	if {![::tcl::OptProcArgGiven "-use"]} {
86	86	# create a decorated toplevel
87		lassign [tkTopLevel $slave $display] w use
88
89		# set our delete hook (slave arg is added by interpDelete)
90		# to clean up both window related code and tkInit(slave)
	87	lassign [tkTopLevel $child $display] w use
	88
	89	# set our delete hook (child arg is added by interpDelete)
	90	# to clean up both window related code and tkInit(child)
91	91	set state(cleanupHook) [list tkDelete {} $w]
92	92	} else {
93		# set our delete hook (slave arg is added by interpDelete)
94		# to clean up tkInit(slave)
	93	# set our delete hook (child arg is added by interpDelete)
	94	# to clean up tkInit(child)
95	95	set state(cleanupHook) [list disallowTk]
96	96
97	97	# Let's be nice and also accept tk window names instead of ids

121	121	}
122	122	}
123	123
124		# Prepares the slave for tk with those parameters
125		tkInterpInit $slave [list "-use" $use "-display" $display]
126
127		load {} Tk $slave
128
129		return $slave
	124	# Prepares the child for tk with those parameters
	125	tkInterpInit $child [list "-use" $use "-display" $display]
	126
	127	load {} Tk $child
	128
	129	return $child
130	130	}
131	131
132	132	proc ::safe::TkInit {interpPath} {

148	148	# safe::TkInit.
149	149	#
150	150	# Arguments:
151		# interpPath slave interpreter handle
	151	# interpPath child interpreter handle
152	152	# argv arguments passed to safe::TkInterpInit
153	153	#
154	154	# Results:

167	167	# in safe::TkInit.
168	168	#
169	169	# Arguments:
170		# interpPath slave interpreter handle
	170	# interpPath child interpreter handle
171	171	#
172	172	# Results:
173	173	# none.

187	187	# Clean up the window associated with the interp being deleted.
188	188	#
189	189	# Arguments:
190		# interpPath slave interpreter handle
	190	# interpPath child interpreter handle
191	191	#
192	192	# Results:
193	193	# none.
194	194
195		proc ::safe::tkDelete {W window slave} {
	195	proc ::safe::tkDelete {W window child} {
196	196
197	197	# we are going to be called for each widget... skip untill it's
198	198	# top level
199	199
200		Log $slave "Called tkDelete $W $window" NOTICE
201		if {[::interp exists $slave]} {
202		if {[catch {::safe::interpDelete $slave} msg]} {
203		Log $slave "Deletion error : $msg"
	200	Log $child "Called tkDelete $W $window" NOTICE
	201	if {[::interp exists $child]} {
	202	if {[catch {::safe::interpDelete $child} msg]} {
	203	Log $child "Deletion error : $msg"
204	204	}
205	205	}
206	206	if {[winfo exists $window]} {
207		Log $slave "Destroy toplevel $window" NOTICE
	207	Log $child "Destroy toplevel $window" NOTICE
208	208	destroy $window
209	209	}
210	210
211		# clean up tkInit(slave)
212		disallowTk $slave
	211	# clean up tkInit(child)
	212	disallowTk $child
213	213	return
214	214	}
215	215
216		proc ::safe::tkTopLevel {slave display} {
	216	proc ::safe::tkTopLevel {child display} {
217	217	variable tkSafeId
218	218	incr tkSafeId
219	219	set w ".safe$tkSafeId"
220	220	if {[catch {toplevel $w -screen $display -class SafeTk} msg]} {
221	221	return -code error -errorcode {TK TOPLEVEL SAFE} \
222		"Unable to create toplevel for safe slave \"$slave\" ($msg)"
223		}
224		Log $slave "New toplevel $w" NOTICE
225
226		set msg "Untrusted Tcl applet ($slave)"
	222	"Unable to create toplevel for \"$child\" ($msg)"
	223	}
	224	Log $child "New toplevel $w" NOTICE
	225
	226	set msg "Untrusted Tcl applet ($child)"
227	227	wm title $w $msg
228	228
229	229	# Control frame (we must create a style for it)

235	235
236	236	# We will destroy the interp when the window is destroyed
237	237	bindtags $wc [concat Safe$wc [bindtags $wc]]
238		bind Safe$wc <Destroy> [list ::safe::tkDelete %W $w $slave]
	238	bind Safe$wc <Destroy> [list ::safe::tkDelete %W $w $child]
239	239
240	240	ttk::label $wc.l -text $msg -anchor w
241	241

246	246	# but still have the default background instead of red one from the parent
247	247	ttk::frame $wc.fb -borderwidth 0
248	248	ttk::button $wc.fb.b -text "Delete" \
249		-command [list ::safe::tkDelete $w $w $slave]
	249	-command [list ::safe::tkDelete $w $w $child]
250	250	pack $wc.fb.b -side right -fill both
251	251	pack $wc.fb -side right -fill both -expand 1
252	252	pack $wc.l -side left -fill both -expand 1 -ipady 2

+23

-10

library/spinbox.tcl less more

279	279
280	280	# A few additional bindings of my own.
281	281
282		bind Spinbox <2> {
283		if {!$tk_strictMotif} {
284		::tk::EntryScanMark %W %x
285		}
286		}
287		bind Spinbox <B2-Motion> {
288		if {!$tk_strictMotif} {
289		::tk::EntryScanDrag %W %x
	282	if {[tk windowingsystem] ne "aqua"} {
	283	bind Spinbox <2> {
	284	if {!$tk_strictMotif} {
	285	::tk::EntryScanMark %W %x
	286	}
	287	}
	288	bind Spinbox <B2-Motion> {
	289	if {!$tk_strictMotif} {
	290	::tk::EntryScanDrag %W %x
	291	}
	292	}
	293	} else {
	294	bind Spinbox <3> {
	295	if {!$tk_strictMotif} {
	296	::tk::EntryScanMark %W %x
	297	}
	298	}
	299	bind Spinbox <B3-Motion> {
	300	if {!$tk_strictMotif} {
	301	::tk::EntryScanDrag %W %x
	302	}
290	303	}
291	304	}
292	305

469	482	word {
470	483	if {$cur < [$w index anchor]} {
471	484	set before [tcl_wordBreakBefore [$w get] $cur]
472		set after [tcl_wordBreakAfter [$w get] [expr {$anchor-1}]]
	485	set after [tcl_wordBreakAfter [$w get] $anchor-1]
473	486	} else {
474	487	set before [tcl_wordBreakBefore [$w get] $anchor]
475		set after [tcl_wordBreakAfter [$w get] [expr {$cur - 1}]]
	488	set after [tcl_wordBreakAfter [$w get] $cur-1]
476	489	}
477	490	if {$before < 0} {
478	491	set before 0

+11

-7

library/tearoff.tcl less more

38	38	# Shift by height of tearoff entry minus height of window titlebar
39	39	catch {incr y [expr {[$w yposition 1] - 16}]}
40	40	# Avoid the native menu bar which sits on top of everything.
41		if {$y < 22} { set y 22 }
	41	if {$y < 22} {set y 22}
42	42	}
43	43	}
44	44

152	152
153	153	# Copy tags to x, replacing each substring of src with dst.
154	154
155		while {[set index [string first $src $tags]] != -1} {
156		append x [string range $tags 0 [expr {$index - 1}]]$dst
157		set tags [string range $tags [expr {$index + $srcLen}] end]
	155	while {[set index [string first $src $tags]] >= 0} {
	156	if {$index > 0} {
	157	append x [string range $tags 0 $index-1]$dst
	158	}
	159	set tags [string range $tags $index+$srcLen end]
158	160	}
159	161	append x $tags
160	162

167	169
168	170	# Copy script to x, replacing each substring of event with dst.
169	171
170		while {[set index [string first $event $script]] != -1} {
171		append x [string range $script 0 [expr {$index - 1}]]
	172	while {[set index [string first $event $script]] >= 0} {
	173	if {$index > 0} {
	174	append x [string range $script 0 $index-1]
	175	}
172	176	append x $dst
173		set script [string range $script [expr {$index + $eventLen}] end]
	177	set script [string range $script $index+$eventLen end]
174	178	}
175	179	append x $script
176	180

+22

-14

library/text.tcl less more

428	428	%W see insert
429	429	}
430	430	}
431		bind Text <2> {
432		if {!$tk_strictMotif} {
433		tk::TextScanMark %W %x %y
434		}
435		}
436		bind Text <B2-Motion> {
437		if {!$tk_strictMotif} {
438		tk::TextScanDrag %W %x %y
	431	if {[tk windowingsystem] ne "aqua"} {
	432	bind Text <2> {
	433	if {!$tk_strictMotif} {
	434	tk::TextScanMark %W %x %y
	435	}
	436	}
	437	bind Text <B2-Motion> {
	438	if {!$tk_strictMotif} {
	439	tk::TextScanDrag %W %x %y
	440	}
	441	}
	442	} else {
	443	bind Text <3> {
	444	if {!$tk_strictMotif} {
	445	tk::TextScanMark %W %x %y
	446	}
	447	}
	448	bind Text <B3-Motion> {
	449	if {!$tk_strictMotif} {
	450	tk::TextScanDrag %W %x %y
	451	}
439	452	}
440	453	}
441	454	set ::tk::Priv(prevPos) {}

557	570	} else {
558	571	$w mark gravity $anchorname left
559	572	}
560		# Allow focus in any case on Windows, because that will let the
561		# selection be displayed even for state disabled text widgets.
562		if {[tk windowingsystem] eq "win32" \
563		\|\| [$w cget -state] eq "normal"} {
564		focus $w
565		}
	573	focus $w
566	574	if {[$w cget -autoseparators]} {
567	575	$w edit separator
568	576	}

+9

-9

library/tk.tcl less more

10	10	# this file, and for a DISCLAIMER OF ALL WARRANTIES.
11	11
12	12	# Verify that we have Tk binary and script components from the same release
13		package require -exact Tk 8.6.10
	13	package require -exact Tk 8.6.11
14	14
15	15	# Create a ::tk namespace
16	16	namespace eval ::tk {

399	399	event add <<NextPara>> <Control-Down>
400	400	event add <<SelectPrevPara>> <Control-Shift-Up>
401	401	event add <<SelectNextPara>> <Control-Shift-Down>
402		event add <<ToggleSelection>> <Control-ButtonPress-1>
	402	event add <<ToggleSelection>> <Control-Button-1>
403	403
404	404	# Some OS's define a goofy (as in, not <Shift-Tab>) keysym that is
405	405	# returned when the user presses <Shift-Tab>. In order for tab

448	448	event add <<NextPara>> <Control-Down>
449	449	event add <<SelectPrevPara>> <Control-Shift-Up>
450	450	event add <<SelectNextPara>> <Control-Shift-Down>
451		event add <<ToggleSelection>> <Control-ButtonPress-1>
	451	event add <<ToggleSelection>> <Control-Button-1>
452	452	}
453	453	"aqua" {
454	454	event add <<Cut>> <Command-Key-x> <Key-F2> <Command-Lock-Key-X>

461	461	# Official bindings
462	462	# See http://support.apple.com/kb/HT1343
463	463	event add <<SelectAll>> <Command-Key-a>
464		#Attach function keys not otherwise assigned to this event so they no-op - workaround for bug 0e6930dfe7
465		event add <<SelectNone>> <Option-Command-Key-a> <Key-F5> <Key-F1> <Key-F5> <Key-F6> <Key-F7> <Key-F8> <Key-F9> <Key-F10> <Key-F11> <Key-F12>
466	464	event add <<Undo>> <Command-Key-z> <Command-Lock-Key-Z>
467	465	event add <<Redo>> <Shift-Command-Key-z> <Shift-Command-Lock-Key-z>
468	466	event add <<NextChar>> <Right> <Control-Key-f> <Control-Lock-Key-F>

487	485	event add <<NextPara>> <Option-Down>
488	486	event add <<SelectPrevPara>> <Shift-Option-Up>
489	487	event add <<SelectNextPara>> <Shift-Option-Down>
490		event add <<ToggleSelection>> <Command-ButtonPress-1>
	488	event add <<ToggleSelection>> <Command-Button-1>
491	489	}
492	490	}
493	491

497	495
498	496	if {$::tk_library ne ""} {
499	497	proc ::tk::SourceLibFile {file} {
500		namespace eval :: [list source [file join $::tk_library $file.tcl]]
	498	namespace eval :: [list source -encoding utf-8 [file join $::tk_library $file.tcl]]
501	499	}
502	500	namespace eval ::tk {
503	501	SourceLibFile icons

688	686	if {[tk windowingsystem] eq "aqua"} {
689	687	#stub procedures to respond to "do script" Apple Events
690	688	proc ::tk::mac::DoScriptFile {file} {
691		source $file
	689	uplevel #0 $file
	690	source -encoding utf-8 $file
692	691	}
693	692	proc ::tk::mac::DoScriptText {script} {
	693	uplevel #0 $script
694	694	eval $script
695	695	}
696	696	}

702	702
703	703	# Run the Ttk themed widget set initialization
704	704	if {$::ttk::library ne ""} {
705		uplevel \#0 [list source $::ttk::library/ttk.tcl]
	705	uplevel \#0 [list source -encoding utf-8 $::ttk::library/ttk.tcl]
706	706	}
707	707
708	708	# Local Variables:

+26

-43

library/ttk/aquaTheme.tcl less more

14	14	-insertwidth 1
15	15
16	16	ttk::style map . \
17		-foreground {
	17	-foreground {
18	18	disabled systemDisabledControlTextColor
19	19	background systemLabelColor} \
20	20	-selectbackground {

34	34	ttk::style configure TMenubutton -anchor center -padding {2 0 0 2}
35	35	ttk::style configure Toolbutton -anchor center
36	36
	37	# For Entry, Combobox and Spinbox widgets the selected text background
	38	# is the "Highlight color" selected in preferences when the widget
	39	# has focus. It is a gray color when the widget does not have focus or
	40	# the window does not have focus. (The background state implies !focus
	41	# so we only need to specify !focus.)
	42
37	43	# Entry
38		ttk::style configure TEntry \
39		-foreground systemTextColor \
40		-background systemTextBackgroundColor
41	44	ttk::style map TEntry \
42	45	-foreground {
43	46	disabled systemDisabledControlTextColor
44	47	} \
45		-selectforeground {
46		background systemTextColor
	48	-selectbackground {
	49	!focus systemUnemphasizedSelectedTextBackgroundColor
	50	}
	51
	52	# Combobox:
	53	ttk::style map TCombobox \
	54	-foreground {
	55	disabled systemDisabledControlTextColor
47	56	} \
48	57	-selectbackground {
49		background systemTextBackgroundColor
	58	!focus systemUnemphasizedSelectedTextBackgroundColor
50	59	}
51
	60
	61	# Spinbox
	62	ttk::style map TSpinbox \
	63	-foreground {
	64	disabled systemDisabledControlTextColor
	65	} \
	66	-selectbackground {
	67	!focus systemUnemphasizedSelectedTextBackgroundColor
	68	}
52	69
53	70	# Workaround for #1100117:
54	71	# Actually, on Aqua we probably shouldn't stipple images in

66	83	disabled systemDisabledControlTextColor
67	84	selected systemSelectedTabTextColor}
68	85
69		# Combobox:
70		ttk::style configure TCombobox \
71		-foreground systemTextColor \
72		-background systemTransparent
73		ttk::style map TCombobox \
74		-foreground {
75		disabled systemDisabledControlTextColor
76		} \
77		-selectforeground {
78		background systemTextColor
79		} \
80		-selectbackground {
81		background systemTransparent
82		}
83
84		# Spinbox
85		ttk::style configure TSpinbox \
86		-foreground systemTextColor \
87		-background systemTextBackgroundColor \
88		-selectforeground systemSelectedTextColor \
89		-selectbackground systemSelectedTextBackgroundColor
90		ttk::style map TSpinbox \
91		-foreground {
92		disabled systemDisabledControlTextColor
93		} \
94		-selectforeground {
95		!active systemTextColor
96		} \
97		-selectbackground {
98		!active systemTextBackgroundColor
99		!focus systemTextBackgroundColor
100		focus systemSelectedTextBackgroundColor
101		}
102
103	86	# Treeview:
104	87	ttk::style configure Heading \
105	88	-font TkHeadingFont \

115	98	}
116	99
117	100	# Enable animation for ttk::progressbar widget:
118		ttk::style configure TProgressbar -period 100 -maxphase 255
	101	ttk::style configure TProgressbar -period 100 -maxphase 120
119	102
120	103	# For Aqua, labelframe labels should appear outside the border,
121	104	# with a 14 pixel inset and 4 pixels spacing between border and label

+8

-8

library/ttk/button.tcl less more

7	7	# (If the button is released off the widget, the grab deactivates and
8	8	# we get a <Leave> event then, which turns off the "active" state)
9	9	#
10		# Normally, <ButtonRelease> and <ButtonN-Enter/Leave> events are
11		# delivered to the widget which received the initial <ButtonPress>
	10	# Normally, <ButtonRelease> and <ButtonN-Enter/Leave> events are
	11	# delivered to the widget which received the initial <Button>
12	12	# event. However, Tk [grab]s (#1223103) and menu interactions
13	13	# (#1222605) can interfere with this. To guard against spurious
14	14	# <Button1-Enter> events, the <Button1-Enter> binding only sets

19	19
20	20	bind TButton <Enter> { %W instate !disabled {%W state active} }
21	21	bind TButton <Leave> { %W state !active }
22		bind TButton <Key-space> { ttk::button::activate %W }
	22	bind TButton <space> { ttk::button::activate %W }
23	23	bind TButton <<Invoke>> { ttk::button::activate %W }
24	24
25		bind TButton <ButtonPress-1> \
	25	bind TButton <Button-1> \
26	26	{ %W instate !disabled { ttk::clickToFocus %W; %W state pressed } }
27	27	bind TButton <ButtonRelease-1> \
28	28	{ %W instate pressed { %W state !pressed; %W instate !disabled { %W invoke } } }

38	38
39	39	# ...plus a few more:
40	40
41		bind TRadiobutton <KeyPress-Up> { ttk::button::RadioTraverse %W -1 }
42		bind TRadiobutton <KeyPress-Down> { ttk::button::RadioTraverse %W +1 }
	41	bind TRadiobutton <Up> { ttk::button::RadioTraverse %W -1 }
	42	bind TRadiobutton <Down> { ttk::button::RadioTraverse %W +1 }
43	43
44		# bind TCheckbutton <KeyPress-plus> { %W select }
45		# bind TCheckbutton <KeyPress-minus> { %W deselect }
	44	# bind TCheckbutton <plus> { %W select }
	45	# bind TCheckbutton <minus> { %W deselect }
46	46
47	47	# activate --
48	48	# Simulate a button press: temporarily set the state to 'pressed',

+1

-1

library/ttk/clamTheme.tcl less more

4	4	#
5	5
6	6	namespace eval ttk::theme::clam {
7		variable colors
	7	variable colors
8	8	array set colors {
9	9	-disabledfg "#999999"
10	10	-frame "#dcdad5"

+19

-14

library/ttk/combobox.tcl less more

44	44
45	45	ttk::copyBindings TEntry TCombobox
46	46
47		bind TCombobox <KeyPress-Down> { ttk::combobox::Post %W }
48		bind TCombobox <KeyPress-Escape> { ttk::combobox::Unpost %W }
49
50		bind TCombobox <ButtonPress-1> { ttk::combobox::Press "" %W %x %y }
51		bind TCombobox <Shift-ButtonPress-1> { ttk::combobox::Press "s" %W %x %y }
52		bind TCombobox <Double-ButtonPress-1> { ttk::combobox::Press "2" %W %x %y }
53		bind TCombobox <Triple-ButtonPress-1> { ttk::combobox::Press "3" %W %x %y }
	47	bind TCombobox <Down> { ttk::combobox::Post %W }
	48	bind TCombobox <Escape> { ttk::combobox::Unpost %W }
	49
	50	bind TCombobox <Button-1> { ttk::combobox::Press "" %W %x %y }
	51	bind TCombobox <Shift-Button-1> { ttk::combobox::Press "s" %W %x %y }
	52	bind TCombobox <Double-Button-1> { ttk::combobox::Press "2" %W %x %y }
	53	bind TCombobox <Triple-Button-1> { ttk::combobox::Press "3" %W %x %y }
54	54	bind TCombobox <B1-Motion> { ttk::combobox::Drag %W %x }
55	55	bind TCombobox <Motion> { ttk::combobox::Motion %W %x %y }
56	56

61	61	### Combobox listbox bindings.
62	62	#
63	63	bind ComboboxListbox <ButtonRelease-1> { ttk::combobox::LBSelected %W }
64		bind ComboboxListbox <KeyPress-Return> { ttk::combobox::LBSelected %W }
65		bind ComboboxListbox <KeyPress-Escape> { ttk::combobox::LBCancel %W }
66		bind ComboboxListbox <KeyPress-Tab> { ttk::combobox::LBTab %W next }
	64	bind ComboboxListbox <Return> { ttk::combobox::LBSelected %W }
	65	bind ComboboxListbox <Escape> { ttk::combobox::LBCancel %W }
	66	bind ComboboxListbox <Tab> { ttk::combobox::LBTab %W next }
67	67	bind ComboboxListbox <<PrevWindow>> { ttk::combobox::LBTab %W prev }
68	68	bind ComboboxListbox <Destroy> { ttk::combobox::LBCleanup %W }
69	69	bind ComboboxListbox <Motion> { ttk::combobox::LBHover %W %x %y }

81	81	#
82	82	bind ComboboxPopdown <Map> { ttk::combobox::MapPopdown %W }
83	83	bind ComboboxPopdown <Unmap> { ttk::combobox::UnmapPopdown %W }
84		bind ComboboxPopdown <ButtonPress> \
	84	bind ComboboxPopdown <Button> \
85	85	{ ttk::combobox::Unpost [winfo parent %W] }
86	86
87	87	### Option database settings.

105	105	### Binding procedures.
106	106	#
107	107
108		## Press $mode $x $y -- ButtonPress binding for comboboxes.
	108	## Press $mode $x $y -- Button binding for comboboxes.
109	109	# Either post/unpost the listbox, or perform Entry widget binding,
110	110	# depending on widget state and location of button press.
111	111	#

134	134	}
135	135
136	136	## Drag -- B1-Motion binding for comboboxes.
137		# If the initial ButtonPress event was handled by Entry binding,
	137	# If the initial Button event was handled by Entry binding,
138	138	# perform Entry widget drag binding; otherwise nothing.
139	139	#
140	140	proc ttk::combobox::Drag {w x} {

148	148	# Set cursor.
149	149	#
150	150	proc ttk::combobox::Motion {w x y} {
	151	variable State
	152	ttk::saveCursor $w State(userConfCursor) [ttk::cursor text]
151	153	if { [$w identify $x $y] eq "textarea"
152	154	&& [$w instate {!readonly !disabled}]
153	155	} {
154	156	ttk::setCursor $w text
155	157	} else {
156		ttk::setCursor $w ""
	158	ttk::setCursor $w $State(userConfCursor)
157	159	}
158	160	}
159	161

354	356	set w [winfo width $cb]
355	357	set h [winfo height $cb]
356	358	set style [$cb cget -style]
	359	if { $style eq {} } {
	360	set style TCombobox
	361	}
357	362	set postoffset [ttk::style lookup $style -postoffset {} {0 0 0 0}]
358	363	foreach var {x y w h} delta $postoffset {
359	364	incr $var $delta

+24

-2

library/ttk/cursors.tcl less more

139	139
140	140	proc ttk::setCursor {w name} {
141	141	variable Cursors
142		if {[$w cget -cursor] ne $Cursors($name)} {
143		$w configure -cursor $Cursors($name)
	142	if {[info exists Cursors($name)]} {
	143	set cursorname $Cursors($name)
	144	} else {
	145	set cursorname $name
	146	}
	147	if {[$w cget -cursor] ne $cursorname} {
	148	$w configure -cursor $cursorname
	149	}
	150	}
	151
	152	## ttk::saveCursor $w $saveVar $excludeList --
	153	# Set variable $saveVar to the -cursor value from widget $w,
	154	# if either:
	155	# a. $saveVar does not yet exist
	156	# b. the currently user-specified cursor for $w is not in
	157	# $excludeList
	158
	159	proc ttk::saveCursor {w saveVar excludeList} {
	160	upvar $saveVar sv
	161	if {![info exists sv]} {
	162	set sv [$w cget -cursor]
	163	}
	164	if {[$w cget -cursor] ni $excludeList} {
	165	set sv [$w cget -cursor]
144	166	}
145	167	}
146	168

+1

-1

library/ttk/defaults.tcl less more

42	42	ttk::style configure TButton \
43	43	-anchor center -padding "3 3" -width -9 \
44	44	-relief raised -shiftrelief 1
45		ttk::style map TButton -relief [list {!disabled pressed} sunken]
	45	ttk::style map TButton -relief [list {!disabled pressed} sunken]
46	46
47	47	ttk::style configure TCheckbutton \
48	48	-indicatorcolor "#ffffff" -indicatorrelief sunken -padding 1

+45

-38

library/ttk/entry.tcl less more

39	39	#
40	40	# Removed the following standard Tk bindings:
41	41	#
42		# <Control-Key-space>, <Control-Shift-Key-space>,
43		# <Key-Select>, <Shift-Key-Select>:
	42	# <Control-space>, <Control-Shift-space>,
	43	# <Select>, <Shift-Select>:
44	44	# Ttk entry widget doesn't use selection anchor.
45		# <Key-Insert>:
	45	# <Insert>:
46	46	# Inserts PRIMARY selection (on non-Windows platforms).
47	47	# This is inconsistent with typical platform bindings.
48		# <Double-Shift-ButtonPress-1>, <Triple-Shift-ButtonPress-1>:
	48	# <Double-Shift-Button-1>, <Triple-Shift-Button-1>:
49	49	# These don't do the right thing to start with.
50		# <Meta-Key-b>, <Meta-Key-d>, <Meta-Key-f>,
51		# <Meta-Key-BackSpace>, <Meta-Key-Delete>:
	50	# <Meta-b>, <Meta-d>, <Meta-f>,
	51	# <Meta-BackSpace>, <Meta-Delete>:
52	52	# Judgment call. If <Meta> happens to be assigned to the Alt key,
53	53	# these could conflict with application accelerators.
54	54	# (Plus, who has a Meta key these days?)
55		# <Control-Key-t>:
	55	# <Control-t>:
56	56	# Another judgment call. If anyone misses this, let me know
57	57	# and I'll put it back.
58	58	#

67	67	## Button1 bindings:
68	68	# Used for selection and navigation.
69	69	#
70		bind TEntry <ButtonPress-1> { ttk::entry::Press %W %x }
71		bind TEntry <Shift-ButtonPress-1> { ttk::entry::Shift-Press %W %x }
72		bind TEntry <Double-ButtonPress-1> { ttk::entry::Select %W %x word }
73		bind TEntry <Triple-ButtonPress-1> { ttk::entry::Select %W %x line }
	70	bind TEntry <Button-1> { ttk::entry::Press %W %x }
	71	bind TEntry <Shift-Button-1> { ttk::entry::Shift-Press %W %x }
	72	bind TEntry <Double-Button-1> { ttk::entry::Select %W %x word }
	73	bind TEntry <Triple-Button-1> { ttk::entry::Select %W %x line }
74	74	bind TEntry <B1-Motion> { ttk::entry::Drag %W %x }
75	75
76		bind TEntry <B1-Leave> { ttk::entry::DragOut %W %m }
77		bind TEntry <B1-Enter> { ttk::entry::DragIn %W }
78		bind TEntry <ButtonRelease-1> { ttk::entry::Release %W }
	76	bind TEntry <B1-Leave> { ttk::entry::DragOut %W %m }
	77	bind TEntry <B1-Enter> { ttk::entry::DragIn %W }
	78	bind TEntry <ButtonRelease-1> { ttk::entry::Release %W }
79	79
80	80	bind TEntry <<ToggleSelection>> {
81	81	%W instate {!readonly !disabled} { %W icursor @%x ; focus %W }
82	82	}
83	83
84		## Button2 bindings:
	84	## Button2 (Button3 on Aqua) bindings:
85	85	# Used for scanning and primary transfer.
86		# Note: ButtonRelease-2 is mapped to <<PasteSelection>> in tk.tcl.
87		#
88		bind TEntry <ButtonPress-2> { ttk::entry::ScanMark %W %x }
89		bind TEntry <B2-Motion> { ttk::entry::ScanDrag %W %x }
90		bind TEntry <ButtonRelease-2> { ttk::entry::ScanRelease %W %x }
	86	# Note: ButtonRelease-2 (ButtonRelease-3 on Aqua)
	87	# is mapped to <<PasteSelection>> in tk.tcl.
	88	#
	89	if {[tk windowingsystem] ne "aqua"} {
	90	bind TEntry <Button-2> { ttk::entry::ScanMark %W %x }
	91	bind TEntry <B2-Motion> { ttk::entry::ScanDrag %W %x }
	92	bind TEntry <ButtonRelease-2> { ttk::entry::ScanRelease %W %x }
	93	} else {
	94	bind TEntry <Button-3> { ttk::entry::ScanMark %W %x }
	95	bind TEntry <B3-Motion> { ttk::entry::ScanDrag %W %x }
	96	bind TEntry <ButtonRelease-3> { ttk::entry::ScanRelease %W %x }
	97	}
91	98	bind TEntry <<PasteSelection>> { ttk::entry::ScanRelease %W %x }
92	99
93	100	## Keyboard navigation bindings:

113	120
114	121	## Edit bindings:
115	122	#
116		bind TEntry <KeyPress> { ttk::entry::Insert %W %A }
117		bind TEntry <Key-Delete> { ttk::entry::Delete %W }
118		bind TEntry <Key-BackSpace> { ttk::entry::Backspace %W }
	123	bind TEntry <Key> { ttk::entry::Insert %W %A }
	124	bind TEntry <Delete> { ttk::entry::Delete %W }
	125	bind TEntry <BackSpace> { ttk::entry::Backspace %W }
119	126
120	127	# Ignore all Alt, Meta, and Control keypresses unless explicitly bound.
121		# Otherwise, the <KeyPress> class binding will fire and insert the character.
	128	# Otherwise, the <Key> class binding will fire and insert the character.
122	129	# Ditto for Escape, Return, and Tab.
123	130	#
124		bind TEntry <Alt-KeyPress> {# nothing}
125		bind TEntry <Meta-KeyPress> {# nothing}
126		bind TEntry <Control-KeyPress> {# nothing}
127		bind TEntry <Key-Escape> {# nothing}
128		bind TEntry <Key-Return> {# nothing}
129		bind TEntry <Key-KP_Enter> {# nothing}
130		bind TEntry <Key-Tab> {# nothing}
	131	bind TEntry <Alt-Key> {# nothing}
	132	bind TEntry <Meta-Key> {# nothing}
	133	bind TEntry <Control-Key> {# nothing}
	134	bind TEntry <Escape> {# nothing}
	135	bind TEntry <Return> {# nothing}
	136	bind TEntry <KP_Enter> {# nothing}
	137	bind TEntry <Tab> {# nothing}
131	138
132	139	# Argh. Apparently on Windows, the NumLock modifier is interpreted
133	140	# as a Command modifier.
134	141	if {[tk windowingsystem] eq "aqua"} {
135		bind TEntry <Command-KeyPress> {# nothing}
	142	bind TEntry <Command-Key> {# nothing}
136	143	}
137	144	# Tk-on-Cocoa generates characters for these two keys. [Bug 2971663]
138	145	bind TEntry <<PrevLine>> {# nothing}

140	147
141	148	## Additional emacs-like bindings:
142	149	#
143		bind TEntry <Control-Key-d> { ttk::entry::Delete %W }
144		bind TEntry <Control-Key-h> { ttk::entry::Backspace %W }
145		bind TEntry <Control-Key-k> { %W delete insert end }
	150	bind TEntry <Control-d> { ttk::entry::Delete %W }
	151	bind TEntry <Control-h> { ttk::entry::Backspace %W }
	152	bind TEntry <Control-k> { %W delete insert end }
146	153
147	154	# Bindings for IME text input.
148	155

350	357	# Triple-clicking enters "line-select" mode.
351	358	#
352	359
353		## Press -- ButtonPress-1 binding.
	360	## Press -- Button-1 binding.
354	361	# Set the insertion cursor, claim the input focus, set up for
355	362	# future drag operations.
356	363	#

367	374	set State(anchor) [$w index insert]
368	375	}
369	376
370		## Shift-Press -- Shift-ButtonPress-1 binding.
	377	## Shift-Press -- Shift-Button-1 binding.
371	378	# Extends the selection, sets anchor for future drag operations.
372	379	#
373	380	proc ttk::entry::Shift-Press {w x} {

516	523	### Button 2 binding procedures.
517	524	#
518	525
519		## ScanMark -- ButtonPress-2 binding.
	526	## ScanMark -- Button-2 binding.
520	527	# Marks the start of a scan or primary transfer operation.
521	528	#
522	529	proc ttk::entry::ScanMark {w x} {

+1

-1

library/ttk/fonts.tcl less more

81	81	set F(family) "MS Sans Serif"
82	82	}
83	83	} else {
84		if {[lsearch -exact [font families] Tahoma] != -1} {
	84	if {[lsearch -exact [font families] Tahoma] >= 0} {
85	85	set F(family) "Tahoma"
86	86	} else {
87	87	set F(family) "MS Sans Serif"

+14

-14

library/ttk/menubutton.tcl less more

4	4	#
5	5	# Pulldown: Press menubutton, drag over menu, release to activate menu entry
6	6	# Popdown: Click menubutton to post menu
7		# Keyboard: <Key-space> or accelerator key to post menu
	7	# Keyboard: <space> or accelerator key to post menu
8	8	#
9	9	# (In addition, when menu system is active, "dropdown" -- menu posts
10	10	# on mouse-over. Ttk menubuttons don't implement this).
11	11	#
12		# For keyboard and popdown mode, we hand off to tk_popup and let
	12	# For keyboard and popdown mode, we hand off to tk_popup and let
13	13	# the built-in Tk bindings handle the rest of the interaction.
14	14	#
15	15	# ON X11:

18	18	# This won't work for Ttk menubuttons in pulldown mode,
19	19	# since we need to process the final <ButtonRelease> event,
20	20	# and this might be delivered to the menu. So instead we
21		# rely on the passive grab that occurs on <ButtonPress> events,
	21	# rely on the passive grab that occurs on <Button> events,
22	22	# and transition to popdown mode when the mouse is released
23	23	# or dragged outside the menubutton.
24		#
	24	#
25	25	# ON WINDOWS:
26	26	#
27		# I'm not sure what the hell is going on here. [$menu post] apparently
	27	# I'm not sure what the hell is going on here. [$menu post] apparently
28	28	# sets up some kind of internal grab for native menus.
29	29	# On this platform, just use [tk_popup] for all menu actions.
30		#
	30	#
31	31	# ON MACOS:
32	32	#
33	33	# Same probably applies here.

45	45
46	46	bind TMenubutton <Enter> { %W instate !disabled {%W state active } }
47	47	bind TMenubutton <Leave> { %W state !active }
48		bind TMenubutton <Key-space> { ttk::menubutton::Popdown %W }
	48	bind TMenubutton <space> { ttk::menubutton::Popdown %W }
49	49	bind TMenubutton <<Invoke>> { ttk::menubutton::Popdown %W }
50	50
51	51	if {[tk windowingsystem] eq "x11"} {
52		bind TMenubutton <ButtonPress-1> { ttk::menubutton::Pulldown %W }
	52	bind TMenubutton <Button-1> { ttk::menubutton::Pulldown %W }
53	53	bind TMenubutton <ButtonRelease-1> { ttk::menubutton::TransferGrab %W }
54	54	bind TMenubutton <B1-Leave> { ttk::menubutton::TransferGrab %W }
55	55	} else {
56		bind TMenubutton <ButtonPress-1> \
	56	bind TMenubutton <Button-1> \
57	57	{ %W state pressed ; ttk::menubutton::Popdown %W }
58	58	bind TMenubutton <ButtonRelease-1> \
59	59	{ if {[winfo exists %W]} { %W state !pressed } }

96	96	}
97	97	below {
98	98	set entry ""
99		incr y $bh
	99	incr y $bh
100	100	}
101	101	left {
102	102	incr y $menuPad

104	104	}
105	105	right {
106	106	incr y $menuPad
107		incr x $bw
	107	incr x $bw
108	108	}
109	109	default {
110	110	incr y $bbh

181	181
182	182	# Pulldown (X11 only) --
183	183	# Called when Button1 is pressed on a menubutton.
184		# Posts the menu; a subsequent ButtonRelease
	184	# Posts the menu; a subsequent ButtonRelease
185	185	# or Leave event will set a grab on the menu.
186	186	#
187	187	proc ttk::menubutton::Pulldown {mb} {

223	223	# FindMenuEntry --
224	224	# Hack to support tk_optionMenus.
225	225	# Returns the index of the menu entry with a matching -label,
226		# -1 if not found.
	226	# "" if not found.
227	227	#
228	228	proc ttk::menubutton::FindMenuEntry {menu s} {
229	229	set last [$menu index last]
230		if {$last eq "none"} {
	230	if {$last eq "none" \|\| $last eq ""} {
231	231	return ""
232	232	}
233	233	for {set i 0} {$i <= $last} {incr i} {

+19

-19

library/ttk/notebook.tcl less more

5	5	variable TLNotebooks ;# See enableTraversal
6	6	}
7	7
8		bind TNotebook <ButtonPress-1> { ttk::notebook::Press %W %x %y }
9		bind TNotebook <Key-Right> { ttk::notebook::CycleTab %W 1; break }
10		bind TNotebook <Key-Left> { ttk::notebook::CycleTab %W -1; break }
11		bind TNotebook <Control-Key-Tab> { ttk::notebook::CycleTab %W 1; break }
12		bind TNotebook <Control-Shift-Key-Tab> { ttk::notebook::CycleTab %W -1; break }
	8	bind TNotebook <Button-1> { ttk::notebook::Press %W %x %y }
	9	bind TNotebook <Right> { ttk::notebook::CycleTab %W 1; break }
	10	bind TNotebook <Left> { ttk::notebook::CycleTab %W -1; break }
	11	bind TNotebook <Control-Tab> { ttk::notebook::CycleTab %W 1; break }
	12	bind TNotebook <Control-Shift-Tab> { ttk::notebook::CycleTab %W -1; break }
13	13	catch {
14	14	bind TNotebook <Control-ISO_Left_Tab> { ttk::notebook::CycleTab %W -1; break }
15	15	}

42	42	}
43	43
44	44	# Press $nb $x $y --
45		# ButtonPress-1 binding for notebook widgets.
	45	# Button-1 binding for notebook widgets.
46	46	# Activate the tab under the mouse cursor, if any.
47	47	#
48	48	proc ttk::notebook::Press {w x y} {

69	69	}
70	70
71	71	# MnemonicTab $nb $key --
72		# Scan all tabs in the specified notebook for one with the
	72	# Scan all tabs in the specified notebook for one with the
73	73	# specified mnemonic. If found, returns path name of tab;
74	74	# otherwise returns ""
75	75	#

93	93	# Enable keyboard traversal for a notebook widget
94	94	# by adding bindings to the containing toplevel window.
95	95	#
96		# TLNotebooks($top) keeps track of the list of all traversal-enabled
97		# notebooks contained in the toplevel
	96	# TLNotebooks($top) keeps track of the list of all traversal-enabled
	97	# notebooks contained in the toplevel
98	98	#
99	99	proc ttk::notebook::enableTraversal {nb} {
100	100	variable TLNotebooks

104	104	if {![info exists TLNotebooks($top)]} {
105	105	# Augment $top bindings:
106	106	#
107		bind $top <Control-Key-Next> {+ttk::notebook::TLCycleTab %W 1}
108		bind $top <Control-Key-Prior> {+ttk::notebook::TLCycleTab %W -1}
109		bind $top <Control-Key-Tab> {+ttk::notebook::TLCycleTab %W 1}
110		bind $top <Control-Shift-Key-Tab> {+ttk::notebook::TLCycleTab %W -1}
	107	bind $top <Control-Next> {+ttk::notebook::TLCycleTab %W 1}
	108	bind $top <Control-Prior> {+ttk::notebook::TLCycleTab %W -1}
	109	bind $top <Control-Tab> {+ttk::notebook::TLCycleTab %W 1}
	110	bind $top <Control-Shift-Tab> {+ttk::notebook::TLCycleTab %W -1}
111	111	catch {
112		bind $top <Control-Key-ISO_Left_Tab> {+ttk::notebook::TLCycleTab %W -1}
	112	bind $top <Control-ISO_Left_Tab> {+ttk::notebook::TLCycleTab %W -1}
113	113	}
114	114	if {[tk windowingsystem] eq "aqua"} {
115		bind $top <Option-KeyPress> \
	115	bind $top <Option-Key> \
116	116	+[list ttk::notebook::MnemonicActivation $top %K]
117	117	} else {
118		bind $top <Alt-KeyPress> \
	118	bind $top <Alt-Key> \
119	119	+[list ttk::notebook::MnemonicActivation $top %K]
120	120	}
121	121	bind $top <Destroy> {+ttk::notebook::TLCleanup %W}

144	144	}
145	145	}
146	146
147		# EnclosingNotebook $w --
	147	# EnclosingNotebook $w --
148	148	# Return the nearest traversal-enabled notebook widget
149	149	# that contains $w.
150	150	#

170	170
171	171	# TLCycleTab --
172	172	# toplevel binding procedure for Control-Tab / Control-Shift-Tab
173		# Select the next/previous tab in the nearest ancestor notebook.
	173	# Select the next/previous tab in the nearest ancestor notebook.
174	174	#
175	175	proc ttk::notebook::TLCycleTab {w dir} {
176	176	set nb [EnclosingNotebook $w]

181	181	}
182	182
183	183	# MnemonicActivation $nb $key --
184		# Alt-KeyPress binding procedure for mnemonic activation.
	184	# Alt-Key binding procedure for mnemonic activation.
185	185	# Scan all notebooks in specified toplevel for a tab with the
186	186	# the specified mnemonic. If found, activate it and return TCL_BREAK.
187	187	#

+12

-3

library/ttk/panedwindow.tcl less more

14	14
15	15	## Bindings:
16	16	#
17		bind TPanedwindow <ButtonPress-1> { ttk::panedwindow::Press %W %x %y }
	17	bind TPanedwindow <Button-1> { ttk::panedwindow::Press %W %x %y }
18	18	bind TPanedwindow <B1-Motion> { ttk::panedwindow::Drag %W %x %y }
19	19	bind TPanedwindow <ButtonRelease-1> { ttk::panedwindow::Release %W %x %y }
20	20

61	61	#
62	62	proc ttk::panedwindow::ResetCursor {w} {
63	63	variable State
	64
	65	ttk::saveCursor $w State(userConfCursor) \
	66	[list [ttk::cursor hresize] [ttk::cursor vresize]]
	67
64	68	if {!$State(pressed)} {
65		ttk::setCursor $w {}
	69	ttk::setCursor $w $State(userConfCursor)
66	70	}
67	71	}
68	72
69	73	proc ttk::panedwindow::SetCursor {w x y} {
70		set cursor ""
	74	variable State
	75
	76	ttk::saveCursor $w State(userConfCursor) \
	77	[list [ttk::cursor hresize] [ttk::cursor vresize]]
	78
	79	set cursor $State(userConfCursor)
71	80	if {[llength [$w identify $x $y]]} {
72	81	# Assume we're over a sash.
73	82	switch -- [$w cget -orient] {

+4

-4

library/ttk/scale.tcl less more

8	8	}
9	9	}
10	10
11		bind TScale <ButtonPress-1> { ttk::scale::Press %W %x %y }
	11	bind TScale <Button-1> { ttk::scale::Press %W %x %y }
12	12	bind TScale <B1-Motion> { ttk::scale::Drag %W %x %y }
13	13	bind TScale <ButtonRelease-1> { ttk::scale::Release %W %x %y }
14	14
15		bind TScale <ButtonPress-2> { ttk::scale::Jump %W %x %y }
	15	bind TScale <Button-2> { ttk::scale::Jump %W %x %y }
16	16	bind TScale <B2-Motion> { ttk::scale::Drag %W %x %y }
17	17	bind TScale <ButtonRelease-2> { ttk::scale::Release %W %x %y }
18	18
19		bind TScale <ButtonPress-3> { ttk::scale::Jump %W %x %y }
	19	bind TScale <Button-3> { ttk::scale::Jump %W %x %y }
20	20	bind TScale <B3-Motion> { ttk::scale::Drag %W %x %y }
21	21	bind TScale <ButtonRelease-3> { ttk::scale::Release %W %x %y }
22	22

51	51	}
52	52	}
53	53
54		# scale::Jump -- ButtonPress-2/3 binding for scale acts like
	54	# scale::Jump -- Button-2/3 binding for scale acts like
55	55	# Press except that clicking in the trough jumps to the
56	56	# clicked position.
57	57	proc ttk::scale::Jump {w x y} {

+28

-5

library/ttk/scrollbar.tcl less more

8	8	# State(first) -- value of -first at start of drag.
9	9	}
10	10
11		bind TScrollbar <ButtonPress-1> { ttk::scrollbar::Press %W %x %y }
	11	bind TScrollbar <Button-1> { ttk::scrollbar::Press %W %x %y }
12	12	bind TScrollbar <B1-Motion> { ttk::scrollbar::Drag %W %x %y }
13	13	bind TScrollbar <ButtonRelease-1> { ttk::scrollbar::Release %W %x %y }
14	14
15		bind TScrollbar <ButtonPress-2> { ttk::scrollbar::Jump %W %x %y }
	15	bind TScrollbar <Button-2> { ttk::scrollbar::Jump %W %x %y }
16	16	bind TScrollbar <B2-Motion> { ttk::scrollbar::Drag %W %x %y }
17	17	bind TScrollbar <ButtonRelease-2> { ttk::scrollbar::Release %W %x %y }
	18
	19	# Redirect scrollwheel bindings to the scrollbar widget
	20	#
	21	# The shift-bindings scroll left/right (not up/down)
	22	# if a widget has both possibilities
	23	set eventList [list <MouseWheel> <Shift-MouseWheel>]
	24	switch [tk windowingsystem] {
	25	aqua {
	26	lappend eventList <Option-MouseWheel> <Shift-Option-MouseWheel>
	27	}
	28	x11 {
	29	lappend eventList <Button-4> <Button-5> \
	30	<Shift-Button-4> <Shift-Button-5>
	31	# For tk 8.7, the event list will be extended by
	32	# <Button-6> <Button-7>
	33	}
	34	}
	35	foreach event $eventList {
	36	bind TScrollbar $event [bind Scrollbar $event]
	37	}
	38	unset eventList event
18	39
19	40	proc ttk::scrollbar::Scroll {w n units} {
20	41	set cmd [$w cget -command]

37	58	set State(yPress) $y
38	59
39	60	switch -glob -- [$w identify $x $y] {
40		*uparrow -
	61	*uparrow -
41	62	*leftarrow {
42	63	ttk::Repeatedly Scroll $w -1 units
43	64	}

45	66	*rightarrow {
46	67	ttk::Repeatedly Scroll $w 1 units
47	68	}
	69	*grip -
48	70	*thumb {
49	71	set State(first) [lindex [$w get] 0]
50	72	}

67	89	proc ttk::scrollbar::Drag {w x y} {
68	90	variable State
69	91	if {![info exists State(first)]} {
70		# Initial buttonpress was not on the thumb,
	92	# Initial buttonpress was not on the thumb,
71	93	# or something screwy has happened. In either case, ignore:
72	94	return;
73	95	}

82	104	ttk::CancelRepeat
83	105	}
84	106
85		# scrollbar::Jump -- ButtonPress-2 binding for scrollbars.
	107	# scrollbar::Jump -- Button-2 binding for scrollbars.
86	108	# Behaves exactly like scrollbar::Press, except that
87	109	# clicking in the trough jumps to the the selected position.
88	110	#

90	112	variable State
91	113
92	114	switch -glob -- [$w identify $x $y] {
	115	*grip -
93	116	*thumb -
94	117	*trough {
95	118	set State(first) [$w fraction $x $y]

+1

-1

library/ttk/sizegrip.tcl less more

31	31	}
32	32	}
33	33
34		bind TSizegrip <ButtonPress-1> { ttk::sizegrip::Press %W %X %Y }
	34	bind TSizegrip <Button-1> { ttk::sizegrip::Press %W %X %Y }
35	35	bind TSizegrip <B1-Motion> { ttk::sizegrip::Drag %W %X %Y }
36	36	bind TSizegrip <ButtonRelease-1> { ttk::sizegrip::Release %W %X %Y }
37	37

+37

-20

library/ttk/spinbox.tcl less more

11	11	ttk::copyBindings TEntry TSpinbox
12	12
13	13	bind TSpinbox <Motion> { ttk::spinbox::Motion %W %x %y }
14		bind TSpinbox <ButtonPress-1> { ttk::spinbox::Press %W %x %y }
	14	bind TSpinbox <Button-1> { ttk::spinbox::Press %W %x %y }
15	15	bind TSpinbox <ButtonRelease-1> { ttk::spinbox::Release %W }
16	16	bind TSpinbox <Double-Button-1> { ttk::spinbox::DoubleClick %W %x %y }
17	17	bind TSpinbox <Triple-Button-1> {} ;# disable TEntry triple-click
18	18
19		bind TSpinbox <KeyPress-Up> { event generate %W <<Increment>> }
20		bind TSpinbox <KeyPress-Down> { event generate %W <<Decrement>> }
	19	bind TSpinbox <Up> { event generate %W <<Increment>> }
	20	bind TSpinbox <Down> { event generate %W <<Decrement>> }
21	21
22	22	bind TSpinbox <<Increment>> { ttk::spinbox::Spin %W +1 }
23	23	bind TSpinbox <<Decrement>> { ttk::spinbox::Spin %W -1 }

28	28	# Sets cursor.
29	29	#
30	30	proc ttk::spinbox::Motion {w x y} {
	31	variable State
	32	ttk::saveCursor $w State(userConfCursor) [ttk::cursor text]
31	33	if { [$w identify $x $y] eq "textarea"
32		&& [$w instate {!readonly !disabled}]
	34	&& [$w instate {!readonly !disabled}]
33	35	} {
34	36	ttk::setCursor $w text
35	37	} else {
36		ttk::setCursor $w ""
	38	ttk::setCursor $w $State(userConfCursor)
37	39	}
38	40	}
39	41

43	45	if {[$w instate disabled]} { return }
44	46	focus $w
45	47	switch -glob -- [$w identify $x $y] {
46		*textarea { ttk::entry::Press $w $x }
	48	*textarea { ttk::entry::Press $w $x }
47	49	*rightarrow -
48		*uparrow { ttk::Repeatedly event generate $w <<Increment>> }
	50	*uparrow { ttk::Repeatedly event generate $w <<Increment>> }
49	51	*leftarrow -
50		*downarrow { ttk::Repeatedly event generate $w <<Decrement>> }
	52	*downarrow { ttk::Repeatedly event generate $w <<Decrement>> }
51	53	*spinbutton {
52	54	if {$y * 2 >= [winfo height $w]} {
53		set event <<Decrement>>
	55	set event <<Decrement>>
54	56	} else {
55		set event <<Increment>>
	57	set event <<Increment>>
56	58	}
57	59	ttk::Repeatedly event generate $w $event
58	60	}

66	68	if {[$w instate disabled]} { return }
67	69
68	70	switch -glob -- [$w identify $x $y] {
69		*textarea { SelectAll $w }
	71	*textarea { SelectAll $w }
70	72	* { Press $w $x $y }
71	73	}
72	74	}

132	134	# -from, -to, and -increment.
133	135	#
134	136	proc ttk::spinbox::Spin {w dir} {
	137	variable State
	138
135	139	if {[$w instate disabled]} { return }
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]
	140
	141	if {![info exists State($w,values.length)]} {
	142	set State($w,values.index) -1
	143	set State($w,values.last) {}
	144	}
	145	set State($w,values) [$w cget -values]
	146	set State($w,values.length) [llength $State($w,values)]
	147
	148	if {$State($w,values.length) > 0} {
	149	set value [$w get]
	150	set current $State($w,values.index)
	151	if {$value ne $State($w,values.last)} {
	152	set current [lsearch -exact $State($w,values) $value]
	153	if {$current < 0} {set current -1}
	154	}
	155	set State($w,values.index) [Adjust $w [expr {$current + $dir}] 0 \
	156	[expr {$State($w,values.length) - 1}]]
	157	set State($w,values.last) [lindex $State($w,values) $State($w,values.index)]
	158	$w set $State($w,values.last)
142	159	} else {
143		if {[catch {
144		set v [expr {[scan [$w get] %f] + $dir * [$w cget -increment]}]
	160	if {[catch {
	161	set v [expr {[scan [$w get] %f] + $dir * [$w cget -increment]}]
145	162	}]} {
146	163	set v [$w cget -from]
147	164	}

159	176	if {$fmt eq ""} {
160	177	# Try to guess a suitable -format based on -increment.
161	178	set delta [expr {abs([$w cget -increment])}]
162		if {0 < $delta && $delta < 1} {
	179	if {0 < $delta && $delta < 1} {
163	180	# NB: This guesses wrong if -increment has more than 1
164	181	# significant digit itself, e.g., -increment 0.25
165	182	set nsd [expr {int(ceil(-log10($delta)))}]

+24

-20

library/ttk/treeview.tcl less more

27	27	bind Treeview <Motion> { ttk::treeview::Motion %W %x %y }
28	28	bind Treeview <B1-Leave> { #nothing }
29	29	bind Treeview <Leave> { ttk::treeview::ActivateHeading {} {}}
30		bind Treeview <ButtonPress-1> { ttk::treeview::Press %W %x %y }
31		bind Treeview <Double-ButtonPress-1> { ttk::treeview::DoubleClick %W %x %y }
	30	bind Treeview <Button-1> { ttk::treeview::Press %W %x %y }
	31	bind Treeview <Double-Button-1> { ttk::treeview::DoubleClick %W %x %y }
32	32	bind Treeview <ButtonRelease-1> { ttk::treeview::Release %W %x %y }
33	33	bind Treeview <B1-Motion> { ttk::treeview::Drag %W %x %y }
34		bind Treeview <KeyPress-Up> { ttk::treeview::Keynav %W up }
35		bind Treeview <KeyPress-Down> { ttk::treeview::Keynav %W down }
36		bind Treeview <KeyPress-Right> { ttk::treeview::Keynav %W right }
37		bind Treeview <KeyPress-Left> { ttk::treeview::Keynav %W left }
38		bind Treeview <KeyPress-Prior> { %W yview scroll -1 pages }
39		bind Treeview <KeyPress-Next> { %W yview scroll 1 pages }
40		bind Treeview <KeyPress-Return> { ttk::treeview::ToggleFocus %W }
41		bind Treeview <KeyPress-space> { ttk::treeview::ToggleFocus %W }
42
43		bind Treeview <Shift-ButtonPress-1> \
	34	bind Treeview <Up> { ttk::treeview::Keynav %W up }
	35	bind Treeview <Down> { ttk::treeview::Keynav %W down }
	36	bind Treeview <Right> { ttk::treeview::Keynav %W right }
	37	bind Treeview <Left> { ttk::treeview::Keynav %W left }
	38	bind Treeview <Prior> { %W yview scroll -1 pages }
	39	bind Treeview <Next> { %W yview scroll 1 pages }
	40	bind Treeview <Return> { ttk::treeview::ToggleFocus %W }
	41	bind Treeview <space> { ttk::treeview::ToggleFocus %W }
	42
	43	bind Treeview <Shift-Button-1> \
44	44	{ ttk::treeview::Select %W %x %y extend }
45	45	bind Treeview <<ToggleSelection>> \
46	46	{ ttk::treeview::Select %W %x %y toggle }
47	47
48		ttk::copyBindings TtkScrollable Treeview
	48	ttk::copyBindings TtkScrollable Treeview
49	49
50	50	### Binding procedures.
51	51	#

101	101	# Sets cursor, active element ...
102	102	#
103	103	proc ttk::treeview::Motion {w x y} {
104		set cursor {}
	104	variable State
	105
	106	ttk::saveCursor $w State(userConfCursor) [ttk::cursor hresize]
	107
	108	set cursor $State(userConfCursor)
105	109	set activeHeading {}
106	110
107	111	switch -- [$w identify region $x $y] {

126	130	# triggers a <Leave> event. A proc checking if the display column
127	131	# $State(activeHeading) is really still present or not could be
128	132	# written but it would need to check several special cases:
129		# a. -displaycolumns "#all" or being an explicit columns list
	133	# a. -displaycolumns "#all" or being an explicit columns list
130	134	# b. column #0 display is not governed by the -displaycolumn
131	135	# list but by the value of the -show option
132	136	# --> Let's rather catch the following line.

150	154	}
151	155	}
152	156
153		## DoubleClick -- Double-ButtonPress-1 binding.
	157	## DoubleClick -- Double-Button-1 binding.
154	158	#
155	159	proc ttk::treeview::DoubleClick {w x y} {
156	160	if {[set row [$w identify row $x $y]] ne ""} {

160	164	}
161	165	}
162	166
163		## Press -- ButtonPress binding.
	167	## Press -- Button binding.
164	168	#
165	169	proc ttk::treeview::Press {w x y} {
166	170	focus $w

260	264
261	265	## -selectmode none:
262	266	#
263		proc ttk::treeview::select.choose.none {w item} { $w focus $item }
264		proc ttk::treeview::select.toggle.none {w item} { $w focus $item }
265		proc ttk::treeview::select.extend.none {w item} { $w focus $item }
	267	proc ttk::treeview::select.choose.none {w item} { $w focus $item; $w see $item }
	268	proc ttk::treeview::select.toggle.none {w item} { $w focus $item; $w see $item }
	269	proc ttk::treeview::select.extend.none {w item} { $w focus $item; $w see $item }
266	270
267	271	## -selectmode browse:
268	272	#

+17

-17

library/ttk/ttk.tcl less more

11	11	}
12	12	}
13	13
14		source [file join $::ttk::library fonts.tcl]
15		source [file join $::ttk::library cursors.tcl]
16		source [file join $::ttk::library utils.tcl]
	14	source -encoding utf-8 [file join $::ttk::library fonts.tcl]
	15	source -encoding utf-8 [file join $::ttk::library cursors.tcl]
	16	source -encoding utf-8 [file join $::ttk::library utils.tcl]
17	17
18	18	## ttk::deprecated $old $new --
19	19	# Define $old command as a deprecated alias for $new command

96	96
97	97	### Load widget bindings.
98	98	#
99		source [file join $::ttk::library button.tcl]
100		source [file join $::ttk::library menubutton.tcl]
101		source [file join $::ttk::library scrollbar.tcl]
102		source [file join $::ttk::library scale.tcl]
103		source [file join $::ttk::library progress.tcl]
104		source [file join $::ttk::library notebook.tcl]
105		source [file join $::ttk::library panedwindow.tcl]
106		source [file join $::ttk::library entry.tcl]
107		source [file join $::ttk::library combobox.tcl] ;# dependency: entry.tcl
108		source [file join $::ttk::library spinbox.tcl] ;# dependency: entry.tcl
109		source [file join $::ttk::library treeview.tcl]
110		source [file join $::ttk::library sizegrip.tcl]
	99	source -encoding utf-8 [file join $::ttk::library button.tcl]
	100	source -encoding utf-8 [file join $::ttk::library menubutton.tcl]
	101	source -encoding utf-8 [file join $::ttk::library scrollbar.tcl]
	102	source -encoding utf-8 [file join $::ttk::library scale.tcl]
	103	source -encoding utf-8 [file join $::ttk::library progress.tcl]
	104	source -encoding utf-8 [file join $::ttk::library notebook.tcl]
	105	source -encoding utf-8 [file join $::ttk::library panedwindow.tcl]
	106	source -encoding utf-8 [file join $::ttk::library entry.tcl]
	107	source -encoding utf-8 [file join $::ttk::library combobox.tcl] ;# dependency: entry.tcl
	108	source -encoding utf-8 [file join $::ttk::library spinbox.tcl] ;# dependency: entry.tcl
	109	source -encoding utf-8 [file join $::ttk::library treeview.tcl]
	110	source -encoding utf-8 [file join $::ttk::library sizegrip.tcl]
111	111
112	112	## Label and Labelframe bindings:
113	113	# (not enough to justify their own file...)

121	121	variable library
122	122
123	123	# "default" always present:
124		uplevel #0 [list source [file join $library defaults.tcl]]
	124	uplevel #0 [list source -encoding utf-8 [file join $library defaults.tcl]]
125	125
126	126	set builtinThemes [style theme names]
127	127	foreach {theme scripts} {

134	134	} {
135	135	if {[lsearch -exact $builtinThemes $theme] >= 0} {
136	136	foreach script $scripts {
137		uplevel #0 [list source [file join $library $script]]
	137	uplevel #0 [list source -encoding utf-8 [file join $library $script]]
138	138	}
139	139	}
140	140	}

+10

-13

library/ttk/utils.tcl less more

57	57	}
58	58
59	59	## ttk::clickToFocus $w --
60		# Utility routine, used in <ButtonPress-1> bindings --
	60	# Utility routine, used in <Button-1> bindings --
61	61	# Assign keyboard focus to the specified widget if -takefocus is enabled.
62	62	#
63	63	proc ttk::clickToFocus {w} {

277	277	# On OSX, Tk generates sensible values for the %D field in <MouseWheel> events.
278	278	#
279	279	# On Windows, %D must be scaled by a factor of 120.
280		# In addition, Tk redirects mousewheel events to the window with
281		# keyboard focus instead of sending them to the window under the pointer.
282		# We do not attempt to fix that here, see also TIP#171.
283	280	#
284	281	# OSX conventionally uses Shift+MouseWheel for horizontal scrolling,
285	282	# and Option+MouseWheel for accelerated scrolling.

300	297
301	298	proc ttk::bindMouseWheel {bindtag callback} {
302	299	if {[tk windowingsystem] eq "x11"} {
303		bind $bindtag <ButtonPress-4> "$callback -1"
304		bind $bindtag <ButtonPress-5> "$callback +1"
	300	bind $bindtag <Button-4> "$callback -1"
	301	bind $bindtag <Button-5> "$callback +1"
305	302	}
306	303	if {[tk windowingsystem] eq "aqua"} {
307		bind $bindtag <MouseWheel> [append callback { [expr {-(%D)}]} ]
308		bind $bindtag <Option-MouseWheel> [append callback { [expr {-10 *(%D)}]} ]
	304	bind $bindtag <MouseWheel> "$callback \[expr {-%D}\]"
	305	bind $bindtag <Option-MouseWheel> "$callback \[expr {-10*%D}\]"
309	306	} else {
310		bind $bindtag <MouseWheel> [append callback { [expr {-(%D / 120)}]}]
	307	bind $bindtag <MouseWheel> "$callback \[expr {-%D/120)}\]"
311	308	}
312	309	}
313	310

320	317	#
321	318
322	319	if {[tk windowingsystem] eq "x11"} {
323		bind TtkScrollable <ButtonPress-4> { %W yview scroll -5 units }
324		bind TtkScrollable <ButtonPress-5> { %W yview scroll 5 units }
325		bind TtkScrollable <Shift-ButtonPress-4> { %W xview scroll -5 units }
326		bind TtkScrollable <Shift-ButtonPress-5> { %W xview scroll 5 units }
	320	bind TtkScrollable <Button-4> { %W yview scroll -5 units }
	321	bind TtkScrollable <Button-5> { %W yview scroll 5 units }
	322	bind TtkScrollable <Shift-Button-4> { %W xview scroll -5 units }
	323	bind TtkScrollable <Shift-Button-5> { %W xview scroll 5 units }
327	324	}
328	325	if {[tk windowingsystem] eq "aqua"} {
329	326	bind TtkScrollable <MouseWheel> \

+12

-12

library/ttk/vistaTheme.tcl less more

2	2	#
3	3
4	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
	5	# is created in C due to the need to assign a theme-enabled function for
6	6	# detecting when themeing is disabled. On systems that cannot support the
7	7	# Vista theme, there will be no such theme created and we must not
8	8	# evaluate this script.

68	68	ttk::style layout TCombobox {
69	69	Combobox.border -sticky nswe -border 0 -children {
70	70	Combobox.rightdownarrow -side right -sticky ns
71		Combobox.padding -expand 1 -sticky nswe -children {
	71	Combobox.padding -sticky nswe -children {
72	72	Combobox.background -sticky nswe -children {
73		Combobox.focus -expand 1 -sticky nswe -children {
	73	Combobox.focus -sticky nswe -children {
74	74	Combobox.textarea -sticky nswe
75	75	}
76	76	}

137	137	Spinbox.background -sticky news -children {
138	138	Spinbox.padding -sticky news -children {
139	139	Spinbox.innerbg -sticky news -children {
140		Spinbox.textarea -expand 1
	140	Spinbox.textarea
141	141	}
142	142	}
143	143	Spinbox.uparrow -side top -sticky ens

150	150	-selectforeground [list !focus SystemWindowText] \
151	151	;
152	152
153
	153
154	154	# SCROLLBAR elements (Vista includes a state for 'hover')
155	155	ttk::style element create Vertical.Scrollbar.uparrow vsapi \
156	156	SCROLLBAR 1 {disabled 4 pressed 3 active 2 hover 17 {} 1} \

195	195	Vertical.Progressbar.pbar -side bottom -sticky we
196	196	}
197	197	}
198
	198
199	199	# Scale
200	200	ttk::style element create Horizontal.Scale.slider vsapi \
201	201	TRACKBAR 3 {disabled 5 focus 4 pressed 3 active 2 {} 1} \
202	202	-width 6 -height 12
203	203	ttk::style layout Horizontal.TScale {
204		Scale.focus -expand 1 -sticky nswe -children {
205		Horizontal.Scale.trough -expand 1 -sticky nswe -children {
	204	Scale.focus -sticky nswe -children {
	205	Horizontal.Scale.trough -sticky nswe -children {
206	206	Horizontal.Scale.track -sticky we
207	207	Horizontal.Scale.slider -side left -sticky {}
208	208	}

212	212	TRACKBAR 6 {disabled 5 focus 4 pressed 3 active 2 {} 1} \
213	213	-width 12 -height 6
214	214	ttk::style layout Vertical.TScale {
215		Scale.focus -expand 1 -sticky nswe -children {
216		Vertical.Scale.trough -expand 1 -sticky nswe -children {
	215	Scale.focus -sticky nswe -children {
	216	Vertical.Scale.trough -sticky nswe -children {
217	217	Vertical.Scale.track -sticky ns
218	218	Vertical.Scale.slider -side top -sticky {}
219	219	}
220	220	}
221	221	}
222
	222
223	223	# Treeview
224	224	ttk::style configure Item -padding {4 0 0 0}
225
	225
226	226	package provide ttk::theme::vista 1.0
227	227	}
228	228	}

+0

-7

library/ttk/xpTheme.tcl less more

26	26	ttk::style configure TNotebook -tabmargins {2 2 2 0}
27	27	ttk::style map TNotebook.Tab \
28	28	-expand [list selected {2 2 2 2}]
29
30		# Treeview:
31		ttk::style configure Heading -font TkHeadingFont
32		ttk::style configure Treeview -background SystemWindow
33		ttk::style map Treeview \
34		-background [list selected SystemHighlight] \
35		-foreground [list selected SystemHighlightText] ;
36	29
37	30	ttk::style configure TLabelframe.Label -foreground "#0046d5"
38	31

+24

-0

macosx/Credits.html.in less more

	0	<!doctype htmL>
	1	<html>
	2	<head>
	3	</head>
	4	<body style="font-size:120%;font-family:Arial,sans-serif;">
	5	<p>
	6	Tcl and Tk are distributed under a modified BSD license:<br>
	7	<a href="https:www.tcl.tk/software/tcltk/license.html">
	8	https:www.tcl.tk/software/tcltk/license.html
	9	</a>
	10	</p>
	11	<ul style="list-style-type:none;">
	12	<li>© 1987-@TK_YEAR@ Tcl Core Team and Contributers.</li>
	13	<li>© 2011-@TK_YEAR@ Kevin Walzer/WordTech Communications LLC.</li>
	14	<li>© 2014-@TK_YEAR@ Marc Culler.</li>
	15	<li>© 2002-2012 Daniel A. Steffen.</li>
	16	<li>© 2001-2009 Apple Inc.</li>
	17	<li>© 2001-2002 Jim Ingham & Ian Reid.</li>
	18	<li>© 1998-2000 Jim Ingham & Ray Johnson.</li>
	19	<li>© 1998-2000 Scriptics Inc.</li>
	20	<li>© 1996-1997 Sun Microsystems Inc.</li>
	21	</ul>
	22	</body>
	23	</html>

+29

-8

macosx/GNUmakefile less more

24	24	EXTRA_MAKE_ARGS ?=
25	25
26	26	INSTALL_PATH ?= /Library/Frameworks
	27	TCL_INSTALL_PATH ?= ${INSTALL_PATH}/Tcl.framework
27	28	APPLICATION_INSTALL_PATH ?= /Applications/Utilities
28	29	PREFIX ?= /usr/local
29	30	BINDIR ?= ${PREFIX}/bin

41	42
42	43	# set to non-empty value to build TkX11 instead of TkAqua:
43	44	TK_X11 ?=
	45
	46	# Checks and overrides for subframework builds
	47	ifeq (${SUBFRAMEWORK}_${TK_X11},1_)
	48	ifeq (${DYLIB_INSTALL_DIR},)
	49	@echo "Cannot install subframework with empty DYLIB_INSTALL_DIR !" && false
	50	endif
	51	ifeq (${DESTDIR},)
	52	@echo "Cannot install subframework with empty DESTDIR !" && false
	53	endif
	54	override BUILD_DIR = ${DESTDIR}/build
	55	override INSTALL_PATH = /Frameworks
	56	endif
44	57
45	58	#-------------------------------------------------------------------------------------------------------
46	59	# meta targets

106	119	wish := wish
107	120	WISH = wish${VERSION}
108	121
109		BUILD_TARGET := all tktest
	122	BUILD_TARGET := binaries libraries tktest
110	123	INSTALL_TARGET := install
111	124
112	125	ifneq ($(wildcard $(subst ${space},\ ,${TCL_BUILD_DIR})/tclConfig.sh),)

114	127	TCL_FRAMEWORK_DIR := ${TCL_BUILD_DIR}/..
115	128	MAKE_VARS :=
116	129	else
117		TCL_DIR := ${TCL_FRAMEWORK_DIR}/Tcl.framework
	130	TCL_DIR := ${TCL_INSTALL_PATH}
118	131	TCL_EXE := ${TCLSH_DIR}/tclsh${TCL_VERSION}
119	132	MAKE_VARS := TCL_EXE
120	133	export DYLD_FRAMEWORK_PATH := ${TCL_FRAMEWORK_DIR}

209	222	ifeq (${EMBEDDED_BUILD}_${INSTALL_ROOT},1_)
210	223	@echo "Cannot install-embedded with empty INSTALL_ROOT !" && false
211	224	endif
	225	ifeq (${SUBFRAMEWORK}_${DYLIB_INSTALL_DIR},1_)
	226	@echo "Cannot install subframework with empty DYLIB_INSTALL_DIR !" && false
	227	endif
212	228	ifeq (${EMBEDDED_BUILD},1)
213	229	@rm -rf "${INSTALL_ROOT}/${LIBDIR}/Tk.framework"
	230	endif
	231	ifeq (${SUBFRAMEWORK},1)
	232	@rm -rf "${INSTALL_ROOT}/Frameworks/Tk.framework"
214	233	endif
215	234	${DO_MAKE}
216	235	ifeq (${EMBEDDED_BUILD}_${TK_X11},1_)

226	245	else
227	246	# install wish symbolic link
228	247	@ln -fs ${WISH} "${INSTALL_ROOT}${BINDIR}/${wish}"
229		endif
230		endif
	248	endif # embedded
	249	endif # install
231	250	ifeq (${BUILD_STYLE}_${EMBEDDED_BUILD},Development_)
232	251	# keep copy of debug library around, so that
233	252	# Deployment build can be installed on top

235	254	# the debug library
236	255	@cd "${INSTALL_ROOT}${LIBDIR}/${PRODUCT_NAME}.framework/Versions/${VERSION}" && \
237	256	ln -f "${PRODUCT_NAME}" "${PRODUCT_NAME}_debug"
238		endif
	257	endif # Development, not embedded
239	258	ifeq (${TK_X11},)
	259	ifeq (${SUBFRAMEWORK},)
240	260	ifeq (${EMBEDDED_BUILD},)
241	261	# install Wish.app link in APPLICATION_INSTALL_PATH and setup 'Wish Shell' compatibility links
242	262	@cd "${TOP_DIR}" && if [ -n "${APP_DIR}" ]; then mkdir -p "./${APP_DIR}" && rm -rf "./${APP_DIR}/Wish.app" && \

270	290	fix_install_name MacOS/Wish Tcl && fix_install_name MacOS/Wish Tk
271	291	ifeq (${INSTALL_BUILD},1)
272	292	@cd "${TOP_DIR}" && rm -rf "./${FMWK_DIR}"/T{cl,k}.framework && rmdir -p "./${FMWK_DIR}" 2>&- \|\| true
273		endif
274		endif
275		endif
	293	endif # install not subframework
	294	endif # embedded
	295	endif # not subframework
	296	endif # not X11
276	297
277	298	clean-${PROJECT}: %-${PROJECT}:
278	299	${DO_MAKE}

+46

-12

macosx/README less more

274	274	Tk now provides the following semantic colors as system colors:
275	275	systemTextColor, systemTextBackgroundColor, systemSelectedTextColor,
276	276	systemSelectedTextBackgroundColor, systemControlTextColor,
277		systemDisabledControlTextColor, systemLabelColor, and
278		systemControlAccentColor. All of these except the last two were
279		present in OSX 10.0 (and those two are simulated in systems where they
	277	systemDisabledControlTextColor, systemLabelColor, systemLinkColor, and
	278	systemControlAccentColor. All of these except the last three were
	279	present in OSX 10.0 (and those three are simulated in systems where they
280	280	do not exist). The change in 10.14 was that the RGB color value of
281	281	these colors became dynamic, meaning that the color value can change
282	282	when the application appearance changes. In particular, when a user

454	454	TCL_FRAMEWORK_DIR=$HOME/Library/Frameworks TCLSH_DIR=$HOME/usr/bin
455	455	The Makefile variables TCL_FRAMEWORK_DIR and TCLSH_DIR were added with Tk 8.4.3.
456	456
	457	- To build a Tcl.framework and Tk.framework for use as subframeworks in another
	458	framework, use the install-embedded target and set SUBFRAMEWORK=1. Set the
	459	DYLIB_INSTALL_DIR variable to the path which should be the install_name path of
	460	the shared library and set the DESTDIR variable to the pathname of a staging
	461	directory where the frameworks will be written. The Tcl framework must be
	462	built first.
	463	For example, running the commands:
	464	make -C ../tcl8.6/macosx install-embedded SUBFRAMEWORK=1 DESTDIR=/tmp/tcltk \
	465	DYLIB_INSTALL_DIR=/Library/Frameworks/Some.framework/Versions/X.Y/Frameworks/Tcl.framework
	466	make -C macosx install-embedded SUBFRAMEWORK=1 DESTDIR=/tmp/tcltk \
	467	DYLIB_INSTALL_DIR=/Library/Frameworks/Some.framework/Versions/X.Y/Frameworks/Tk.framework
	468	will produce a Tcl.framework and a Tk.framework usable as subframeworks of
	469	Some.framework. The frameworks will be found in /tmp/tcltk/Frameworks/
	470
457	471	5. Details regarding the macOS port of Tk.
458	472	-------------------------------------------
459	473

661	675	windows are redrawn within the DisplayText function by some
662	676	conditional code which is only used for macOS.
663	677
664		6.0 Virtual events on 10.14
665		~~~~~~~~~~~~~~~~~~~~~~~~~~~
666
667		10.14 supports system appearance changes, and has added a "Dark Mode"
668		that casts all window frames and menus as black. Tk 8.6.9 has added two
669		virtual events, <<LightAqua>> and <<DarkAqua>>, to allow you to update
670		your Tk app's appearance when the system appearance changes. Just bind
671		your appearance-updating code to these virtual events and you will see
672		it triggered when the system appearance toggles between dark and light.
	678	6.0 Virtual events on macOS 10.14 and later
	679	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
	680
	681	The 10.14 release added support for system appearance changes,
	682	including a "Dark Mode" that renders all window frames and menus in
	683	dark colors. Tk 8.6.11 provides three virtual events <<LightAqua>>,
	684	<<DarkAqua>> and <<AppearanceChanged>>, to allow you to update your Tk
	685	app's appearance when the system appearance changes. These events are
	686	generated in [NSView effectiveAppearanceChanged], which is called by
	687	the Apple window manager when the General Preferences is changed
	688	either by switching between Light Mode and Dark Mode or by changing
	689	the Accent Color or Highlight Color.
	690
	691	The <<AppearanceChanged>> virtual event has a data string which can be
	692	accessed with the %d substitution. The format of the data string is
	693	that it consists of 6 words:
	694	"Appearance XXXX Accent YYYY Highlight ZZZZ"
	695	For example, the following code will print the current appearance
	696	name, accent color and highlight color when the <<AppearanceChanged>>
	697	virtual event fires:
	698
	699	bind . <<AppearanceChanged>> {
	700	array set data [split %d]
	701	puts " Appearance: $data(Appearance)"
	702	puts " Accent: $data(Accent)"
	703	puts " Highlight: $data(Highlight)\n"
	704	}
	705
	706
673	707
674	708	7.0 Mac Services
675	709	~~~~~~~~~~~~~~~~~~~~~~~~~~~

+2

-2

macosx/Tk.xcode/project.pbxproj less more

1410	1410	F96D3E1F08F272A5004A47F5 /* CrtInterp.3 */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = CrtInterp.3; sourceTree = "<group>"; };
1411	1411	F96D3E2008F272A5004A47F5 /* CrtMathFnc.3 */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = CrtMathFnc.3; sourceTree = "<group>"; };
1412	1412	F96D3E2108F272A5004A47F5 /* CrtObjCmd.3 */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = CrtObjCmd.3; sourceTree = "<group>"; };
1413		F96D3E2208F272A5004A47F5 /* CrtSlave.3 */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = CrtSlave.3; sourceTree = "<group>"; };
	1413	F96D3E2208F272A5004A47F5 /* CrtAlias.3 */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = CrtAlias.3; sourceTree = "<group>"; };
1414	1414	F96D3E2308F272A5004A47F5 /* CrtTimerHdlr.3 */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = CrtTimerHdlr.3; sourceTree = "<group>"; };
1415	1415	F96D3E2408F272A5004A47F5 /* CrtTrace.3 */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = CrtTrace.3; sourceTree = "<group>"; };
1416	1416	F96D3E2508F272A5004A47F5 /* dde.n */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = dde.n; sourceTree = "<group>"; };

3077	3077	F96D3E1F08F272A5004A47F5 /* CrtInterp.3 */,
3078	3078	F96D3E2008F272A5004A47F5 /* CrtMathFnc.3 */,
3079	3079	F96D3E2108F272A5004A47F5 /* CrtObjCmd.3 */,
3080		F96D3E2208F272A5004A47F5 /* CrtSlave.3 */,
	3080	F96D3E2208F272A5004A47F5 /* CrtAlias.3 */,
3081	3081	F96D3E2308F272A5004A47F5 /* CrtTimerHdlr.3 */,
3082	3082	F96D3E2408F272A5004A47F5 /* CrtTrace.3 */,
3083	3083	F96D3E2508F272A5004A47F5 /* dde.n */,

+2

-2

macosx/Tk.xcodeproj/project.pbxproj less more

1410	1410	F96D3E1F08F272A5004A47F5 /* CrtInterp.3 */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = CrtInterp.3; sourceTree = "<group>"; };
1411	1411	F96D3E2008F272A5004A47F5 /* CrtMathFnc.3 */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = CrtMathFnc.3; sourceTree = "<group>"; };
1412	1412	F96D3E2108F272A5004A47F5 /* CrtObjCmd.3 */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = CrtObjCmd.3; sourceTree = "<group>"; };
1413		F96D3E2208F272A5004A47F5 /* CrtSlave.3 */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = CrtSlave.3; sourceTree = "<group>"; };
	1413	F96D3E2208F272A5004A47F5 /* CrtAlias.3 */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = CrtAlias.3; sourceTree = "<group>"; };
1414	1414	F96D3E2308F272A5004A47F5 /* CrtTimerHdlr.3 */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = CrtTimerHdlr.3; sourceTree = "<group>"; };
1415	1415	F96D3E2408F272A5004A47F5 /* CrtTrace.3 */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = CrtTrace.3; sourceTree = "<group>"; };
1416	1416	F96D3E2508F272A5004A47F5 /* dde.n */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = dde.n; sourceTree = "<group>"; };

3077	3077	F96D3E1F08F272A5004A47F5 /* CrtInterp.3 */,
3078	3078	F96D3E2008F272A5004A47F5 /* CrtMathFnc.3 */,
3079	3079	F96D3E2108F272A5004A47F5 /* CrtObjCmd.3 */,
3080		F96D3E2208F272A5004A47F5 /* CrtSlave.3 */,
	3080	F96D3E2208F272A5004A47F5 /* CrtAlias.3 */,
3081	3081	F96D3E2308F272A5004A47F5 /* CrtTimerHdlr.3 */,
3082	3082	F96D3E2408F272A5004A47F5 /* CrtTrace.3 */,
3083	3083	F96D3E2508F272A5004A47F5 /* dde.n */,

+28

-40

macosx/configure less more

2286	2286	TK_VERSION=8.6
2287	2287	TK_MAJOR_VERSION=8
2288	2288	TK_MINOR_VERSION=6
2289		TK_PATCH_LEVEL=".10"
	2289	TK_PATCH_LEVEL=".11"
2290	2290	VERSION=${TK_VERSION}
2291	2291	LOCALES="cs da de el en en_gb eo es fr hu it nl pl pt ru sv"
2292	2292

2430	2430	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: could not find ${TCL_BIN_DIR}/tclConfig.sh" >&5
2431	2431	$as_echo "could not find ${TCL_BIN_DIR}/tclConfig.sh" >&6; }
2432	2432	fi
2433
2434		# eval is required to do the TCL_DBGX substitution
2435		eval "TCL_LIB_FILE=\"${TCL_LIB_FILE}\""
2436		eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
2437	2433
2438	2434	# If the TCL_BIN_DIR is the build directory (not the install directory),
2439	2435	# then set the common variable name to the value of the build variables.

2467	2463	;;
2468	2464	esac
2469	2465	fi
2470
2471		# eval is required to do the TCL_DBGX substitution
2472		eval "TCL_LIB_FLAG=\"${TCL_LIB_FLAG}\""
2473		eval "TCL_LIB_SPEC=\"${TCL_LIB_SPEC}\""
2474		eval "TCL_STUB_LIB_FLAG=\"${TCL_STUB_LIB_FLAG}\""
2475		eval "TCL_STUB_LIB_SPEC=\"${TCL_STUB_LIB_SPEC}\""
2476	2466
2477	2467
2478	2468

4285	4275	tcl_ok=yes
4286	4276	fi
4287	4277
4288
4289		if test "${enable_shared+set}" = set; then
4290		enableval="$enable_shared"
4291		tcl_ok=$enableval
4292		else
4293		tcl_ok=yes
4294		fi
4295
4296	4278	if test "$tcl_ok" = "yes" ; then
4297	4279	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: shared" >&5
4298	4280	$as_echo "shared" >&6; }

4606	4588	if test "$GCC" = yes; then :
4607	4589
4608	4590	CFLAGS_OPTIMIZE=-O2
4609		CFLAGS_WARNING="-Wall"
	4591	CFLAGS_WARNING="-Wall -Wpointer-arith"
4610	4592
4611	4593	else
4612	4594

4874	4856	CC_SEARCH_FLAGS=""
4875	4857	LD_SEARCH_FLAGS=""
4876	4858	;;
4877		CYGWIN_\|MINGW32)
	4859	CYGWIN_\|MINGW32_\|MSYS_*)
4878	4860	SHLIB_CFLAGS=""
4879	4861	SHLIB_LD='${CC} -shared'
4880	4862	SHLIB_SUFFIX=".dll"

4885	4867	CC_SEARCH_FLAGS=""
4886	4868	LD_SEARCH_FLAGS=""
4887	4869	TCL_NEEDS_EXP_FILE=1
4888		TCL_EXPORT_FILE_SUFFIX='${VERSION}\$\{DBGX\}.dll.a'
	4870	TCL_EXPORT_FILE_SUFFIX='${VERSION}.dll.a'
4889	4871	SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,--out-implib,\$@.a"
4890	4872	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Cygwin version of gcc" >&5
4891	4873	$as_echo_n "checking for Cygwin version of gcc... " >&6; }

5091	5073	SHLIB_LD='${CC} -shared'
5092	5074	if test $doRpath = yes; then :
5093	5075
5094		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
	5076	CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
5095	5077	fi
5096	5078	LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
5097	5079	;;

5181	5163
5182	5164	if test $doRpath = yes; then :
5183	5165
5184		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
	5166	CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
5185	5167	LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
5186	5168	fi
5187	5169	;;

5199	5181
5200	5182	if test $doRpath = yes; then :
5201	5183
5202		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
	5184	CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
5203	5185	LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
5204	5186	fi
5205	5187	if test "$GCC" = yes; then :

5236	5218
5237	5219	if test $doRpath = yes; then :
5238	5220
5239		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
	5221	CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
5240	5222	LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
5241	5223	fi
5242	5224

5276	5258	LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
5277	5259	if test $doRpath = yes; then :
5278	5260
5279		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
	5261	CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
5280	5262	fi
5281	5263	LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
5282	5264	if test "`uname -m`" = "alpha"; then :

5343	5325	LD_FLAGS="-Wl,--export-dynamic"
5344	5326	if test $doRpath = yes; then :
5345	5327
5346		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
5347		LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
	5328	CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
	5329	LD_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
5348	5330	fi
5349	5331	;;
5350	5332	MP-RAS-02*)

5384	5366	DL_LIBS=""
5385	5367	if test $doRpath = yes; then :
5386	5368
5387		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
	5369	CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
5388	5370	fi
5389	5371	LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
5390	5372	SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'

5412	5394	LDFLAGS="$LDFLAGS -export-dynamic"
5413	5395	if test $doRpath = yes; then :
5414	5396
5415		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
	5397	CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
5416	5398	fi
5417	5399	LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
5418	5400	if test "${TCL_THREADS}" = "1"; then :

5432	5414	SHLIB_SUFFIX=".so"
5433	5415	DL_OBJS="tclLoadDl.o"
5434	5416	DL_LIBS=""
5435		LDFLAGS=""
5436	5417	if test $doRpath = yes; then :
5437	5418
5438		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
5439		LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
	5419	CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
	5420	LD_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
5440	5421	fi
5441	5422	if test "${TCL_THREADS}" = "1"; then :
5442	5423

5639	5620
5640	5621	$as_echo "#define MODULE_SCOPE __private_extern__" >>confdefs.h
5641	5622
	5623	tcl_cv_cc_visibility_hidden=yes
5642	5624
5643	5625	fi
5644	5626	CC_SEARCH_FLAGS=""

5829	5811	DL_LIBS=""
5830	5812	if test $doRpath = yes; then :
5831	5813
5832		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
	5814	CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
5833	5815	LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
5834	5816	fi
5835	5817	if test "$GCC" = yes; then :

6232	6214	case $system in
6233	6215	AIX-*) ;;
6234	6216	BSD/OS*) ;;
6235		CYGWIN_\|MINGW32_) ;;
	6217	CYGWIN_\|MINGW32_\|MSYS_*) ;;
6236	6218	IRIX*) ;;
6237	6219	NetBSD-\|DragonFly-\|FreeBSD-\|OpenBSD-) ;;
6238	6220	Darwin-*) ;;

6262	6244	if test "${SHARED_BUILD}" = 1 -a "${SHLIB_SUFFIX}" != ""; then :
6263	6245
6264	6246	LIB_SUFFIX=${SHARED_LIB_SUFFIX}
6265		MAKE_LIB='${SHLIB_LD} -o $@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
	6247	MAKE_LIB='${SHLIB_LD} -o $@ ${OBJS} ${LDFLAGS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
6266	6248	if test "${SHLIB_SUFFIX}" = ".dll"; then :
6267	6249
6268	6250	INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)";if test -f $(LIB_FILE).a; then $(INSTALL_DATA) $(LIB_FILE).a "$(LIB_INSTALL_DIR)"; fi;'

6403	6385	fi
6404	6386
6405	6387	# FIXME: Currently, LDFLAGS_DEFAULT is not used, it should work like CFLAGS_DEFAULT.
6406		DBGX=""
6407	6388	if test "$tcl_ok" = "no"; then
6408	6389	CFLAGS_DEFAULT='$(CFLAGS_OPTIMIZE)'
6409	6390	LDFLAGS_DEFAULT='$(LDFLAGS_OPTIMIZE)'

7383	7364	int
7384	7365	main ()
7385	7366	{
7386		struct passwd pwd; pwd.pw_gecos;
	7367	struct passwd pwd; (void)pwd.pw_gecos;
7387	7368	;
7388	7369	return 0;
7389	7370	}

8667	8648	echo "$LDFLAGS " \| grep -q -- '-prebind ' && TK_SHLIB_LD_EXTRAS="${TK_SHLIB_LD_EXTRAS}"' -seg1addr 0xb000000'
8668	8649	TK_SHLIB_LD_EXTRAS="${TK_SHLIB_LD_EXTRAS}"' -sectcreate __TEXT __info_plist Tk-Info.plist'
8669	8650	EXTRA_WISH_LIBS='-sectcreate __TEXT __info_plist Wish-Info.plist'
	8651	EXTRA_WISH_LIBS=${EXTRA_WISH_LIBS}' -sectcreate __TEXT __credits_html Credits.html'
	8652	if test "${SHARED_BUILD}" = "0"; then
	8653	EXTRA_WISH_LIBS=${EXTRA_WISH_LIBS}' -ObjC'
	8654	fi
8670	8655	EXTRA_APP_CC_SWITCHES="${EXTRA_APP_CC_SWITCHES}"' -mdynamic-no-pic'
8671		ac_config_files="$ac_config_files Tk-Info.plist:../macosx/Tk-Info.plist.in Wish-Info.plist:../macosx/Wish-Info.plist.in"
	8656	ac_config_files="$ac_config_files Tk-Info.plist:../macosx/Tk-Info.plist.in Wish-Info.plist:../macosx/Wish-Info.plist.in Credits.html:../macosx/Credits.html.in"
8672	8657
8673	8658	for l in ${LOCALES}; do CFBUNDLELOCALIZATIONS="${CFBUNDLELOCALIZATIONS}<string>$l</string>"; done
8674	8659	TK_YEAR="`date +%Y`"

8702	8687	EXTRA_INSTALL="install-private-headers html-tk"
8703	8688	EXTRA_BUILD_HTML='@ln -fs contents.htm "$(HTML_INSTALL_DIR)"/TkTOC.html'
8704	8689	EXTRA_INSTALL_BINARIES='@echo "Installing Info.plist to $(LIB_INSTALL_DIR)/Resources/" && $(INSTALL_DATA_DIR) "$(LIB_INSTALL_DIR)/Resources" && $(INSTALL_DATA) Tk-Info.plist "$(LIB_INSTALL_DIR)/Resources/Info.plist"'
	8690	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing Credits.html to $(LIB_INSTALL_DIR)/Resources/" && $(INSTALL_DATA_DIR) "$(LIB_INSTALL_DIR)/Resources" && $(INSTALL_DATA) Credits.html "$(LIB_INSTALL_DIR)/Resources"'
8705	8691	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing license.terms to $(LIB_INSTALL_DIR)/Resources/" && $(INSTALL_DATA) "$(TOP_DIR)/license.terms" "$(LIB_INSTALL_DIR)/Resources"'
8706	8692	if test $tk_aqua = yes; then
8707	8693	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing Images to $(LIB_INSTALL_DIR)/Resources/" && $(INSTALL_DATA_DIR) "$(LIB_INSTALL_DIR)/Resources" && for i in Tk.tiff Tk.icns; do $(INSTALL_DATA) "$(MAC_OSX_DIR)/$$i" "$(LIB_INSTALL_DIR)/Resources"; done'

8711	8697	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing Wish.icns to $(BIN_INSTALL_DIR)/../Resources" && $(INSTALL_DATA_DIR) "$(BIN_INSTALL_DIR)/../Resources"'
8712	8698	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && $(INSTALL_DATA) "$(MAC_OSX_DIR)/Tk.icns" "$(BIN_INSTALL_DIR)/../Resources/Wish.icns"'
8713	8699	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing Wish.sdef to $(BIN_INSTALL_DIR)/../Resources" && $(INSTALL_DATA) "$(MAC_OSX_DIR)/Wish.sdef" "$(BIN_INSTALL_DIR)/../Resources"'
	8700	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing Credits.html to $(BIN_INSTALL_DIR)/../Resources" && $(INSTALL_DATA) Credits.html "$(BIN_INSTALL_DIR)/../Resources"'
8714	8701	fi
8715	8702	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Finalizing Tk.framework" && rm -f "$(LIB_INSTALL_DIR)/../Current" && ln -s "$(VERSION)" "$(LIB_INSTALL_DIR)/../Current" && for f in "$(LIB_FILE)" tkConfig.sh Resources Headers PrivateHeaders; do rm -f "$(LIB_INSTALL_DIR)/../../$$f" && ln -s "Versions/Current/$$f" "$(LIB_INSTALL_DIR)/../.."; done && f="$(STUB_LIB_FILE)" && rm -f "$(LIB_INSTALL_DIR)/../../$$f" && ln -s "Versions/$(VERSION)/$$f" "$(LIB_INSTALL_DIR)/../.."'
8716	8703	# Don't use AC_DEFINE for the following as the framework version define

9524	9511	"tkConfig.h") CONFIG_HEADERS="$CONFIG_HEADERS tkConfig.h:../unix/tkConfig.h.in" ;;
9525	9512	"Tk-Info.plist") CONFIG_FILES="$CONFIG_FILES Tk-Info.plist:../macosx/Tk-Info.plist.in" ;;
9526	9513	"Wish-Info.plist") CONFIG_FILES="$CONFIG_FILES Wish-Info.plist:../macosx/Wish-Info.plist.in" ;;
	9514	"Credits.html") CONFIG_FILES="$CONFIG_FILES Credits.html:../macosx/Credits.html.in" ;;
9527	9515	"Tk.framework") CONFIG_COMMANDS="$CONFIG_COMMANDS Tk.framework" ;;
9528	9516	"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile:../unix/Makefile.in" ;;
9529	9517	"tkConfig.sh") CONFIG_FILES="$CONFIG_FILES tkConfig.sh:../unix/tkConfig.sh.in" ;;

+1

-1

macosx/tkMacOSX.h less more

25	25	typedef int (Tk_MacOSXEmbedRegisterWinProc) (long winID, Tk_Window window);
26	26	typedef void* (Tk_MacOSXEmbedGetGrafPortProc) (Tk_Window window);
27	27	typedef int (Tk_MacOSXEmbedMakeContainerExistProc) (Tk_Window window);
28		typedef void (Tk_MacOSXEmbedGetClipProc) (Tk_Window window, TkRegion rgn);
	28	typedef void (Tk_MacOSXEmbedGetClipProc) (Tk_Window window, void *rgn);
29	29	typedef void (Tk_MacOSXEmbedGetOffsetInParentProc) (Tk_Window window, void *ulCorner);
30	30
31	31	#include "tkPlatDecls.h"

+8

-11

macosx/tkMacOSXBitmap.c less more

43	43	{"stop", kAlertStopIcon},
44	44	{"note", kAlertNoteIcon},
45	45	{"caution", kAlertCautionIcon},
46		{NULL}
	46	{NULL, 0}
47	47	};
48	48
49	49	#define builtInIconSize 32

99	99	name = Tk_GetUid(builtInPtr->name);
100	100	predefHashPtr = Tcl_CreateHashEntry(tablePtr, name, &isNew);
101	101	if (isNew) {
102		TkPredefBitmap *predefPtr = ckalloc(sizeof(TkPredefBitmap));
	102	TkPredefBitmap predefPtr = (TkPredefBitmap )ckalloc(sizeof(TkPredefBitmap));
103	103
104	104	predefPtr->source = UINT2PTR(builtInPtr->iconType);
105	105	predefPtr->width = builtInIconSize;

135	135	Pixmap pixmap;
136	136
137	137	pixmap = Tk_GetPixmap(display, None, size.width, size.height, 0);
138		if (TkMacOSXSetupDrawingContext(pixmap, NULL, 1, &dc)) {
	138	if (TkMacOSXSetupDrawingContext(pixmap, NULL, &dc)) {
139	139	if (dc.context) {
140	140	CGAffineTransform t = { .a = 1, .b = 0, .c = 0, .d = -1,
141	141	.tx = 0, .ty = size.height};
142	142	CGContextConcatCTM(dc.context, t);
143	143	[NSGraphicsContext saveGraphicsState];
144		[NSGraphicsContext setCurrentContext:[NSGraphicsContext
145		graphicsContextWithGraphicsPort:dc.context
146		flipped:NO]];
	144	[NSGraphicsContext setCurrentContext:GET_NSCONTEXT(dc.context, NO)];
147	145	[image drawAtPoint:NSZeroPoint fromRect:NSZeroRect
148	146	operation:NSCompositeCopy fraction:1.0];
149	147	[NSGraphicsContext restoreGraphicsState];

179	177	NSImage *iconImage = [[NSWorkspace sharedWorkspace]
180	178	iconForFileType: iconUTI];
181	179	CGSize size = CGSizeMake(builtInIconSize, builtInIconSize);
182		Pixmap pixmap = PixmapFromImage(display, iconImage, NSSizeToCGSize(size));
	180	Pixmap pixmap = PixmapFromImage(display, iconImage, size);
183	181	return pixmap;
184	182	}
185	183

316	314	OSType iconType;
317	315	if (OSTypeFromString(name, &iconType) == TCL_OK) {
318	316	NSString *iconUTI = OSTYPE_TO_UTI(iconType);
319		printf("Found image for UTI %s\n", iconUTI.UTF8String);
320	317	NSImage *iconImage = [[NSWorkspace sharedWorkspace]
321	318	iconForFileType: iconUTI];
322	319	pixmap = PixmapFromImage(display, iconImage, NSSizeToCGSize(size));

343	340
344	341	int
345	342	TkMacOSXIconBitmapObjCmd(
346		ClientData clientData, /* Unused. */
	343	TCL_UNUSED(void *),
347	344	Tcl_Interp interp, / Current interpreter. */
348	345	int objc, /* Number of arguments. */
349	346	Tcl_Obj const objv[]) / Argument objects. */

398	395	}
399	396	}
400	397	#endif
401		ib.value = ckalloc(len + 1);
	398	ib.value = (char *)ckalloc(len + 1);
402	399	strcpy(ib.value, value);
403	400	if (!iconBitmapTable.buckets) {
404	401	Tcl_InitHashTable(&iconBitmapTable, TCL_STRING_KEYS);

408	405	iconBitmap = Tcl_GetHashValue(hPtr);
409	406	ckfree(iconBitmap->value);
410	407	} else {
411		iconBitmap = ckalloc(sizeof(IconBitmap));
	408	iconBitmap = (IconBitmap *)ckalloc(sizeof(IconBitmap));
412	409	Tcl_SetHashValue(hPtr, iconBitmap);
413	410	}
414	411	*iconBitmap = ib;

+66

-59

macosx/tkMacOSXButton.c less more

94	94	const Tk_ClassProcs tkpButtonProcs = {
95	95	sizeof(Tk_ClassProcs), /* size */
96	96	TkButtonWorldChanged, /* worldChangedProc */
	97	NULL,
	98	NULL
97	99	};
98	100
99	101	static int bCount;

142	144	TkpCreateButton(
143	145	Tk_Window tkwin)
144	146	{
145		MacButton *macButtonPtr = ckalloc(sizeof(MacButton));
	147	MacButton macButtonPtr = (MacButton )ckalloc(sizeof(MacButton));
146	148
147	149	Tk_CreateEventHandler(tkwin, ActivateMask,
148	150	ButtonEventProc, macButtonPtr);

185	187	DrawParams* dpPtr = &macButtonPtr->drawParams;
186	188	int needhighlight = 0;
187	189
188		if (butPtr->flags & BUTTON_DELETED) {
189		return;
190		}
191	190	butPtr->flags &= ~REDRAW_PENDING;
192	191	if ((butPtr->tkwin == NULL) \|\| !Tk_IsMapped(tkwin)) {
193	192	return;
194	193	}
195	194	pixmap = (Pixmap) Tk_WindowId(tkwin);
196
197		/*
198		* Set up clipping region. Make sure the we are using the port
199		* for this button, or we will set the wrong window's clip.
200		*/
201
202		TkMacOSXSetUpClippingRgn(Tk_WindowId(tkwin));
203	195
204	196	if (TkMacOSXComputeButtonDrawParams(butPtr, dpPtr)) {
205	197	macButtonPtr->useTkText = 0;

331	323	haveText = 1;
332	324	}
333	325
334		if (haveImage && haveText) { /* Image and Text */
335		switch ((enum compound) butPtr->compound) {
336		case COMPOUND_TOP:
337		case COMPOUND_BOTTOM:
338		/*
339		* Image is above or below text.
340		*/
341
342		height += txtHeight + butPtr->padY;
343		width = (width > txtWidth ? width : txtWidth);
344		break;
345		case COMPOUND_LEFT:
346		case COMPOUND_RIGHT:
347		/*
348		* Image is left or right of text.
349		*/
350
351		width += txtWidth + 2*butPtr->padX;
352		height = (height > txtHeight ? height : txtHeight);
353		break;
354		case COMPOUND_CENTER:
355		/*
356		* Image and text are superimposed.
357		*/
358
359		width = (width > txtWidth ? width : txtWidth);
360		height = (height > txtHeight ? height : txtHeight);
361		break;
362		default:
363		break;
364		}
365		width += butPtr->indicatorSpace;
366		} else if (haveImage) { /* Image only */
	326	if (haveImage) {
	327	if (haveText) { /* Image and Text */
	328	switch ((enum compound) butPtr->compound) {
	329	case COMPOUND_TOP:
	330	case COMPOUND_BOTTOM:
	331	/*
	332	* Image is above or below text.
	333	*/
	334
	335	height += txtHeight + butPtr->padY;
	336	width = (width > txtWidth ? width : txtWidth);
	337	break;
	338	case COMPOUND_LEFT:
	339	case COMPOUND_RIGHT:
	340	/*
	341	* Image is left or right of text.
	342	*/
	343
	344	width += txtWidth + 2*butPtr->padX;
	345	height = (height > txtHeight ? height : txtHeight);
	346	break;
	347	case COMPOUND_CENTER:
	348	/*
	349	* Image and text are superimposed.
	350	*/
	351
	352	width = (width > txtWidth ? width : txtWidth);
	353	height = (height > txtHeight ? height : txtHeight);
	354	break;
	355	default:
	356	break;
	357	}
	358	}
	359	/* Image with or without text */
367	360	width = butPtr->width > 0 ? butPtr->width : width + butPtr->indicatorSpace;
368	361	height = butPtr->height > 0 ? butPtr->height : height;
369	362	if (butPtr->type == TYPE_BUTTON) {

398	391
399	392	width += butPtr->inset*2;
400	393	height += butPtr->inset*2;
401		if ([NSApp macMinorVersion] == 6) {
	394	if ([NSApp macOSVersion] == 100600) {
402	395	width += 12;
403	396	}
404	397	if (mbPtr->btnkind == kThemePushButton) {

464	457
465	458	pixmap = (Pixmap) Tk_WindowId(tkwin);
466	459
467		if (butPtr->image != None) {
	460	if (butPtr->image != NULL) {
468	461	Tk_SizeOfImage(butPtr->image, &width, &height);
469	462	haveImage = 1;
470	463	} else if (butPtr->bitmap != None) {

480	473	}
481	474
482	475	haveText = (butPtr->textWidth != 0 && butPtr->textHeight != 0);
483		if (haveImage && haveText) { /* Image and Text */
	476	if (butPtr->compound != COMPOUND_NONE && haveImage && haveText) { /* Image and Text */
484	477	int x, y;
485	478
486	479	switch ((enum compound) butPtr->compound) {

725	718	static void
726	719	TkMacOSXDrawButton(
727	720	MacButton mbPtr, / Mac button. */
728		GC gc, /* The GC we are drawing into - needed for
	721	TCL_UNUSED(GC), /* The GC we are drawing into - needed for
729	722	* the bevel button */
730	723	Pixmap pixmap) /* The pixmap we are drawing into - needed
731	724	* for the bevel button */

750	743
751	744	ButtonBackgroundDrawCB(&cntrRect, mbPtr, 32, true);
752	745
753		if (!TkMacOSXSetupDrawingContext(pixmap, dpPtr->gc, 1, &dc)) {
	746	if (!TkMacOSXSetupDrawingContext(pixmap, dpPtr->gc, &dc)) {
754	747	return;
755	748	}
756	749

783	776	ButtonContentDrawCB(&contHIRec, mbPtr->btnkind, &mbPtr->drawinfo,
784	777	(MacButton *) mbPtr, 32, true);
785	778	} else {
786		if (!TkMacOSXSetupDrawingContext(pixmap, dpPtr->gc, 1, &dc)) {
	779	if (!TkMacOSXSetupDrawingContext(pixmap, dpPtr->gc, &dc)) {
787	780	return;
788	781	}
789	782

811	804
812	805	static void
813	806	ButtonBackgroundDrawCB(
814		const HIRect *btnbounds,
	807	TCL_UNUSED(const HIRect *),
815	808	MacButton *ptr,
816		SInt16 depth,
817		Boolean isColorDev)
	809	TCL_UNUSED(SInt16),
	810	TCL_UNUSED(Boolean))
818	811	{
819	812	MacButton mbPtr = (MacButton ) ptr;
820	813	TkButton butPtr = (TkButton ) mbPtr;

863	856	*/
864	857	static void
865	858	ButtonContentDrawCB (
866		const HIRect * btnbounds,
867		ThemeButtonKind kind,
868		const HIThemeButtonDrawInfo *drawinfo,
	859	TCL_UNUSED(const HIRect *),
	860	TCL_UNUSED(ThemeButtonKind),
	861	TCL_UNUSED(const HIThemeButtonDrawInfo *),
869	862	MacButton *ptr,
870		SInt16 depth,
871		Boolean isColorDev)
	863	TCL_UNUSED(SInt16),
	864	TCL_UNUSED(Boolean))
872	865	{
873	866	TkButton butPtr = (TkButton ) ptr;
874	867	Tk_Window tkwin = butPtr->tkwin;

1046	1039	if (drawinfo->state != kThemeStatePressed) {
1047	1040	drawinfo->adornment \|= kThemeAdornmentDefault;
1048	1041	}
1049		if (!mbPtr->defaultPulseHandler) {
	1042
	1043	/*
	1044	* Older macOS systems (10.9 and earlier) use an animation to
	1045	* indicate the active button. This is simulated by redrawing
	1046	* the button periodically.
	1047	*/
	1048
	1049	if (!mbPtr->defaultPulseHandler && ([NSApp macOSVersion] <= 100900)) {
1050	1050	mbPtr->defaultPulseHandler = Tcl_CreateTimerHandler(
1051	1051	PULSE_TIMER_MSECS, PulseDefaultButtonProc, butPtr);
1052	1052	}

1176	1176	MacButton *mbPtr = clientData;
1177	1177
1178	1178	TkpDisplayButton(clientData);
	1179	/*
	1180	* Fix 40ada90762: any idle calls to TkpDisplayButton need to be canceled
	1181	* in case the button is destroyed and has its data freed before the idle
	1182	* event is handled (DestroyButton only cancels calls when REDRAW_PENDING
	1183	* is set, which is not the case after calling TkpDisplayButton directly).
	1184	*/
	1185	Tcl_CancelIdleCall(TkpDisplayButton, clientData);
1179	1186	mbPtr->defaultPulseHandler = Tcl_CreateTimerHandler(
1180	1187	PULSE_TIMER_MSECS, PulseDefaultButtonProc, clientData);
1181	1188	}

+17

-22

macosx/tkMacOSXClipboard.c less more

34	34	targetPtr->type == dispPtr->utf8Atom) {
35	35	for (TkClipboardBuffer *cbPtr = targetPtr->firstBufferPtr;
36	36	cbPtr; cbPtr = cbPtr->nextPtr) {
37		NSString *s = TclUniToNSString(cbPtr->buffer, cbPtr->length);
	37	NSString *s = [[TKNSString alloc]
	38	initWithTclUtfBytes:cbPtr->buffer
	39	length:cbPtr->length];
38	40	[string appendString:s];
39	41	[s release];
40	42	}

134	136	string = [pb stringForType:type];
135	137	}
136	138	if (string) {
137
138		/*
139		* Encode the string using the encoding which is used in Tcl
140		* when TCL_UTF_MAX = 3. This replaces each UTF-16 surrogate with
141		* a 3-byte sequence generated using the UTF-8 algorithm. (Even
142		* though UTF-8 does not allow encoding surrogates, the algorithm
143		* does produce a 3-byte sequence.)
144		*/
145
146		char *bytes = NSStringToTclUni(string, NULL);
147		result = proc(clientData, interp, bytes);
148		if (bytes) {
149		ckfree(bytes);
	139	if (target == dispPtr->utf8Atom) {
	140	result = proc(clientData, interp, string.UTF8String);
	141	} else if (target == XA_STRING) {
	142	const char *latin1 = [string
	143	cStringUsingEncoding:NSISOLatin1StringEncoding];
	144	result = proc(clientData, interp, latin1);
150	145	}
151	146	}
152	147	} else {
153	148	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
154		"%s selection doesn't exist or form \"%s\" not defined",
155		Tk_GetAtomName(tkwin, selection),
156		Tk_GetAtomName(tkwin, target)));
	149	"%s selection doesn't exist or form \"%s\" not defined",
	150	Tk_GetAtomName(tkwin, selection),
	151	Tk_GetAtomName(tkwin, target)));
157	152	Tcl_SetErrorCode(interp, "TK", "SELECTION", "EXISTS", NULL);
158	153	}
159	154	return result;

181	176	Display display, / X Display. */
182	177	Atom selection, /* What selection to own. */
183	178	Window owner, /* Window to be the owner. */
184		Time time) /* The current time? */
	179	TCL_UNUSED(Time)) /* The current time? */
185	180	{
186	181	TkDisplay *dispPtr = TkGetDisplayList();
187	182

241	236
242	237	void
243	238	TkSelUpdateClipboard(
244		TkWindow winPtr, / Window associated with clipboard. */
245		TkClipboardTarget *targetPtr)
	239	TCL_UNUSED(TkWindow ), / Window associated with clipboard. */
	240	TCL_UNUSED(TkClipboardTarget *))
246	241	/* Info about the content. */
247	242	{
248	243	NSPasteboard *pb = [NSPasteboard generalPasteboard];

270	265	void
271	266	TkSelEventProc(
272	267	Tk_Window tkwin, /* Window for which event was targeted. */
273		register XEvent eventPtr) / X event: either SelectionClear,
	268	XEvent eventPtr) / X event: either SelectionClear,
274	269	* SelectionRequest, or SelectionNotify. */
275	270	{
276	271	if (eventPtr->type == SelectionClear) {

298	293
299	294	void
300	295	TkSelPropProc(
301		register XEvent eventPtr) / X PropertyChange event. */
	296	TCL_UNUSED(XEvent )) / X PropertyChange event. */
302	297	{
303	298	}
304	299

+502

-606

macosx/tkMacOSXColor.c less more

0	0	/*
1		* tkMacOSXColor.c --
	1	* TkMacOSXColor.c --
2	2	*
3	3	* This file maintains a database of color values for the Tk
4	4	* toolkit, in order to avoid round-trips to the server to

8	8	* Copyright (c) 1994-1996 Sun Microsystems, Inc.
9	9	* Copyright 2001-2009, Apple Inc.
10	10	* Copyright (c) 2006-2009 Daniel A. Steffen <das@users.sourceforge.net>
	11	* Copyright (c) 2020 Marc Culler
11	12	*
12	13	* See the file "license.terms" for information on usage and redistribution
13	14	* of this file, and for a DISCLAIMER OF ALL WARRANTIES.

15	16
16	17	#include "tkMacOSXPrivate.h"
17	18	#include "tkColor.h"
18
19		/*
20		* The colorType specifies how the color value should be interpreted. For the
21		* unique rgbColor entry, the RGB values are generated from the pixel value of
22		* an XColor. The ttkBackground and semantic types are dynamic, meaning
23		* that they change when dark mode is enabled on OSX 10.13 and later.
24		*/
25
26		enum colorType {
27		clearColor, /* There should be only one of these. */
28		rgbColor, /* There should be only one of these. */
29		appearance, /* There should be only one of these. */
30		HIBrush, /* The value is a HITheme brush color table index. */
31		HIText, /* The value is a HITheme text color table index. */
32		HIBackground, /* The value is a HITheme background color table index. */
33		ttkBackground, /* The value can be used as a parameter.*/
34		semantic, /* The value can be used as a parameter.*/
35		};
36
37		/*
38
39		*/
40
41		struct SystemColorMapEntry {
42		const char *name;
43		enum colorType type;
44		long value;
45		}; /* unsigned char pixelCode; */
46
47		/*
48		* Array of system color definitions: the array index is required to equal the
49		* color's (pixelCode - MIN_PIXELCODE), i.e. the array order needs to be kept
50		* in sync with the public pixel code values in tkMacOSXPort.h !
51		*/
52
53		#define MIN_PIXELCODE 30
54		static const struct SystemColorMapEntry systemColorMap[] = {
55		{ "Transparent", clearColor, 0 }, /* 30: TRANSPARENT_PIXEL */
56		{ "Highlight", HIBrush, kThemeBrushPrimaryHighlightColor }, /* 31 */
57		{ "HighlightSecondary", HIBrush, kThemeBrushSecondaryHighlightColor }, /* 32 */
58		{ "HighlightText", HIBrush, kThemeBrushBlack }, /* 33 */
59		{ "HighlightAlternate", HIBrush, kThemeBrushAlternatePrimaryHighlightColor }, /* 34 */
60		{ "ButtonText", HIText, kThemeTextColorPushButtonActive }, /* 35 */
61		{ "PrimaryHighlightColor", HIBrush, kThemeBrushPrimaryHighlightColor }, /* 36 */
62		{ "ButtonFace", HIBrush, kThemeBrushButtonFaceActive }, /* 37 */
63		{ "SecondaryHighlightColor", HIBrush, kThemeBrushSecondaryHighlightColor }, /* 38 */
64		{ "ButtonFrame", HIBrush, kThemeBrushButtonFrameActive }, /* 39 */
65		{ "AlternatePrimaryHighlightColor", HIBrush, kThemeBrushAlternatePrimaryHighlightColor }, /* 40 */
66		{ "WindowBody", HIBrush, kThemeBrushDocumentWindowBackground }, /* 41 */
67		{ "SheetBackground", HIBrush, kThemeBrushSheetBackground }, /* 42 */
68		{ "MenuActive", HIBrush, kThemeBrushMenuBackgroundSelected }, /* 43 */
69		{ "Black", HIBrush, kThemeBrushBlack }, /* 44 */
70		{ "MenuActiveText", HIText, kThemeTextColorMenuItemSelected }, /* 45 */
71		{ "White", HIBrush, kThemeBrushWhite }, /* 46 */
72		{ "Menu", HIBrush, kThemeBrushMenuBackground }, /* 47 */
73		{ "DialogBackgroundActive", HIBrush, kThemeBrushDialogBackgroundActive }, /* 48 */
74		{ "MenuDisabled", HIText, kThemeTextColorMenuItemDisabled }, /* 49 */
75		{ "DialogBackgroundInactive", HIBrush, kThemeBrushDialogBackgroundInactive }, /* 50 */
76		{ "MenuText", HIText, kThemeTextColorMenuItemActive }, /* 51 */
77		{ "AppearanceColor", appearance, 0 }, /* 52: APPEARANCE_PIXEL */
78		{ "AlertBackgroundActive", HIBrush, kThemeBrushAlertBackgroundActive }, /* 53 */
79		{ "AlertBackgroundInactive", HIBrush, kThemeBrushAlertBackgroundInactive }, /* 54 */
80		{ "ModelessDialogBackgroundActive", HIBrush, kThemeBrushModelessDialogBackgroundActive }, /* 55 */
81		{ "ModelessDialogBackgroundInactive", HIBrush, kThemeBrushModelessDialogBackgroundInactive }, /* 56 */
82		{ "UtilityWindowBackgroundActive", HIBrush, kThemeBrushUtilityWindowBackgroundActive }, /* 57 */
83		{ "UtilityWindowBackgroundInactive", HIBrush, kThemeBrushUtilityWindowBackgroundInactive }, /* 58 */
84		{ "ListViewSortColumnBackground", HIBrush, kThemeBrushListViewSortColumnBackground }, /* 59 */
85		{ "ListViewBackground", HIBrush, kThemeBrushListViewBackground }, /* 60 */
86		{ "IconLabelBackground", HIBrush, kThemeBrushIconLabelBackground }, /* 61 */
87		{ "ListViewSeparator", HIBrush, kThemeBrushListViewSeparator }, /* 62 */
88		{ "ChasingArrows", HIBrush, kThemeBrushChasingArrows }, /* 63 */
89		{ "DragHilite", HIBrush, kThemeBrushDragHilite }, /* 64 */
90		{ "DocumentWindowBackground", HIBrush, kThemeBrushDocumentWindowBackground }, /* 65 */
91		{ "FinderWindowBackground", HIBrush, kThemeBrushFinderWindowBackground }, /* 66 */
92		{ "ScrollBarDelimiterActive", HIBrush, kThemeBrushScrollBarDelimiterActive }, /* 67 */
93		{ "ScrollBarDelimiterInactive", HIBrush, kThemeBrushScrollBarDelimiterInactive }, /* 68 */
94		{ "FocusHighlight", HIBrush, kThemeBrushFocusHighlight }, /* 69 */
95		{ "PopupArrowActive", HIBrush, kThemeBrushPopupArrowActive }, /* 70 */
96		{ "PopupArrowPressed", HIBrush, kThemeBrushPopupArrowPressed }, /* 71 */
97		{ "PopupArrowInactive", HIBrush, kThemeBrushPopupArrowInactive }, /* 72 */
98		{ "AppleGuideCoachmark", HIBrush, kThemeBrushAppleGuideCoachmark }, /* 73 */
99		{ "IconLabelBackgroundSelected", HIBrush, kThemeBrushIconLabelBackgroundSelected }, /* 74 */
100		{ "StaticAreaFill", HIBrush, kThemeBrushStaticAreaFill }, /* 75 */
101		{ "ActiveAreaFill", HIBrush, kThemeBrushActiveAreaFill }, /* 76 */
102		{ "ButtonFrameActive", HIBrush, kThemeBrushButtonFrameActive }, /* 77 */
103		{ "ButtonFrameInactive", HIBrush, kThemeBrushButtonFrameInactive }, /* 78 */
104		{ "ButtonFaceActive", HIBrush, kThemeBrushButtonFaceActive }, /* 79 */
105		{ "ButtonFaceInactive", HIBrush, kThemeBrushButtonFaceInactive }, /* 80 */
106		{ "ButtonFacePressed", HIBrush, kThemeBrushButtonFacePressed }, /* 81 */
107		{ "ButtonActiveDarkShadow", HIBrush, kThemeBrushButtonActiveDarkShadow }, /* 82 */
108		{ "ButtonActiveDarkHighlight", HIBrush, kThemeBrushButtonActiveDarkHighlight }, /* 83 */
109		{ "ButtonActiveLightShadow", HIBrush, kThemeBrushButtonActiveLightShadow }, /* 84 */
110		{ "ButtonActiveLightHighlight", HIBrush, kThemeBrushButtonActiveLightHighlight }, /* 85 */
111		{ "ButtonInactiveDarkShadow", HIBrush, kThemeBrushButtonInactiveDarkShadow }, /* 86 */
112		{ "ButtonInactiveDarkHighlight", HIBrush, kThemeBrushButtonInactiveDarkHighlight }, /* 87 */
113		{ "ButtonInactiveLightShadow", HIBrush, kThemeBrushButtonInactiveLightShadow }, /* 88 */
114		{ "ButtonInactiveLightHighlight", HIBrush, kThemeBrushButtonInactiveLightHighlight }, /* 89 */
115		{ "ButtonPressedDarkShadow", HIBrush, kThemeBrushButtonPressedDarkShadow }, /* 90 */
116		{ "ButtonPressedDarkHighlight", HIBrush, kThemeBrushButtonPressedDarkHighlight }, /* 91 */
117		{ "ButtonPressedLightShadow", HIBrush, kThemeBrushButtonPressedLightShadow }, /* 92 */
118		{ "ButtonPressedLightHighlight", HIBrush, kThemeBrushButtonPressedLightHighlight }, /* 93 */
119		{ "BevelActiveLight", HIBrush, kThemeBrushBevelActiveLight }, /* 94 */
120		{ "BevelActiveDark", HIBrush, kThemeBrushBevelActiveDark }, /* 95 */
121		{ "BevelInactiveLight", HIBrush, kThemeBrushBevelInactiveLight }, /* 96 */
122		{ "BevelInactiveDark", HIBrush, kThemeBrushBevelInactiveDark }, /* 97 */
123		{ "NotificationWindowBackground", HIBrush, kThemeBrushNotificationWindowBackground }, /* 98 */
124		{ "MovableModalBackground", HIBrush, kThemeBrushMovableModalBackground }, /* 99 */
125		{ "SheetBackgroundOpaque", HIBrush, kThemeBrushSheetBackgroundOpaque }, /* 100 */
126		{ "DrawerBackground", HIBrush, kThemeBrushDrawerBackground }, /* 101 */
127		{ "ToolbarBackground", HIBrush, kThemeBrushToolbarBackground }, /* 102 */
128		{ "SheetBackgroundTransparent", HIBrush, kThemeBrushSheetBackgroundTransparent }, /* 103 */
129		{ "MenuBackground", HIBrush, kThemeBrushMenuBackground }, /* 104 */
130		{ "Pixel", rgbColor, 0 }, /* 105: PIXEL_MAGIC */
131		{ "MenuBackgroundSelected", HIBrush, kThemeBrushMenuBackgroundSelected }, /* 106 */
132		{ "ListViewOddRowBackground", HIBrush, kThemeBrushListViewOddRowBackground }, /* 107 */
133		{ "ListViewEvenRowBackground", HIBrush, kThemeBrushListViewEvenRowBackground }, /* 108 */
134		{ "ListViewColumnDivider", HIBrush, kThemeBrushListViewColumnDivider }, /* 109 */
135		{ "BlackText", HIText, kThemeTextColorBlack }, /* 110 */
136		{ "DialogActiveText", HIText, kThemeTextColorDialogActive }, /* 111 */
137		{ "DialogInactiveText", HIText, kThemeTextColorDialogInactive }, /* 112 */
138		{ "AlertActiveText", HIText, kThemeTextColorAlertActive }, /* 113 */
139		{ "AlertInactiveText", HIText, kThemeTextColorAlertInactive }, /* 114 */
140		{ "ModelessDialogActiveText", HIText, kThemeTextColorModelessDialogActive }, /* 115 */
141		{ "ModelessDialogInactiveText", HIText, kThemeTextColorModelessDialogInactive }, /* 116 */
142		{ "WindowHeaderActiveText", HIText, kThemeTextColorWindowHeaderActive }, /* 117 */
143		{ "WindowHeaderInactiveText", HIText, kThemeTextColorWindowHeaderInactive }, /* 118 */
144		{ "PlacardActiveText", HIText, kThemeTextColorPlacardActive }, /* 119 */
145		{ "PlacardInactiveText", HIText, kThemeTextColorPlacardInactive }, /* 120 */
146		{ "PlacardPressedText", HIText, kThemeTextColorPlacardPressed }, /* 121 */
147		{ "PushButtonActiveText", HIText, kThemeTextColorPushButtonActive }, /* 122 */
148		{ "PushButtonInactiveText", HIText, kThemeTextColorPushButtonInactive }, /* 123 */
149		{ "PushButtonPressedText", HIText, kThemeTextColorPushButtonPressed }, /* 124 */
150		{ "BevelButtonActiveText", HIText, kThemeTextColorBevelButtonActive }, /* 125 */
151		{ "BevelButtonInactiveText", HIText, kThemeTextColorBevelButtonInactive }, /* 126 */
152		{ "BevelButtonPressedText", HIText, kThemeTextColorBevelButtonPressed }, /* 127 */
153		{ "PopupButtonActiveText", HIText, kThemeTextColorPopupButtonActive }, /* 128 */
154		{ "PopupButtonInactiveText", HIText, kThemeTextColorPopupButtonInactive }, /* 129 */
155		{ "PopupButtonPressedText", HIText, kThemeTextColorPopupButtonPressed }, /* 130 */
156		{ "IconLabelText", HIText, kThemeTextColorIconLabel }, /* 131 */
157		{ "ListViewText", HIText, kThemeTextColorListView }, /* 132 */
158		{ "DocumentWindowTitleActiveText", HIText, kThemeTextColorDocumentWindowTitleActive }, /* 133 */
159		{ "DocumentWindowTitleInactiveText", HIText, kThemeTextColorDocumentWindowTitleInactive }, /* 134 */
160		{ "MovableModalWindowTitleActiveText", HIText, kThemeTextColorMovableModalWindowTitleActive }, /* 135 */
161		{ "MovableModalWindowTitleInactiveText",HIText, kThemeTextColorMovableModalWindowTitleInactive }, /* 136 */
162		{ "UtilityWindowTitleActiveText", HIText, kThemeTextColorUtilityWindowTitleActive }, /* 137 */
163		{ "UtilityWindowTitleInactiveText", HIText, kThemeTextColorUtilityWindowTitleInactive }, /* 138 */
164		{ "PopupWindowTitleActiveText", HIText, kThemeTextColorPopupWindowTitleActive }, /* 139 */
165		{ "PopupWindowTitleInactiveText", HIText, kThemeTextColorPopupWindowTitleInactive }, /* 140 */
166		{ "RootMenuActiveText", HIText, kThemeTextColorRootMenuActive }, /* 141 */
167		{ "RootMenuSelectedText", HIText, kThemeTextColorRootMenuSelected }, /* 142 */
168		{ "RootMenuDisabledText", HIText, kThemeTextColorRootMenuDisabled }, /* 143 */
169		{ "MenuItemActiveText", HIText, kThemeTextColorMenuItemActive }, /* 144 */
170		{ "MenuItemSelectedText", HIText, kThemeTextColorMenuItemSelected }, /* 145 */
171		{ "MenuItemDisabledText", HIText, kThemeTextColorMenuItemDisabled }, /* 146 */
172		{ "PopupLabelActiveText", HIText, kThemeTextColorPopupLabelActive }, /* 147 */
173		{ "PopupLabelInactiveText", HIText, kThemeTextColorPopupLabelInactive }, /* 148 */
174		{ "TabFrontActiveText", HIText, kThemeTextColorTabFrontActive }, /* 149 */
175		{ "TabNonFrontActiveText", HIText, kThemeTextColorTabNonFrontActive }, /* 150 */
176		{ "TabNonFrontPressedText", HIText, kThemeTextColorTabNonFrontPressed }, /* 151 */
177		{ "TabFrontInactiveText", HIText, kThemeTextColorTabFrontInactive }, /* 152 */
178		{ "TabNonFrontInactiveText", HIText, kThemeTextColorTabNonFrontInactive }, /* 153 */
179		{ "IconLabelSelectedText", HIText, kThemeTextColorIconLabelSelected }, /* 154 */
180		{ "BevelButtonStickyActiveText", HIText, kThemeTextColorBevelButtonStickyActive }, /* 155 */
181		{ "BevelButtonStickyInactiveText", HIText, kThemeTextColorBevelButtonStickyInactive }, /* 156 */
182		{ "NotificationText", HIText, kThemeTextColorNotification }, /* 157 */
183		{ "SystemDetailText", HIText, kThemeTextColorSystemDetail }, /* 158 */
184		{ "WhiteText", HIText, kThemeTextColorWhite }, /* 159 */
185		{ "TabPaneBackground", HIBackground, kThemeBackgroundTabPane }, /* 160 */
186		{ "PlacardBackground", HIBackground, kThemeBackgroundPlacard }, /* 161 */
187		{ "WindowHeaderBackground", HIBackground, kThemeBackgroundWindowHeader }, /* 162 */
188		{ "ListViewWindowHeaderBackground", HIBackground, kThemeBackgroundListViewWindowHeader }, /* 163 */
189		{ "SecondaryGroupBoxBackground", HIBackground, kThemeBackgroundSecondaryGroupBox }, /* 164 */
190		{ "MetalBackground", HIBackground, kThemeBackgroundMetal }, /* 165 */
	19	#include "tkMacOSXColor.h"
	20
	21	static Tcl_HashTable systemColors;
	22	static int numSystemColors;
	23	static int rgbColorIndex;
	24	static int controlAccentIndex;
	25	static int selectedTabTextIndex;
	26	static Bool useFakeAccentColor = NO;
	27	static SystemColorDatum **systemColorIndex;
	28	#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
	29	static NSAppearance *lightAqua = nil;
	30	static NSAppearance *darkAqua = nil;
	31	#endif
	32	static NSColorSpace* sRGB = NULL;
	33	static const CGFloat WINDOWBACKGROUND[4] =
	34	{236.0 / 255, 236.0 / 255, 236.0 / 255, 1.0};
	35
	36	void initColorTable()
	37	{
	38	NSAutoreleasePool *pool = [NSAutoreleasePool new];
	39	Tcl_InitHashTable(&systemColors, TCL_STRING_KEYS);
	40	SystemColorDatum entry, oldEntry;
	41	Tcl_HashSearch search;
	42	Tcl_HashEntry *hPtr;
	43	int newPtr, index = 0;
	44	NSColorList *systemColorList = [NSColorList colorListNamed:@"System"];
	45	NSString *key;
	46
	47	#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
	48	if (@available(macOS 10.14, *)) {
	49	darkAqua = [NSAppearance appearanceNamed:NSAppearanceNameDarkAqua];
	50	lightAqua = [NSAppearance appearanceNamed:NSAppearanceNameAqua];
	51	}
	52	#endif
191	53
192	54	/*
193		* Colors based on "semantic" NSColors.
	55	* Build a hash table for looking up a color by its name.
	56	* First add all of the static entries from tkMacOSXColor.h
194	57	*/
195	58
196		{ "WindowBackgroundColor", ttkBackground, 0 }, /* 166 */
197		{ "WindowBackgroundColor1", ttkBackground, 1 }, /* 167 */
198		{ "WindowBackgroundColor2", ttkBackground, 2 }, /* 168 */
199		{ "WindowBackgroundColor3", ttkBackground, 3 }, /* 169 */
200		{ "WindowBackgroundColor4", ttkBackground, 4 }, /* 170 */
201		{ "WindowBackgroundColor5", ttkBackground, 5 }, /* 171 */
202		{ "WindowBackgroundColor6", ttkBackground, 6 }, /* 172 */
203		{ "WindowBackgroundColor7", ttkBackground, 7 }, /* 173 */
204		{ "TextColor", semantic, 0 }, /* 174 */
205		{ "SelectedTextColor", semantic, 1 }, /* 175 */
206		{ "LabelColor", semantic, 2 }, /* 176 */
207		{ "ControlTextColor", semantic, 3 }, /* 177 */
208		{ "DisabledControlTextColor", semantic, 4 }, /* 178 */
209		{ "SelectedTabTextColor", semantic, 5 }, /* 179 */
210		{ "TextBackgroundColor", semantic, 6 }, /* 180 */
211		{ "SelectedTextBackgroundColor", semantic, 7 }, /* 181 */
212		{ "ControlAccentColor", semantic, 8 }, /* 182 */
213		{ NULL, 0, 0 }
214		};
215		#define FIRST_SEMANTIC_COLOR 166
216		#define MAX_PIXELCODE 182
217
218		/*
219		*----------------------------------------------------------------------
220		*
221		* GetEntryFromPixelCode --
222		*
223		* Extract a SystemColorMapEntry from the table.
224		*
225		* Results:
226		* Returns false if the code is out of bounds.
	59	for (entry = systemColorData; entry->name != NULL; entry++) {
	60	hPtr = Tcl_CreateHashEntry(&systemColors, entry->name, &newPtr);
	61	if (entry->type == semantic) {
	62	NSString *colorName = [[NSString alloc]
	63	initWithCString:entry->macName
	64	encoding:NSUTF8StringEncoding];
	65	SEL colorSelector = NSSelectorFromString(colorName);
	66	if (![NSColor respondsToSelector:colorSelector]) {
	67	if ([colorName isEqualToString:@"controlAccentColor"]) {
	68	useFakeAccentColor = YES;
	69	} else if (![colorName isEqualToString:@"selectedTabTextColor"]) {
	70	/* Uncomment to print all unsupported colors: */
	71	/* printf("Unsupported color %s\n", colorName.UTF8String); */
	72	continue;
	73	}
	74	}
	75	entry->selector = [colorName retain];
	76	}
	77	if (newPtr == 0) {
	78	oldEntry = (SystemColorDatum *) Tcl_GetHashValue(hPtr);
	79	entry->index = oldEntry->index;
	80	[oldEntry->selector release];
	81	} else {
	82	entry->index = index++;
	83	}
	84	Tcl_SetHashValue(hPtr, entry);
	85	}
	86
	87	/*
	88	* Add all of the colors in the System ColorList.
	89	*/
	90
	91	for (key in [systemColorList allKeys]) {
	92	int length = [key lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
	93	char *name;
	94	entry = (SystemColorDatum *)ckalloc(sizeof(SystemColorDatum));
	95	bzero(entry, sizeof(SystemColorDatum));
	96	name = (char *)ckalloc(length + 1);
	97	strcpy(name, key.UTF8String);
	98	name[0] = toupper(name[0]);
	99	if (!strcmp(name, "WindowBackgroundColor")) {
	100
	101	/*
	102	* Avoid black windows on old systems.
	103	*/
	104
	105	continue;
	106	}
	107	entry->type=semantic;
	108	entry->name = name;
	109	entry->selector = [key retain];
	110	hPtr = Tcl_CreateHashEntry(&systemColors, entry->name, &newPtr);
	111	if (newPtr == 0) {
	112	oldEntry = (SystemColorDatum *) Tcl_GetHashValue(hPtr);
	113	entry->index = oldEntry->index;
	114	[oldEntry->selector release];
	115	} else {
	116	entry->index = index++;
	117	}
	118	Tcl_SetHashValue(hPtr, entry);
	119	}
	120
	121	/*
	122	* Build an array for looking up a color by its index.
	123	*/
	124
	125	numSystemColors = index;
	126	systemColorIndex = (SystemColorDatum *)ckalloc(numSystemColors sizeof(SystemColorDatum *));
	127	for (hPtr = Tcl_FirstHashEntry(&systemColors, &search); hPtr != NULL;
	128	hPtr = Tcl_NextHashEntry(&search)) {
	129	entry = (SystemColorDatum *) Tcl_GetHashValue(hPtr);
	130	if (entry == NULL) {
	131	Tcl_Panic("Unsupported semantic color with no supported backup!");
	132	}
	133	systemColorIndex[entry->index] = entry;
	134	}
	135
	136	/*
	137	* Remember the indexes of some special entries.
	138	*/
	139
	140	hPtr = Tcl_FindHashEntry(&systemColors, "Pixel");
	141	entry = (SystemColorDatum *) Tcl_GetHashValue(hPtr);
	142	rgbColorIndex = entry->index;
	143	hPtr = Tcl_FindHashEntry(&systemColors, "ControlAccentColor");
	144	entry = (SystemColorDatum *) Tcl_GetHashValue(hPtr);
	145	controlAccentIndex = entry->index;
	146	hPtr = Tcl_FindHashEntry(&systemColors, "SelectedTabTextColor");
	147	entry = (SystemColorDatum *) Tcl_GetHashValue(hPtr);
	148	selectedTabTextIndex = entry->index;
	149	[pool drain];
	150	}
	151
	152	/*
	153	*----------------------------------------------------------------------
	154	*
	155	* TkMacOSXRGBPixel --
	156	*
	157	* Return an unsigned long value suitable for use in the pixel
	158	* field of an XColor with the specified red, green and blue
	159	* intensities. The inputs are cast as unsigned longs but are
	160	* expected to have values representable by an unsigned char.
	161	*
	162	* This is called in the TkpGetPixel macro, used in xcolor.c,
	163	* and in ImageGetPixel.
	164	*
	165	* Results:
	166	* An unsigned long that can be used as the pixel field of an XColor.
227	167	*
228	168	* Side effects:
229	169	* None.
230		*
231		*----------------------------------------------------------------------
232		*/
233
234		static bool
235		GetEntryFromPixelCode(
236		unsigned char code,
237		struct SystemColorMapEntry *entry)
238		{
239		if (code >= MIN_PIXELCODE && code <= MAX_PIXELCODE) {
240		*entry = systemColorMap[code - MIN_PIXELCODE];
241		return true;
	170	*----------------------------------------------------------------------
	171	*/
	172	MODULE_SCOPE
	173	unsigned long
	174	TkMacOSXRGBPixel(
	175	unsigned long red,
	176	unsigned long green,
	177	unsigned long blue)
	178	{
	179	MacPixel p = {0};
	180	p.pixel.colortype = rgbColor;
	181	p.pixel.value = ((red & 0xff) << 16) \|
	182	((green & 0xff) << 8) \|
	183	(blue & 0xff);
	184	return p.ulong;
	185	}
	186
	187	/*
	188	*----------------------------------------------------------------------
	189	*
	190	* TkMacOSXClearPixel --
	191	*
	192	* Return the unsigned long value that appears in the pixel
	193	* field of the XColor for systemTransparentColor.
	194	*
	195	* This is used in tkMacOSXImage.c.
	196	*
	197	* Results:
	198	* The unsigned long that appears in the pixel field of the XColor
	199	* for systemTransparentPixel.
	200	*
	201	* Side effects:
	202	* None.
	203	*----------------------------------------------------------------------
	204	*/
	205	MODULE_SCOPE
	206	unsigned long TkMacOSXClearPixel(
	207	void)
	208	{
	209	MacPixel p = {0};
	210	p.pixel.value = 0;
	211	p.pixel.colortype = clearColor;
	212	return p.ulong;
	213	}
	214
	215
	216	/*
	217	*----------------------------------------------------------------------
	218	*
	219	* GetEntryFromPixel --
	220	*
	221	* Look up a SystemColorDatum which describes the XColor with
	222	* the specified value as its pixel field.
	223	*
	224	* Results:
	225	* A pointer to a SystemColorDatum, or NULL if the pixel value is
	226	* invalid.
	227	*
	228	* Side effects:
	229	* None
	230	*
	231	*----------------------------------------------------------------------
	232	*/
	233
	234	SystemColorDatum*
	235	GetEntryFromPixel(
	236	unsigned long pixel)
	237	{
	238	MacPixel p = {0};
	239	int index = rgbColorIndex;
	240
	241	p.ulong = pixel;
	242	if (p.pixel.colortype != rgbColor) {
	243	index = p.pixel.value;
	244	}
	245	if (index < numSystemColors) {
	246	return systemColorIndex[index];
242	247	} else {
243		return false;
244		}
245		}
246
247		/*
248		*----------------------------------------------------------------------
249		*
250		* SetCGColorComponents --
251		*
252		* Set the components of a CGColorRef from an XColor pixel value and a
253		* system color map entry. The pixel value is only used in the case where
254		* the color is of type rgbColor. In that case the normalized XColor RGB
255		* values are copied into the CGColorRef.
256		*
257		* Results:
258		* OSStatus
259		*
260		* Side effects:
261		* None.
262		*
263		*----------------------------------------------------------------------
264		*/
265
266		static NSColorSpace* deviceRGB = NULL;
267		static CGFloat blueAccentRGBA[4] = {0, 122.0 / 255, 1.0, 1.0};
268		static CGFloat windowBackground[4] =
269		{236.0 / 255, 236.0 / 255, 236.0 / 255, 1.0};
270
271		static OSStatus
272		SetCGColorComponents(
273		struct SystemColorMapEntry entry,
	248	return NULL;
	249	}
	250	}
	251
	252
	253	/*
	254	*----------------------------------------------------------------------
	255	*
	256	* GetRGBA --
	257	*
	258	* Given a SystemColorDatum and a pointer to an array of 4 CGFloats, store
	259	* the associated RGBA color values in the array. In the case of the
	260	* RGBColor datum, the unsigned long pixel value containing the RGB values
	261	* must also be provided as the pixel parameter. Otherwise the pixel
	262	* parameter is ignored.
	263	*
	264	* Results:
	265	* None
	266	*
	267	* Side effects:
	268	* The array rgba is filled in.
	269	*
	270	*----------------------------------------------------------------------
	271	*/
	272
	273	static void
	274	GetRGBA(
	275	SystemColorDatum *entry,
274	276	unsigned long pixel,
275		CGColorRef *c)
276		{
277		OSStatus err = noErr;
	277	CGFloat *rgba)
	278	{
278	279	NSColor bgColor, color = nil;
279		CGFloat rgba[4] = {0, 0, 0, 1};
280		#if MAC_OS_X_VERSION_MAX_ALLOWED < 101400
281		NSInteger colorVariant;
282		static CGFloat graphiteAccentRGBA[4] =
283		{152.0 / 255, 152.0 / 255, 152.0 / 255, 1.0};
284		#endif
285
286		if (!deviceRGB) {
287		deviceRGB = [NSColorSpace deviceRGBColorSpace];
288		}
289
290		/*
291		* This function is called before our autorelease pool is set up,
292		* so it needs its own pool.
293		*/
294
295		NSAutoreleasePool *pool = [NSAutoreleasePool new];
296
297		switch (entry.type) {
298		case HIBrush:
299		err = ChkErr(HIThemeBrushCreateCGColor, entry.value, c);
300		return err;
	280
	281	if (!sRGB) {
	282	sRGB = [NSColorSpace sRGBColorSpace];
	283	}
	284
	285	switch (entry->type) {
301	286	case rgbColor:
302	287	rgba[0] = ((pixel >> 16) & 0xff) / 255.0;
303	288	rgba[1] = ((pixel >> 8) & 0xff) / 255.0;

310	295	* windowBackGroundColor.
311	296	*/
312	297
313		if ([NSApp macMinorVersion] < 14) {
314		for (int i=0; i<3; i++) {
315		rgba[i] = windowBackground[i];
	298	if ([NSApp macOSVersion] < 101400) {
	299	for (int i = 0; i < 3; i++) {
	300	rgba[i] = WINDOWBACKGROUND[i];
316	301	}
317	302	} else {
318		bgColor = [[NSColor windowBackgroundColor] colorUsingColorSpace:
319		deviceRGB];
	303	bgColor = [[NSColor windowBackgroundColor] colorUsingColorSpace:sRGB];
320	304	[bgColor getComponents: rgba];
321	305	}
322	306	if (rgba[0] + rgba[1] + rgba[2] < 1.5) {
323	307	for (int i=0; i<3; i++) {
324		rgba[i] += entry.value*8.0 / 255.0;
	308	rgba[i] += entry->value*8.0 / 255.0;
325	309	}
326	310	} else {
327	311	for (int i=0; i<3; i++) {
328		rgba[i] -= entry.value*8.0 / 255.0;
	312	rgba[i] -= entry->value*8.0 / 255.0;
329	313	}
330	314	}
	315	break;
	316	case clearColor:
	317	rgba[0] = rgba[1] = rgba[2] = 1.0;
	318	rgba[3] = 0;
331	319	break;
332	320	case semantic:
333		switch (entry.value) {
334		case 0:
335		color = [[NSColor textColor] colorUsingColorSpace: deviceRGB];
336		break;
337		case 1:
338		color = [[NSColor selectedTextColor] colorUsingColorSpace: deviceRGB];
339		break;
340		case 2:
341		if ([NSApp macMinorVersion] > 9) {
342		#if MAC_OS_X_VERSION_MAX_ALLOWED > 1090
343		color = [[NSColor labelColor] colorUsingColorSpace: deviceRGB];
	321	if (entry->index == controlAccentIndex && useFakeAccentColor) {
	322	#if MAC_OS_X_VERSION_MIN_REQUIRED < 101400
	323	color = [[NSColor colorForControlTint: [NSColor currentControlTint]]
	324	colorUsingColorSpace:sRGB];
344	325	#endif
	326	} else if (entry->index == selectedTabTextIndex) {
	327	int OSVersion = [NSApp macOSVersion];
	328	if (OSVersion > 100600 && OSVersion < 110000) {
	329	color = [[NSColor whiteColor] colorUsingColorSpace:sRGB];
345	330	} else {
346		color = [[NSColor textColor] colorUsingColorSpace: deviceRGB];
	331	color = [[NSColor textColor] colorUsingColorSpace:sRGB];
347	332	}
348		break;
349		case 3:
350		color = [[NSColor controlTextColor] colorUsingColorSpace:
351		deviceRGB];
352		break;
353		case 4:
354		color = [[NSColor disabledControlTextColor] colorUsingColorSpace:
355		deviceRGB];
356		break;
357		case 5:
358		if ([NSApp macMinorVersion] > 6) {
359		color = [[NSColor whiteColor] colorUsingColorSpace:
360		deviceRGB];
361		} else {
362		color = [[NSColor blackColor] colorUsingColorSpace:
363		deviceRGB];
364		}
365		break;
366		case 6:
367		color = [[NSColor textBackgroundColor] colorUsingColorSpace:
368		deviceRGB];
369		break;
370		case 7:
371		color = [[NSColor selectedTextBackgroundColor] colorUsingColorSpace:
372		deviceRGB];
373		break;
374		case 8:
375		#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
376		if (@available(macOS 10.14, *)) {
377		color = [[NSColor controlAccentColor] colorUsingColorSpace:
378		deviceRGB];
379		} else {
380		color = [NSColor colorWithColorSpace: deviceRGB
381		components: blueAccentRGBA
382		count: 4];
383		}
384		#else
385		colorVariant = [[NSUserDefaults standardUserDefaults]
386		integerForKey:@"AppleAquaColorVariant"];
387		if (colorVariant == 6) {
388		color = [NSColor colorWithColorSpace: deviceRGB
389		components: graphiteAccentRGBA
390		count: 4];
391		} else {
392		color = [NSColor colorWithColorSpace: deviceRGB
393		components: blueAccentRGBA
394		count: 4];
395		}
396		#endif
397		break;
398		default:
399		#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101000
400		if ([NSApp macMinorVersion] >= 10) {
401		color = [[NSColor labelColor] colorUsingColorSpace:
402		deviceRGB];
403		break;
404		}
405		#endif
406		color = [[NSColor textColor] colorUsingColorSpace: deviceRGB];
407		break;
	333	} else {
	334	color = [[NSColor valueForKey:entry->selector] colorUsingColorSpace:sRGB];
408	335	}
409	336	[color getComponents: rgba];
410	337	break;
411		case clearColor:
412		rgba[3] = 0.0;
	338	case HIText:
	339	#ifdef __LP64__
	340	color = [[NSColor textColor] colorUsingColorSpace:sRGB];
	341	[color getComponents: rgba];
	342	#else
	343	{
	344	OSStatus err = noErr;
	345	RGBColor rgb;
	346	err = GetThemeTextColor(kThemeTextColorPushButtonActive, 32,
	347	true, &rgb);
	348	if (err == noErr) {
	349	rgba[0] = (CGFloat) rgb.red / 65535;
	350	rgba[1] = (CGFloat) rgb.green / 65535;
	351	rgba[2] = (CGFloat) rgb.blue / 65535;
	352	}
	353	}
	354	#endif
413	355	break;
414
415		/*
416		* There are no HITheme functions which convert Text or background colors
417		* to CGColors. (GetThemeTextColor has been removed, and it was never
418		* possible with backgrounds.) If we get one of these we return black.
419		*/
420
421		case HIText:
422	356	case HIBackground:
	357	color = [[NSColor windowBackgroundColor] colorUsingColorSpace:sRGB];
	358	[color getComponents: rgba];
	359	break;
423	360	default:
424	361	break;
425	362	}
426		*c = CGColorCreate(deviceRGB.CGColorSpace, rgba);
	363	}
	364
	365	/*
	366	*----------------------------------------------------------------------
	367	*
	368	* SetCGColorComponents --
	369	*
	370	* Set the components of a CGColorRef from an XColor pixel value and a
	371	* SystemColorDatum. The pixel value is only used in the case where
	372	* the color is of type rgbColor. In that case the normalized XColor RGB
	373	* values are copied into the CGColorRef. Otherwise the components are
	374	* computed from the SystemColorDatum.
	375	*
	376	* In 64 bit macOS systems there are no HITheme functions which convert
	377	* HIText or HIBackground colors to CGColors. (GetThemeTextColor was
	378	* removed, and it was never possible with backgrounds.) On 64-bit systems
	379	* we replace all HIText colors by systemTextColor and all HIBackground
	380	* colors by systemWindowBackgroundColor.
	381	*
	382	* Results:
	383	* True if the function succeeds, false otherwise.
	384	*
	385	* Side effects:
	386	* None.
	387	*
	388	*----------------------------------------------------------------------
	389	*/
	390
	391	static Bool
	392	SetCGColorComponents(
	393	SystemColorDatum *entry,
	394	unsigned long pixel,
	395	CGColorRef *c)
	396	{
	397	CGFloat rgba[4] = {0, 0, 0, 1};
	398
	399	/*
	400	* This function is called before our autorelease pool is set up,
	401	* so it needs its own pool.
	402	*/
	403
	404	NSAutoreleasePool *pool = [NSAutoreleasePool new];
	405
	406	if (entry->type == HIBrush) {
	407	OSStatus err = ChkErr(HIThemeBrushCreateCGColor, entry->value, c);
	408	return err == noErr;
	409	}
	410	GetRGBA(entry, pixel, rgba);
	411	*c = CGColorCreate(sRGB.CGColorSpace, rgba);
427	412	[pool drain];
428		return err;
	413	return true;
429	414	}
430	415
431	416	/*

447	432	MODULE_SCOPE Bool
448	433	TkMacOSXInDarkMode(Tk_Window tkwin)
449	434	{
450		int result = false;
451	435
452	436	#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
453		if ([NSApp macMinorVersion] >= 14) {
454		static NSAppearanceName darkAqua = @"NSAppearanceNameDarkAqua";
	437	if (@available(macOS 10.14, *)) {
455	438	TkWindow winPtr = (TkWindow) tkwin;
456		NSView *view = TkMacOSXDrawableView(winPtr->privatePtr);
457		result = (view &&
458		[view.effectiveAppearance.name isEqualToString:darkAqua]);
	439	NSAppearanceName name;
	440	NSView *view = nil;
	441	if (winPtr && winPtr->privatePtr) {
	442	view = TkMacOSXGetNSViewForDrawable((Drawable)winPtr->privatePtr);
	443	}
	444	if (view) {
	445	name = [[view effectiveAppearance] name];
	446	} else {
	447	name = [[NSAppearance currentAppearance] name];
	448	}
	449	return (name == NSAppearanceNameDarkAqua);
459	450	}
460	451	#endif
461		return result;
	452	return false;
462	453	}
463	454
464	455	/*

466	457	*
467	458	* TkSetMacColor --
468	459	*
469		* Sets the components of a CGColorRef from an XColor pixel value.
470		* The high order byte of the pixel value is used as an index into
471		* the system color table, and then SetCGColorComponents is called
472		* with the table entry and the pixel value.
473		*
474		* Results:
475		* Returns false if the high order byte is not a valid index, true
476		* otherwise.
477		*
478		* Side effects:
479		* The variable macColor is set to a new CGColorRef, the caller is
480		* responsible for releasing it!
	460	* Sets the components of a CGColorRef from an XColor pixel value. The
	461	* pixel value is used to look up the color in the system color table, and
	462	* then SetCGColorComponents is called with the table entry and the pixel
	463	* value. The parameter macColor should be a pointer to a CGColorRef.
	464	*
	465	* Results:
	466	* Returns false if the color is not found, true otherwise.
	467	*
	468	* Side effects:
	469	* The CGColorRef referenced by the variable macColor may be modified.
481	470	*
482	471	*----------------------------------------------------------------------
483	472	*/
484	473
485	474	int
486	475	TkSetMacColor(
487		unsigned long pixel, /* Pixel value to convert. */
488		void macColor) / CGColorRef to modify. */
	476	unsigned long pixel, /* Pixel value to convert. */
	477	void macColor) / CGColorRef to modify. */
489	478	{
490	479	CGColorRef color = (CGColorRef)macColor;
491		OSStatus err = -1;
492		struct SystemColorMapEntry entry;
493
494		if (GetEntryFromPixelCode((pixel >> 24) & 0xff, &entry)) {
495		err = ChkErr(SetCGColorComponents, entry, pixel, color);
496		}
497		return (err == noErr);
498		}
499
500		/*
501		*----------------------------------------------------------------------
502		*
503		* TkpInitGCCache, TkpFreeGCCache, CopyCachedColor, SetCachedColor --
504		*
505		* Maintain a per-GC cache of previously converted CGColorRefs
506		*
507		* Results:
508		* None resp. retained CGColorRef for CopyCachedColor()
509		*
510		* Side effects:M
511		* None.
512		*
513		*----------------------------------------------------------------------
514		*/
515
516		void
517		TkpInitGCCache(
518		GC gc)
519		{
520		bzero(TkpGetGCCache(gc), sizeof(TkpGCCache));
521		}
522
523		void
524		TkpFreeGCCache(
525		GC gc)
526		{
527		TkpGCCache *gcCache = TkpGetGCCache(gc);
528
529		if (gcCache->cachedForegroundColor) {
530		CFRelease(gcCache->cachedForegroundColor);
531		}
532		if (gcCache->cachedBackgroundColor) {
533		CFRelease(gcCache->cachedBackgroundColor);
534		}
535		}
536
537		static CGColorRef
538		CopyCachedColor(
539		GC gc,
540		unsigned long pixel)
541		{
542		TkpGCCache *gcCache = TkpGetGCCache(gc);
543		CGColorRef cgColor = NULL;
544
545		if (gcCache) {
546		if (gcCache->cachedForeground == pixel) {
547		cgColor = gcCache->cachedForegroundColor;
548		} else if (gcCache->cachedBackground == pixel) {
549		cgColor = gcCache->cachedBackgroundColor;
550		}
551		if (cgColor) {
552		CFRetain(cgColor);
553		}
554		}
555		return cgColor;
556		}
557
558		static void
559		SetCachedColor(
560		GC gc,
561		unsigned long pixel,
562		CGColorRef cgColor)
563		{
564		TkpGCCache *gcCache = TkpGetGCCache(gc);
565
566		if (gcCache && cgColor) {
567		if (gc->foreground == pixel) {
568		if (gcCache->cachedForegroundColor) {
569		CFRelease(gcCache->cachedForegroundColor);
570		}
571		gcCache->cachedForegroundColor = (CGColorRef) CFRetain(cgColor);
572		gcCache->cachedForeground = pixel;
573		} else if (gc->background == pixel) {
574		if (gcCache->cachedBackgroundColor) {
575		CFRelease(gcCache->cachedBackgroundColor);
576		}
577		gcCache->cachedBackgroundColor = (CGColorRef) CFRetain(cgColor);
578		gcCache->cachedBackground = pixel;
579		}
580		}
581		}
582
583		/*
584		*----------------------------------------------------------------------
585		*
586		* TkMacOSXCreateCGColor --
587		*
588		* Creates a CGColorRef from a X style pixel value.
589		*
590		* Results:
591		* Returns NULL if not a real pixel, CGColorRef otherwise.
592		*
593		* Side effects:
594		* None
595		*
596		*----------------------------------------------------------------------
597		*/
598
599		CGColorRef
600		TkMacOSXCreateCGColor(
601		GC gc,
602		unsigned long pixel) /* Pixel value to convert. */
603		{
604		CGColorRef cgColor = CopyCachedColor(gc, pixel);
605
606		if (!cgColor && TkSetMacColor(pixel, &cgColor)) {
607		SetCachedColor(gc, pixel, cgColor);
608		}
609		return cgColor;
	480	SystemColorDatum *entry = GetEntryFromPixel(pixel);
	481
	482	if (entry) {
	483	return SetCGColorComponents(entry, pixel, color);
	484	} else {
	485	return false;
	486	}
610	487	}
611	488
612	489	/*

615	492	* TkMacOSXGetNSColor --
616	493	*
617	494	* Creates an autoreleased NSColor from a X style pixel value.
618		*
619		* Results:
620		* Returns nil if not a real pixel, NSColor* otherwise.
	495	* The return value is nil if the pixel value is invalid.
	496	*
	497	* Results:
	498	* A possibly nil pointer to an NSColor.
621	499	*
622	500	* Side effects:
623	501	* None

630	508	GC gc,
631	509	unsigned long pixel) /* Pixel value to convert. */
632	510	{
633		CGColorRef cgColor = TkMacOSXCreateCGColor(gc, pixel);
	511	CGColorRef cgColor;
634	512	NSColor *nsColor = nil;
635	513
636		if (cgColor) {
637		NSColorSpace *colorSpace = [[NSColorSpace alloc]
638		initWithCGColorSpace:CGColorGetColorSpace(cgColor)];
639
640		nsColor = [NSColor colorWithColorSpace:colorSpace
641		components:CGColorGetComponents(cgColor)
642		count:CGColorGetNumberOfComponents(cgColor)];
643		[colorSpace release];
644		CFRelease(cgColor);
645		}
	514	TkSetMacColor(pixel, &cgColor);
	515	nsColor = [NSColor colorWithColorSpace:sRGB
	516	components:CGColorGetComponents(cgColor)
	517	count:CGColorGetNumberOfComponents(cgColor)];
646	518	return nsColor;
647	519	}
648	520

651	523	*
652	524	* TkMacOSXSetColorInContext --
653	525	*
654		* Sets fill and stroke color in the given CG context from an X
655		* pixel value, or if the pixel code indicates a system color,
656		* sets the corresponding brush, textColor or background via
657		* HITheme APIs if available or Appearance mgr APIs.
	526	* Sets the fill and stroke colors in the given CGContext to the CGColor
	527	* which corresponds to the XColor having the specified value for its pixel
	528	* field.
658	529	*
659	530	* Results:
660	531	* None.

673	544	{
674	545	OSStatus err = noErr;
675	546	CGColorRef cgColor = nil;
676		struct SystemColorMapEntry entry;
	547	SystemColorDatum *entry = GetEntryFromPixel(pixel);
677	548	CGRect rect;
678		int code = (pixel >> 24) & 0xff;
679		HIThemeBackgroundDrawInfo info = {0, kThemeStateActive, 0};;
680		static CGColorSpaceRef deviceRGBSpace = NULL;
681
682		if (!deviceRGBSpace) {
683		deviceRGBSpace = CGColorSpaceCreateDeviceRGB();
684		}
685		if (code < FIRST_SEMANTIC_COLOR) {
686		cgColor = CopyCachedColor(gc, pixel);
687		}
688		if (!cgColor && GetEntryFromPixelCode(code, &entry)) {
689		switch (entry.type) {
	549	HIThemeBackgroundDrawInfo info = {0, kThemeStateActive, 0};
	550
	551	if (entry) {
	552	switch (entry->type) {
690	553	case HIBrush:
691		err = ChkErr(HIThemeSetFill, entry.value, NULL, context,
	554	err = ChkErr(HIThemeSetFill, entry->value, NULL, context,
692	555	kHIThemeOrientationNormal);
693	556	if (err == noErr) {
694		err = ChkErr(HIThemeSetStroke, entry.value, NULL, context,
	557	err = ChkErr(HIThemeSetStroke, entry->value, NULL, context,
695	558	kHIThemeOrientationNormal);
696	559	}
697	560	break;
698	561	case HIText:
699		err = ChkErr(HIThemeSetTextFill, entry.value, NULL, context,
	562	err = ChkErr(HIThemeSetTextFill, entry->value, NULL, context,
700	563	kHIThemeOrientationNormal);
701	564	break;
702	565	case HIBackground:
703		info.kind = entry.value;
	566	info.kind = entry->value;
704	567	rect = CGContextGetClipBoundingBox(context);
705	568	err = ChkErr(HIThemeApplyBackground, &rect, &info,
706	569	context, kHIThemeOrientationNormal);
707	570	break;
708	571	default:
709		err = ChkErr(SetCGColorComponents, entry, pixel, &cgColor);
710		if (err == noErr) {
711		SetCachedColor(gc, pixel, cgColor);
712		}
	572	SetCGColorComponents(entry, pixel, &cgColor);
713	573	break;
714	574	}
715	575	}

728	588	*
729	589	* TkpGetColor --
730	590	*
731		* Allocate a new TkColor for the color with the given name.
	591	* Create a new TkColor for the color with the given name, for use in the
	592	* specified window. The colormap field is set to lightColormap if the
	593	* window has a LightAqua appearance, or darkColormap if the window has a
	594	* DarkAqua appearance. TkColors with different colormaps are managed
	595	* separately in the per-display table of TkColors maintained by Tk.
	596	*
	597	* This function is called by Tk_GetColor.
732	598	*
733	599	* Results:
734	600	* Returns a newly allocated TkColor, or NULL on failure.
735	601	*
736	602	* Side effects:
737		* May invalidate the colormap cache associated with tkwin upon
738		* allocating a new colormap entry. Allocates a new TkColor
739		* structure.
	603	*
	604	* Allocates memory for the TkColor structure.
740	605	*
741	606	*----------------------------------------------------------------------
742	607	*/

747	612	Tk_Uid name) /* Name of color to be allocated (in form
748	613	* suitable for passing to XParseColor). */
749	614	{
750		Display *display = tkwin != None ? Tk_Display(tkwin) : NULL;
751		Colormap colormap = tkwin!= None ? Tk_Colormap(tkwin) : None;
	615	Display *display = NULL;
752	616	TkColor *tkColPtr;
753	617	XColor color;
	618	Colormap colormap = tkwin ? Tk_Colormap(tkwin) : noColormap;
	619	NSView *view = nil;
	620	static Bool initialized = NO;
	621	static NSColorSpace* sRGB = nil;
	622
	623	if (!initialized) {
	624	initialized = YES;
	625	sRGB = [NSColorSpace sRGBColorSpace];
	626	initColorTable();
	627	}
	628	if (tkwin) {
	629	display = Tk_Display(tkwin);
	630	Drawable d = Tk_WindowId(tkwin);
	631	view = TkMacOSXGetNSViewForDrawable(d);
	632	}
754	633
755	634	/*
756		* Check to see if this is a system color. Otherwise, XParseColor
757		* will do all the work.
	635	* Check to see if this is a system color. If not, just call XParseColor.
758	636	*/
759	637
760	638	if (strncasecmp(name, "system", 6) == 0) {
761		Tcl_Obj *strPtr = Tcl_NewStringObj(name+6, -1);
762		int idx, result;
763
764		result = Tcl_GetIndexFromObjStruct(NULL, strPtr, systemColorMap,
765		sizeof(struct SystemColorMapEntry), NULL, TCL_EXACT, &idx);
766		Tcl_DecrRefCount(strPtr);
767		if (result == TCL_OK) {
768		OSStatus err;
	639	Tcl_HashEntry *hPtr = Tcl_FindHashEntry(&systemColors, name + 6);
	640	MacPixel p = {0};
	641
	642	if (hPtr != NULL) {
	643	SystemColorDatum entry = (SystemColorDatum )Tcl_GetHashValue(hPtr);
769	644	CGColorRef c;
770		unsigned char pixelCode = idx + MIN_PIXELCODE;
771		struct SystemColorMapEntry entry = systemColorMap[idx];
772
773		err = ChkErr(SetCGColorComponents, entry, 0, &c);
774		if (err == noErr) {
	645
	646	p.pixel.colortype = entry->type;
	647	p.pixel.value = entry->index;
	648	color.pixel = p.ulong;
	649	if (entry->type == semantic) {
	650	CGFloat rgba[4];
	651	#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
	652	if (@available(macOS 10.14, *)) {
	653	NSAppearance *savedAppearance = [NSAppearance currentAppearance];
	654	NSAppearance *windowAppearance = savedAppearance;
	655	if (view) {
	656	windowAppearance = [view effectiveAppearance];
	657	}
	658	if ([windowAppearance name] == NSAppearanceNameDarkAqua) {
	659	colormap = darkColormap;
	660	} else {
	661	colormap = lightColormap;
	662	}
	663	[NSAppearance setCurrentAppearance:windowAppearance];
	664	GetRGBA(entry, p.ulong, rgba);
	665	[NSAppearance setCurrentAppearance:savedAppearance];
	666	} else {
	667	GetRGBA(entry, p.ulong, rgba);
	668	}
	669	#else
	670	GetRGBA(entry, p.ulong, rgba);
	671	#endif
	672	color.red = rgba[0] * 65535.0;
	673	color.green = rgba[1] * 65535.0;
	674	color.blue = rgba[2] * 65535.0;
	675	goto validXColor;
	676	} else if (SetCGColorComponents(entry, 0, &c)) {
775	677	const size_t n = CGColorGetNumberOfComponents(c);
776	678	const CGFloat *rgba = CGColorGetComponents(c);
777	679

787	689	default:
788	690	Tcl_Panic("CGColor with %d components", (int) n);
789	691	}
790		color.pixel = ((((((pixelCode << 8)
791		\| ((color.red >> 8) & 0xff)) << 8)
792		\| ((color.green >> 8) & 0xff)) << 8)
793		\| ((color.blue >> 8) & 0xff));
794	692	CGColorRelease(c);
795	693	goto validXColor;
796	694	}
797		CGColorRelease(c);
798		}
799		}
800
	695	}
	696	}
801	697	if (TkParseColor(display, colormap, name, &color) == 0) {
802	698	return NULL;
803	699	}
804	700
805	701	validXColor:
806		tkColPtr = ckalloc(sizeof(TkColor));
	702	tkColPtr = (TkColor *)ckalloc(sizeof(TkColor));
	703	tkColPtr->colormap = colormap;
807	704	tkColPtr->color = color;
808
809	705	return tkColPtr;
810	706	}
811	707

814	710	*
815	711	* TkpGetColorByValue --
816	712	*
817		* Given a desired set of red-green-blue intensities for a color,
818		* locate a pixel value to use to draw that color in a given
819		* window.
820		*
821		* Results:
822		* The return value is a pointer to an TkColor structure that
823		* indicates the closest red, blue, and green intensities available
824		* to those specified in colorPtr, and also specifies a pixel
825		* value to use to draw in that color.
	713	* Given an pointer to an XColor, construct a TkColor whose red, green and
	714	* blue intensities match those of the XColor as closely as possible. For
	715	* the Macintosh, this means that the colortype bitfield of the pixel
	716	* value will be RGBColor and that the color intensities stored in its
	717	* 24-bit value bitfield are computed from the 16-bit red green and blue
	718	* values in the XColor by dividing by 256.
	719	*
	720	* Results:
	721	* A pointer to a newly allocated TkColor structure.
826	722	*
827	723	* Side effects:
828	724	* May invalidate the colormap cache for the specified window.
829		* Allocates a new TkColor structure.
	725	* Allocates memory for a TkColor structure.
830	726	*
831	727	*----------------------------------------------------------------------
832	728	*/
833	729
834	730	TkColor *
835	731	TkpGetColorByValue(
836		Tk_Window tkwin, /* Window in which color will be used. */
	732	TCL_UNUSED(Tk_Window), /* Window in which color will be used. */
837	733	XColor colorPtr) / Red, green, and blue fields indicate
838	734	* desired color. */
839	735	{
840		TkColor *tkColPtr = ckalloc(sizeof(TkColor));
	736	TkColor tkColPtr = (TkColor )ckalloc(sizeof(TkColor));
841	737
842	738	tkColPtr->color.red = colorPtr->red;
843	739	tkColPtr->color.green = colorPtr->green;
844	740	tkColPtr->color.blue = colorPtr->blue;
845		tkColPtr->color.pixel = TkpGetPixel(&tkColPtr->color);
	741	tkColPtr->color.pixel = TkpGetPixel(colorPtr);
846	742	return tkColPtr;
847	743	}
848	744

866	762	Status
867	763	XAllocColor(
868	764	Display display, / Display. */
869		Colormap map, /* Not used. */
	765	TCL_UNUSED(Colormap), /* Not used. */
870	766	XColor colorPtr) / XColor struct to modify. */
871	767	{
872	768	display->request++;

876	772
877	773	Colormap
878	774	XCreateColormap(
879		Display display, / Display. */
880		Window window, /* X window. */
881		Visual visual, / Not used. */
882		int alloc) /* Not used. */
883		{
884		static Colormap index = 1;
	775	TCL_UNUSED(Display ), / Display. */
	776	TCL_UNUSED(Window), /* X window. */
	777	TCL_UNUSED(Visual ), / Not used. */
	778	TCL_UNUSED(int)) /* Not used. */
	779	{
	780	static Colormap index = 16;
885	781
886	782	/*
887		* Just return a new value each time.
	783	* Just return a new value each time, large enough that it will not
	784	* conflict with any value of the macColormap enum.
888	785	*/
889	786	return index++;
890	787	}
891	788
892	789	int
893	790	XFreeColormap(
894		Display* display, /* Display. */
895		Colormap colormap) /* Colormap. */
	791	TCL_UNUSED(Display ), / Display. */
	792	TCL_UNUSED(Colormap)) /* Colormap. */
896	793	{
897	794	return Success;
898	795	}
899	796
900	797	int
901	798	XFreeColors(
902		Display* display, /* Display. */
903		Colormap colormap, /* Colormap. */
904		unsigned long* pixels, /* Array of pixels. */
905		int npixels, /* Number of pixels. */
906		unsigned long planes) /* Number of pixel planes. */
	799	TCL_UNUSED(Display ), / Display. */
	800	TCL_UNUSED(Colormap), /* Colormap. */
	801	TCL_UNUSED(unsigned long ), / Array of pixels. */
	802	TCL_UNUSED(int), /* Number of pixels. */
	803	TCL_UNUSED(unsigned long)) /* Number of pixel planes. */
907	804	{
908	805	/*
909		* The Macintosh version of Tk uses TrueColor. Nothing
910		* needs to be done to release colors as there really is
911		* no colormap in the Tk sense.
	806	* Nothing needs to be done to release colors as there really is no
	807	* colormap in the Tk sense.
912	808	*/
913	809	return Success;
914	810	}

+264

-0

macosx/tkMacOSXColor.h less more

	0	#ifndef MACOSXCOLOR_H
	1	#define MACOSXCOLOR_H
	2	/*
	3	* The generic Tk code uses the X11 GC type to describe a graphics context.
	4	* (A GC is a pointer to a struct XGCValues). The foreground and background
	5	* colors in a GC are unsigned longs. These are meant to be used as indexes
	6	* into a table of XColors, where an XColor is declared in Xlib.h as:
	7	* typedef struct {
	8	* unsigned long pixel;
	9	* unsigned short red, green, blue;
	10	* char flags;
	11	* char pad;
	12	* } XColor;
	13	*
	14	* The xlib function XParseColor creates XColors from strings. It recognizes
	15	* literal hexadecimal color specifications such as "#RRGGBB" as well as the
	16	* standard X11 color names. When XParseColor creates an XColor it fills in
	17	* all of the fields except for the pixel field, and then passes the XColor
	18	* to TkpGetPixel to get a value to use for the pixel field. Since TkpGetPixel
	19	* is platform specific, each platform is free to choose a value which can
	20	* be used to set the foreground or background color in the platform's graphics
	21	* context.
	22	*
	23	* Tk represents a color by a struct TkColor, which extends the XColor struct.
	24	* Tk provides a mapping from color names to TkColors which extends the mapping
	25	* provided by XParseColor but also allows for platform specific color names.
	26	* By convention, these platform specific color names begin with the string
	27	* "system". The mapping from names to TkColors is implemented by the function
	28	* TkpGetColor defined for the Macintosh in this file. The pixel field in the
	29	* XColor contained in a TkColor will be stored in the X11 graphics context.
	30	* In X11 the pixel field is used as an index into a colormap. On the Mac
	31	* the high order byte of the pixel is used to indicate a color type and
	32	* the low 24 bits are either used as an rgb value (if the type is rgbColor)
	33	* or as an index into a table of color descriptions.
	34	*/
	35
	36	enum colorType {
	37	rgbColor, /* The 24 bit value is an rgb color. */
	38	clearColor, /* The unique rgba color with all channels 0. */
	39	HIBrush, /* A HITheme brush color.*/
	40	HIText, /* A HITheme text color. */
	41	HIBackground, /* A HITheme background color. */
	42	ttkBackground, /* A background color which indicates nesting level.*/
	43	semantic, /* A semantic NSColor.*/
	44	};
	45
	46	typedef struct xpixel_t {
	47	unsigned value: 24; /* Either RGB or an index into systemColorMap. */
	48	unsigned colortype: 8;
	49	} xpixel;
	50
	51	typedef union MacPixel_t {
	52	unsigned long ulong;
	53	xpixel pixel;
	54	} MacPixel;
	55
	56	/*
	57	* We maintain two colormaps, one for the LightAqua appearance and one for the
	58	* DarkAqua appearance.
	59	*/
	60
	61	enum macColormap {
	62	noColormap,
	63	lightColormap,
	64	darkColormap,
	65	};
	66
	67	/*
	68	* In TkMacOSXColor.c a Tk hash table is constructed from the static data
	69	* below to map system color names to CGColors.
	70	*/
	71
	72	typedef struct {
	73	const char *name;
	74	enum colorType type;
	75	int value;
	76	const char *macName;
	77	/* Fields below are filled in after or during construction of the hash table. */
	78	int index;
	79	NSString *selector;
	80	} SystemColorDatum;
	81
	82	/*
	83	* WARNING: Semantic colors which are not supported on all systems must be
	84	* preceded by a backup color with the same name which is supported. Systems
	85	* which do support the color will replace the backup value when the table is
	86	* constructed. Failing to ensure this will result in a Tcl_Panic abort.
	87	*/
	88
	89	static SystemColorDatum systemColorData[] = {
	90	{"Pixel", rgbColor, 0, NULL, 0, NULL },
	91	{"Transparent", clearColor, 0, NULL, 0, NULL },
	92
	93	{"Highlight", HIBrush, kThemeBrushPrimaryHighlightColor, NULL, 0, NULL },
	94	{"HighlightSecondary", HIBrush, kThemeBrushSecondaryHighlightColor, NULL, 0, NULL },
	95	{"HighlightText", HIBrush, kThemeBrushBlack, NULL, 0, NULL },
	96	{"HighlightAlternate", HIBrush, kThemeBrushAlternatePrimaryHighlightColor, NULL, 0, NULL },
	97	{"PrimaryHighlightColor", HIBrush, kThemeBrushPrimaryHighlightColor, NULL, 0, NULL },
	98	{"ButtonFace", HIBrush, kThemeBrushButtonFaceActive, NULL, 0, NULL },
	99	{"SecondaryHighlightColor", HIBrush, kThemeBrushSecondaryHighlightColor, NULL, 0, NULL },
	100	{"ButtonFrame", HIBrush, kThemeBrushButtonFrameActive, NULL, 0, NULL },
	101	{"AlternatePrimaryHighlightColor", HIBrush, kThemeBrushAlternatePrimaryHighlightColor, NULL, 0, NULL },
	102	{"WindowBody", HIBrush, kThemeBrushDocumentWindowBackground, NULL, 0, NULL },
	103	{"SheetBackground", HIBrush, kThemeBrushSheetBackground, NULL, 0, NULL },
	104	{"MenuActive", HIBrush, kThemeBrushMenuBackgroundSelected, NULL, 0, NULL },
	105	{"Menu", HIBrush, kThemeBrushMenuBackground, NULL, 0, NULL },
	106	{"DialogBackgroundInactive", HIBrush, kThemeBrushDialogBackgroundInactive, NULL, 0, NULL },
	107	{"DialogBackgroundActive", HIBrush, kThemeBrushDialogBackgroundActive, NULL, 0, NULL },
	108	{"AlertBackgroundActive", HIBrush, kThemeBrushAlertBackgroundActive, NULL, 0, NULL },
	109	{"AlertBackgroundInactive", HIBrush, kThemeBrushAlertBackgroundInactive, NULL, 0, NULL },
	110	{"ModelessDialogBackgroundActive", HIBrush, kThemeBrushModelessDialogBackgroundActive, NULL, 0, NULL },
	111	{"ModelessDialogBackgroundInactive", HIBrush, kThemeBrushModelessDialogBackgroundInactive, NULL, 0, NULL },
	112	{"UtilityWindowBackgroundActive", HIBrush, kThemeBrushUtilityWindowBackgroundActive, NULL, 0, NULL },
	113	{"UtilityWindowBackgroundInactive", HIBrush, kThemeBrushUtilityWindowBackgroundInactive, NULL, 0, NULL },
	114	{"ListViewSortColumnBackground", HIBrush, kThemeBrushListViewSortColumnBackground, NULL, 0, NULL },
	115	{"ListViewBackground", HIBrush, kThemeBrushListViewBackground, NULL, 0, NULL },
	116	{"IconLabelBackground", HIBrush, kThemeBrushIconLabelBackground, NULL, 0, NULL },
	117	{"ListViewSeparator", HIBrush, kThemeBrushListViewSeparator, NULL, 0, NULL },
	118	{"ChasingArrows", HIBrush, kThemeBrushChasingArrows, NULL, 0, NULL },
	119	{"DragHilite", HIBrush, kThemeBrushDragHilite, NULL, 0, NULL },
	120	{"DocumentWindowBackground", HIBrush, kThemeBrushDocumentWindowBackground, NULL, 0, NULL },
	121	{"FinderWindowBackground", HIBrush, kThemeBrushFinderWindowBackground, NULL, 0, NULL },
	122	{"ScrollBarDelimiterActive", HIBrush, kThemeBrushScrollBarDelimiterActive, NULL, 0, NULL },
	123	{"ScrollBarDelimiterInactive", HIBrush, kThemeBrushScrollBarDelimiterInactive, NULL, 0, NULL },
	124	{"FocusHighlight", HIBrush, kThemeBrushFocusHighlight, NULL, 0, NULL },
	125	{"PopupArrowActive", HIBrush, kThemeBrushPopupArrowActive, NULL, 0, NULL },
	126	{"PopupArrowPressed", HIBrush, kThemeBrushPopupArrowPressed, NULL, 0, NULL },
	127	{"PopupArrowInactive", HIBrush, kThemeBrushPopupArrowInactive, NULL, 0, NULL },
	128	{"AppleGuideCoachmark", HIBrush, kThemeBrushAppleGuideCoachmark, NULL, 0, NULL },
	129	{"IconLabelBackgroundSelected", HIBrush, kThemeBrushIconLabelBackgroundSelected, NULL, 0, NULL },
	130	{"StaticAreaFill", HIBrush, kThemeBrushStaticAreaFill, NULL, 0, NULL },
	131	{"ActiveAreaFill", HIBrush, kThemeBrushActiveAreaFill, NULL, 0, NULL },
	132	{"ButtonFrameActive", HIBrush, kThemeBrushButtonFrameActive, NULL, 0, NULL },
	133	{"ButtonFrameInactive", HIBrush, kThemeBrushButtonFrameInactive, NULL, 0, NULL },
	134	{"ButtonFaceActive", HIBrush, kThemeBrushButtonFaceActive, NULL, 0, NULL },
	135	{"ButtonFaceInactive", HIBrush, kThemeBrushButtonFaceInactive, NULL, 0, NULL },
	136	{"ButtonFacePressed", HIBrush, kThemeBrushButtonFacePressed, NULL, 0, NULL },
	137	{"ButtonActiveDarkShadow", HIBrush, kThemeBrushButtonActiveDarkShadow, NULL, 0, NULL },
	138	{"ButtonActiveDarkHighlight", HIBrush, kThemeBrushButtonActiveDarkHighlight, NULL, 0, NULL },
	139	{"ButtonActiveLightShadow", HIBrush, kThemeBrushButtonActiveLightShadow, NULL, 0, NULL },
	140	{"ButtonActiveLightHighlight", HIBrush, kThemeBrushButtonActiveLightHighlight, NULL, 0, NULL },
	141	{"ButtonInactiveDarkShadow", HIBrush, kThemeBrushButtonInactiveDarkShadow, NULL, 0, NULL },
	142	{"ButtonInactiveDarkHighlight", HIBrush, kThemeBrushButtonInactiveDarkHighlight, NULL, 0, NULL },
	143	{"ButtonInactiveLightShadow", HIBrush, kThemeBrushButtonInactiveLightShadow, NULL, 0, NULL },
	144	{"ButtonInactiveLightHighlight", HIBrush, kThemeBrushButtonInactiveLightHighlight, NULL, 0, NULL },
	145	{"ButtonPressedDarkShadow", HIBrush, kThemeBrushButtonPressedDarkShadow, NULL, 0, NULL },
	146	{"ButtonPressedDarkHighlight", HIBrush, kThemeBrushButtonPressedDarkHighlight, NULL, 0, NULL },
	147	{"ButtonPressedLightShadow", HIBrush, kThemeBrushButtonPressedLightShadow, NULL, 0, NULL },
	148	{"ButtonPressedLightHighlight", HIBrush, kThemeBrushButtonPressedLightHighlight, NULL, 0, NULL },
	149	{"BevelActiveLight", HIBrush, kThemeBrushBevelActiveLight, NULL, 0, NULL },
	150	{"BevelActiveDark", HIBrush, kThemeBrushBevelActiveDark, NULL, 0, NULL },
	151	{"BevelInactiveLight", HIBrush, kThemeBrushBevelInactiveLight, NULL, 0, NULL },
	152	{"BevelInactiveDark", HIBrush, kThemeBrushBevelInactiveDark, NULL, 0, NULL },
	153	{"NotificationWindowBackground", HIBrush, kThemeBrushNotificationWindowBackground, NULL, 0, NULL },
	154	{"MovableModalBackground", HIBrush, kThemeBrushMovableModalBackground, NULL, 0, NULL },
	155	{"SheetBackgroundOpaque", HIBrush, kThemeBrushSheetBackgroundOpaque, NULL, 0, NULL },
	156	{"DrawerBackground", HIBrush, kThemeBrushDrawerBackground, NULL, 0, NULL },
	157	{"ToolbarBackground", HIBrush, kThemeBrushToolbarBackground, NULL, 0, NULL },
	158	{"SheetBackgroundTransparent", HIBrush, kThemeBrushSheetBackgroundTransparent, NULL, 0, NULL },
	159	{"MenuBackground", HIBrush, kThemeBrushMenuBackground, NULL, 0, NULL },
	160	{"MenuBackgroundSelected", HIBrush, kThemeBrushMenuBackgroundSelected, NULL, 0, NULL },
	161	{"ListViewOddRowBackground", HIBrush, kThemeBrushListViewOddRowBackground, NULL, 0, NULL },
	162	{"ListViewEvenRowBackground", HIBrush, kThemeBrushListViewEvenRowBackground, NULL, 0, NULL },
	163	{"ListViewColumnDivider", HIBrush, kThemeBrushListViewColumnDivider, NULL, 0, NULL },
	164
	165	{"ButtonText", HIText, kThemeTextColorPushButtonActive, NULL, 0, NULL },
	166	{"MenuActiveText", HIText, kThemeTextColorMenuItemSelected, NULL, 0, NULL },
	167	{"MenuDisabled", HIText, kThemeTextColorMenuItemDisabled, NULL, 0, NULL },
	168	{"MenuText", HIText, kThemeTextColorMenuItemActive, NULL, 0, NULL },
	169	{"BlackText", HIText, kThemeTextColorBlack, NULL, 0, NULL },
	170	{"DialogActiveText", HIText, kThemeTextColorDialogActive, NULL, 0, NULL },
	171	{"DialogInactiveText", HIText, kThemeTextColorDialogInactive, NULL, 0, NULL },
	172	{"AlertActiveText", HIText, kThemeTextColorAlertActive, NULL, 0, NULL },
	173	{"AlertInactiveText", HIText, kThemeTextColorAlertInactive, NULL, 0, NULL },
	174	{"ModelessDialogActiveText", HIText, kThemeTextColorModelessDialogActive, NULL, 0, NULL },
	175	{"ModelessDialogInactiveText", HIText, kThemeTextColorModelessDialogInactive, NULL, 0, NULL },
	176	{"WindowHeaderActiveText", HIText, kThemeTextColorWindowHeaderActive, NULL, 0, NULL },
	177	{"WindowHeaderInactiveText", HIText, kThemeTextColorWindowHeaderInactive, NULL, 0, NULL },
	178	{"PlacardActiveText", HIText, kThemeTextColorPlacardActive, NULL, 0, NULL },
	179	{"PlacardInactiveText", HIText, kThemeTextColorPlacardInactive, NULL, 0, NULL },
	180	{"PlacardPressedText", HIText, kThemeTextColorPlacardPressed, NULL, 0, NULL },
	181	{"PushButtonActiveText", HIText, kThemeTextColorPushButtonActive, NULL, 0, NULL },
	182	{"PushButtonInactiveText", HIText, kThemeTextColorPushButtonInactive, NULL, 0, NULL },
	183	{"PushButtonPressedText", HIText, kThemeTextColorPushButtonPressed, NULL, 0, NULL },
	184	{"BevelButtonActiveText", HIText, kThemeTextColorBevelButtonActive, NULL, 0, NULL },
	185	{"BevelButtonInactiveText", HIText, kThemeTextColorBevelButtonInactive, NULL, 0, NULL },
	186	{"BevelButtonPressedText", HIText, kThemeTextColorBevelButtonPressed, NULL, 0, NULL },
	187	{"PopupButtonActiveText", HIText, kThemeTextColorPopupButtonActive, NULL, 0, NULL },
	188	{"PopupButtonInactiveText", HIText, kThemeTextColorPopupButtonInactive, NULL, 0, NULL },
	189	{"PopupButtonPressedText", HIText, kThemeTextColorPopupButtonPressed, NULL, 0, NULL },
	190	{"IconLabelText", HIText, kThemeTextColorIconLabel, NULL, 0, NULL },
	191	{"ListViewText", HIText, kThemeTextColorListView, NULL, 0, NULL },
	192	{"DocumentWindowTitleActiveText", HIText, kThemeTextColorDocumentWindowTitleActive, NULL, 0, NULL },
	193	{"DocumentWindowTitleInactiveText", HIText, kThemeTextColorDocumentWindowTitleInactive, NULL, 0, NULL },
	194	{"MovableModalWindowTitleActiveText", HIText, kThemeTextColorMovableModalWindowTitleActive, NULL, 0, NULL },
	195	{"MovableModalWindowTitleInactiveText", HIText, kThemeTextColorMovableModalWindowTitleInactive, NULL, 0, NULL },
	196	{"UtilityWindowTitleActiveText", HIText, kThemeTextColorUtilityWindowTitleActive, NULL, 0, NULL },
	197	{"UtilityWindowTitleInactiveText", HIText, kThemeTextColorUtilityWindowTitleInactive, NULL, 0, NULL },
	198	{"PopupWindowTitleActiveText", HIText, kThemeTextColorPopupWindowTitleActive, NULL, 0, NULL },
	199	{"PopupWindowTitleInactiveText", HIText, kThemeTextColorPopupWindowTitleInactive, NULL, 0, NULL },
	200	{"RootMenuActiveText", HIText, kThemeTextColorRootMenuActive, NULL, 0, NULL },
	201	{"RootMenuSelectedText", HIText, kThemeTextColorRootMenuSelected, NULL, 0, NULL },
	202	{"RootMenuDisabledText", HIText, kThemeTextColorRootMenuDisabled, NULL, 0, NULL },
	203	{"MenuItemActiveText", HIText, kThemeTextColorMenuItemActive, NULL, 0, NULL },
	204	{"MenuItemSelectedText", HIText, kThemeTextColorMenuItemSelected, NULL, 0, NULL },
	205	{"MenuItemDisabledText", HIText, kThemeTextColorMenuItemDisabled, NULL, 0, NULL },
	206	{"PopupLabelActiveText", HIText, kThemeTextColorPopupLabelActive, NULL, 0, NULL },
	207	{"PopupLabelInactiveText", HIText, kThemeTextColorPopupLabelInactive, NULL, 0, NULL },
	208	{"TabFrontActiveText", HIText, kThemeTextColorTabFrontActive, NULL, 0, NULL },
	209	{"TabNonFrontActiveText", HIText, kThemeTextColorTabNonFrontActive, NULL, 0, NULL },
	210	{"TabNonFrontPressedText", HIText, kThemeTextColorTabNonFrontPressed, NULL, 0, NULL },
	211	{"TabFrontInactiveText", HIText, kThemeTextColorTabFrontInactive, NULL, 0, NULL },
	212	{"TabNonFrontInactiveText", HIText, kThemeTextColorTabNonFrontInactive, NULL, 0, NULL },
	213	{"IconLabelSelectedText", HIText, kThemeTextColorIconLabelSelected, NULL, 0, NULL },
	214	{"BevelButtonStickyActiveText", HIText, kThemeTextColorBevelButtonStickyActive, NULL, 0, NULL },
	215	{"BevelButtonStickyInactiveText", HIText, kThemeTextColorBevelButtonStickyInactive, NULL, 0, NULL },
	216	{"NotificationText", HIText, kThemeTextColorNotification, NULL, 0, NULL },
	217	{"SystemDetailText", HIText, kThemeTextColorSystemDetail, NULL, 0, NULL },
	218	{"PlacardBackground", HIBackground, kThemeBackgroundPlacard, NULL, 0, NULL },
	219	{"WindowHeaderBackground", HIBackground, kThemeBackgroundWindowHeader, NULL, 0, NULL },
	220	{"ListViewWindowHeaderBackground", HIBackground, kThemeBackgroundListViewWindowHeader, NULL, 0, NULL },
	221	{"MetalBackground", HIBackground, kThemeBackgroundMetal, NULL, 0, NULL },
	222
	223	{"SecondaryGroupBoxBackground", HIBackground, kThemeBackgroundSecondaryGroupBox, NULL, 0, NULL },
	224	{"TabPaneBackground", HIBackground, kThemeBackgroundTabPane, NULL, 0, NULL },
	225	{"WhiteText", HIText, kThemeTextColorWhite, NULL, 0, NULL },
	226	{"Black", HIBrush, kThemeBrushBlack, NULL, 0, NULL },
	227	{"White", HIBrush, kThemeBrushWhite, NULL, 0, NULL },
	228
	229	/*
	230	* Dynamic Colors
	231	*/
	232
	233	{"WindowBackgroundColor", ttkBackground, 0, NULL, 0, NULL },
	234	{"WindowBackgroundColor1", ttkBackground, 1, NULL, 0, NULL },
	235	{"WindowBackgroundColor2", ttkBackground, 2, NULL, 0, NULL },
	236	{"WindowBackgroundColor3", ttkBackground, 3, NULL, 0, NULL },
	237	{"WindowBackgroundColor4", ttkBackground, 4, NULL, 0, NULL },
	238	{"WindowBackgroundColor5", ttkBackground, 5, NULL, 0, NULL },
	239	{"WindowBackgroundColor6", ttkBackground, 6, NULL, 0, NULL },
	240	{"WindowBackgroundColor7", ttkBackground, 7, NULL, 0, NULL },
	241	/* Apple's SecondaryLabelColor is the same as their LabelColor so we roll our own. */
	242	{"SecondaryLabelColor", ttkBackground, 14, NULL, 0, NULL },
	243	/* Color to use for notebook tab labels -- depends on OS version. */
	244	{"SelectedTabTextColor", semantic, 0, "textColor", 0, NULL },
	245	/* Semantic colors that we simulate on older systems which don't supoort them. */
	246	{"ControlAccentColor", semantic, 0, "controlAccentColor", 0, NULL },
	247	{"LabelColor", semantic, 0, "blackColor", 0, NULL },
	248	{"LinkColor", semantic, 0, "blueColor", 0, NULL },
	249	{"PlaceholderTextColor", semantic, 0, "grayColor", 0, NULL },
	250	{"SeparatorColor", semantic, 0, "grayColor", 0, NULL },
	251	{"UnemphasizedSelectedTextBackgroundColor", semantic, 0, "grayColor", 0, NULL },
	252	{NULL, 0, 0, NULL, 0, NULL }
	253	};
	254
	255	#endif
	256	/*
	257	* Local Variables:
	258	* mode: objc
	259	* c-basic-offset: 4
	260	* fill-column: 79
	261	* coding: utf-8
	262	* End:
	263	*/

+15

-3

macosx/tkMacOSXConstants.h less more

16	16
17	17	#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070
18	18	#define NSFullScreenWindowMask (1 << 14)
	19	#endif
	20
	21	#if MAC_OS_X_VERSION_MAX_ALLOWED < 1090
	22	typedef NSInteger NSModalResponse;
19	23	#endif
20	24
21	25	/*

97	101	#define NSStringPboardType NSPasteboardTypeString
98	102	#define NSOnState NSControlStateValueOn
99	103	#define NSOffState NSControlStateValueOff
100		// Now we are also changing names of methods!
101		#define graphicsContextWithGraphicsPort graphicsContextWithCGContext
102	104	#endif
103	105
	106	#if MAC_OS_X_VERSION_MIN_REQUIRED >= 110000
	107	#define NSWindowStyleMaskTexturedBackground 0
	108	#endif
	109
	110	#if MAC_OS_X_VERSION_MIN_REQUIRED < 101000
	111	#define GET_NSCONTEXT(context, flip) [NSGraphicsContext \
	112	graphicsContextWithGraphicsPort:context flipped:flip]
	113	#else
	114	#define GET_NSCONTEXT(context, flip) [NSGraphicsContext \
	115	graphicsContextWithCGContext:context flipped:NO]
	116	#endif
104	117
105	118	#endif
106

+138

-135

macosx/tkMacOSXCursor.c less more

53	53	#define MacXCursorData(n) ((id)tkMacOSXXCursors[TK_MAC_XCURSOR_##n])
54	54
55	55	static const struct CursorName cursorNames[] = {
56		{"none", NONE, nil},
57		{"arrow", SELECTOR, @"arrowCursor"},
58		{"top_left_arrow", SELECTOR, @"arrowCursor"},
59		{"left_ptr", SELECTOR, @"arrowCursor"},
60		{"copyarrow", SELECTOR, @"dragCopyCursor", @"_copyDragCursor"},
61		{"aliasarrow", SELECTOR, @"dragLinkCursor", @"_linkDragCursor"},
62		{"contextualmenuarrow", SELECTOR, @"contextualMenuCursor"},
63		{"movearrow", SELECTOR, @"_moveCursor"},
64		{"ibeam", SELECTOR, @"IBeamCursor"},
65		{"text", SELECTOR, @"IBeamCursor"},
66		{"xterm", SELECTOR, @"IBeamCursor"},
67		{"cross", SELECTOR, @"crosshairCursor"},
68		{"crosshair", SELECTOR, @"crosshairCursor"},
69		{"cross-hair", SELECTOR, @"crosshairCursor"},
70		{"tcross", SELECTOR, @"crosshairCursor"},
71		{"hand", SELECTOR, @"openHandCursor"},
72		{"openhand", SELECTOR, @"openHandCursor"},
73		{"closedhand", SELECTOR, @"closedHandCursor"},
74		{"fist", SELECTOR, @"closedHandCursor"},
75		{"pointinghand", SELECTOR, @"pointingHandCursor"},
76		{"resize", SELECTOR, @"arrowCursor"},
77		{"resizeleft", SELECTOR, @"resizeLeftCursor"},
78		{"resizeright", SELECTOR, @"resizeRightCursor"},
79		{"resizeleftright", SELECTOR, @"resizeLeftRightCursor"},
80		{"resizeup", SELECTOR, @"resizeUpCursor"},
81		{"resizedown", SELECTOR, @"resizeDownCursor"},
82		{"resizeupdown", SELECTOR, @"resizeUpDownCursor"},
83		{"resizebottomleft", SELECTOR, @"_bottomLeftResizeCursor"},
84		{"resizetopleft", SELECTOR, @"_topLeftResizeCursor"},
85		{"resizebottomright", SELECTOR, @"_bottomRightResizeCursor"},
86		{"resizetopright", SELECTOR, @"_topRightResizeCursor"},
87		{"notallowed", SELECTOR, @"operationNotAllowedCursor"},
88		{"poof", SELECTOR, @"disappearingItemCursor"},
89		{"wait", SELECTOR, @"busyButClickableCursor"},
90		{"spinning", SELECTOR, @"busyButClickableCursor"},
91		{"countinguphand", SELECTOR, @"busyButClickableCursor"},
92		{"countingdownhand", SELECTOR, @"busyButClickableCursor"},
93		{"countingupanddownhand", SELECTOR, @"busyButClickableCursor"},
	56	{"none", NONE, nil, nil, {0, 0}},
	57	{"arrow", SELECTOR, @"arrowCursor", nil, {0, 0}},
	58	{"top_left_arrow", SELECTOR, @"arrowCursor", nil, {0, 0}},
	59	{"left_ptr", SELECTOR, @"arrowCursor", nil, {0, 0}},
	60	{"copyarrow", SELECTOR, @"dragCopyCursor", @"_copyDragCursor", {0, 0}},
	61	{"aliasarrow", SELECTOR, @"dragLinkCursor", @"_linkDragCursor", {0, 0}},
	62	{"contextualmenuarrow", SELECTOR, @"contextualMenuCursor", nil, {0, 0}},
	63	{"movearrow", SELECTOR, @"_moveCursor", nil, {0, 0}},
	64	{"ibeam", SELECTOR, @"IBeamCursor", nil, {0, 0}},
	65	{"text", SELECTOR, @"IBeamCursor", nil, {0, 0}},
	66	{"xterm", SELECTOR, @"IBeamCursor", nil, {0, 0}},
	67	{"cross", SELECTOR, @"crosshairCursor", nil, {0, 0}},
	68	{"crosshair", SELECTOR, @"crosshairCursor", nil, {0, 0}},
	69	{"cross-hair", SELECTOR, @"crosshairCursor", nil, {0, 0}},
	70	{"tcross", SELECTOR, @"crosshairCursor", nil, {0, 0}},
	71	{"hand", SELECTOR, @"openHandCursor", nil, {0, 0}},
	72	{"openhand", SELECTOR, @"openHandCursor", nil, {0, 0}},
	73	{"closedhand", SELECTOR, @"closedHandCursor", nil, {0, 0}},
	74	{"fist", SELECTOR, @"closedHandCursor", nil, {0, 0}},
	75	{"pointinghand", SELECTOR, @"pointingHandCursor", nil, {0, 0}},
	76	{"resize", SELECTOR, @"arrowCursor", nil, {0, 0}},
	77	{"resizeleft", SELECTOR, @"resizeLeftCursor", nil, {0, 0}},
	78	{"resizeright", SELECTOR, @"resizeRightCursor", nil, {0, 0}},
	79	{"resizeleftright", SELECTOR, @"resizeLeftRightCursor", nil, {0, 0}},
	80	{"resizeup", SELECTOR, @"resizeUpCursor", nil, {0, 0}},
	81	{"resizedown", SELECTOR, @"resizeDownCursor", nil, {0, 0}},
	82	{"resizeupdown", SELECTOR, @"resizeUpDownCursor", nil, {0, 0}},
	83	{"resizebottomleft", SELECTOR, @"_bottomLeftResizeCursor", nil, {0, 0}},
	84	{"resizetopleft", SELECTOR, @"_topLeftResizeCursor", nil, {0, 0}},
	85	{"resizebottomright", SELECTOR, @"_bottomRightResizeCursor", nil, {0, 0}},
	86	{"resizetopright", SELECTOR, @"_topRightResizeCursor", nil, {0, 0}},
	87	{"notallowed", SELECTOR, @"operationNotAllowedCursor", nil, {0, 0}},
	88	{"poof", SELECTOR, @"disappearingItemCursor", nil, {0, 0}},
	89	{"wait", SELECTOR, @"busyButClickableCursor", nil, {0, 0}},
	90	{"spinning", SELECTOR, @"busyButClickableCursor", nil, {0, 0}},
	91	{"countinguphand", SELECTOR, @"busyButClickableCursor", nil, {0, 0}},
	92	{"countingdownhand", SELECTOR, @"busyButClickableCursor", nil, {0, 0}},
	93	{"countingupanddownhand", SELECTOR, @"busyButClickableCursor", nil, {0, 0}},
94	94	{"help", IMAGENAMED, @"NSHelpCursor", nil, {8, 8}},
95		// {"hand", IMAGEBITMAP, MacCursorData(hand)},
96		{"bucket", IMAGEBITMAP, MacCursorData(bucket)},
97		{"cancel", IMAGEBITMAP, MacCursorData(cancel)},
98		// {"resize", IMAGEBITMAP, MacCursorData(resize)},
99		{"eyedrop", IMAGEBITMAP, MacCursorData(eyedrop)},
100		{"eyedrop-full", IMAGEBITMAP, MacCursorData(eyedrop_full)},
101		{"zoom-in", IMAGEBITMAP, MacCursorData(zoom_in)},
102		{"zoom-out", IMAGEBITMAP, MacCursorData(zoom_out)},
103		{"X_cursor", IMAGEBITMAP, MacXCursorData(X_cursor)},
104		// {"arrow", IMAGEBITMAP, MacXCursorData(arrow)},
105		{"based_arrow_down", IMAGEBITMAP, MacXCursorData(based_arrow_down)},
106		{"based_arrow_up", IMAGEBITMAP, MacXCursorData(based_arrow_up)},
107		{"boat", IMAGEBITMAP, MacXCursorData(boat)},
108		{"bogosity", IMAGEBITMAP, MacXCursorData(bogosity)},
109		{"bottom_left_corner", IMAGEBITMAP, MacXCursorData(bottom_left_corner)},
110		{"bottom_right_corner", IMAGEBITMAP, MacXCursorData(bottom_right_corner)},
111		{"bottom_side", IMAGEBITMAP, MacXCursorData(bottom_side)},
112		{"bottom_tee", IMAGEBITMAP, MacXCursorData(bottom_tee)},
113		{"box_spiral", IMAGEBITMAP, MacXCursorData(box_spiral)},
114		{"center_ptr", IMAGEBITMAP, MacXCursorData(center_ptr)},
115		{"circle", IMAGEBITMAP, MacXCursorData(circle)},
116		{"clock", IMAGEBITMAP, MacXCursorData(clock)},
117		{"coffee_mug", IMAGEBITMAP, MacXCursorData(coffee_mug)},
118		// {"cross", IMAGEBITMAP, MacXCursorData(cross)},
119		{"cross_reverse", IMAGEBITMAP, MacXCursorData(cross_reverse)},
120		// {"crosshair", IMAGEBITMAP, MacXCursorData(crosshair)},
121		{"diamond_cross", IMAGEBITMAP, MacXCursorData(diamond_cross)},
122		{"dot", IMAGEBITMAP, MacXCursorData(dot)},
123		{"dotbox", IMAGEBITMAP, MacXCursorData(dotbox)},
124		{"double_arrow", IMAGEBITMAP, MacXCursorData(double_arrow)},
125		{"draft_large", IMAGEBITMAP, MacXCursorData(draft_large)},
126		{"draft_small", IMAGEBITMAP, MacXCursorData(draft_small)},
127		{"draped_box", IMAGEBITMAP, MacXCursorData(draped_box)},
128		{"exchange", IMAGEBITMAP, MacXCursorData(exchange)},
129		{"fleur", IMAGEBITMAP, MacXCursorData(fleur)},
130		{"gobbler", IMAGEBITMAP, MacXCursorData(gobbler)},
131		{"gumby", IMAGEBITMAP, MacXCursorData(gumby)},
132		{"hand1", IMAGEBITMAP, MacXCursorData(hand1)},
133		{"hand2", IMAGEBITMAP, MacXCursorData(hand2)},
134		{"heart", IMAGEBITMAP, MacXCursorData(heart)},
135		{"icon", IMAGEBITMAP, MacXCursorData(icon)},
136		{"iron_cross", IMAGEBITMAP, MacXCursorData(iron_cross)},
137		// {"left_ptr", IMAGEBITMAP, MacXCursorData(left_ptr)},
138		{"left_side", IMAGEBITMAP, MacXCursorData(left_side)},
139		{"left_tee", IMAGEBITMAP, MacXCursorData(left_tee)},
140		{"leftbutton", IMAGEBITMAP, MacXCursorData(leftbutton)},
141		{"ll_angle", IMAGEBITMAP, MacXCursorData(ll_angle)},
142		{"lr_angle", IMAGEBITMAP, MacXCursorData(lr_angle)},
143		{"man", IMAGEBITMAP, MacXCursorData(man)},
144		{"middlebutton", IMAGEBITMAP, MacXCursorData(middlebutton)},
145		{"mouse", IMAGEBITMAP, MacXCursorData(mouse)},
146		{"pencil", IMAGEBITMAP, MacXCursorData(pencil)},
147		{"pirate", IMAGEBITMAP, MacXCursorData(pirate)},
148		{"plus", IMAGEBITMAP, MacXCursorData(plus)},
149		{"question_arrow", IMAGEBITMAP, MacXCursorData(question_arrow)},
150		{"right_ptr", IMAGEBITMAP, MacXCursorData(right_ptr)},
151		{"right_side", IMAGEBITMAP, MacXCursorData(right_side)},
152		{"right_tee", IMAGEBITMAP, MacXCursorData(right_tee)},
153		{"rightbutton", IMAGEBITMAP, MacXCursorData(rightbutton)},
154		{"rtl_logo", IMAGEBITMAP, MacXCursorData(rtl_logo)},
155		{"sailboat", IMAGEBITMAP, MacXCursorData(sailboat)},
156		{"sb_down_arrow", IMAGEBITMAP, MacXCursorData(sb_down_arrow)},
157		{"sb_h_double_arrow", IMAGEBITMAP, MacXCursorData(sb_h_double_arrow)},
158		{"sb_left_arrow", IMAGEBITMAP, MacXCursorData(sb_left_arrow)},
159		{"sb_right_arrow", IMAGEBITMAP, MacXCursorData(sb_right_arrow)},
160		{"sb_up_arrow", IMAGEBITMAP, MacXCursorData(sb_up_arrow)},
161		{"sb_v_double_arrow", IMAGEBITMAP, MacXCursorData(sb_v_double_arrow)},
162		{"shuttle", IMAGEBITMAP, MacXCursorData(shuttle)},
163		{"sizing", IMAGEBITMAP, MacXCursorData(sizing)},
164		{"spider", IMAGEBITMAP, MacXCursorData(spider)},
165		{"spraycan", IMAGEBITMAP, MacXCursorData(spraycan)},
166		{"star", IMAGEBITMAP, MacXCursorData(star)},
167		{"target", IMAGEBITMAP, MacXCursorData(target)},
168		// {"tcross", IMAGEBITMAP, MacXCursorData(tcross)},
169		// {"top_left_arrow", IMAGEBITMAP, MacXCursorData(top_left_arrow)},
170		{"top_left_corner", IMAGEBITMAP, MacXCursorData(top_left_corner)},
171		{"top_right_corner", IMAGEBITMAP, MacXCursorData(top_right_corner)},
172		{"top_side", IMAGEBITMAP, MacXCursorData(top_side)},
173		{"top_tee", IMAGEBITMAP, MacXCursorData(top_tee)},
174		{"trek", IMAGEBITMAP, MacXCursorData(trek)},
175		{"ul_angle", IMAGEBITMAP, MacXCursorData(ul_angle)},
176		{"umbrella", IMAGEBITMAP, MacXCursorData(umbrella)},
177		{"ur_angle", IMAGEBITMAP, MacXCursorData(ur_angle)},
178		{"watch", IMAGEBITMAP, MacXCursorData(watch)},
179		// {"xterm", IMAGEBITMAP, MacXCursorData(xterm)},
180		{NULL}
	95	// {"hand", IMAGEBITMAP, MacCursorData(hand), nil, {0, 0}},
	96	{"bucket", IMAGEBITMAP, MacCursorData(bucket), nil, {0, 0}},
	97	{"cancel", IMAGEBITMAP, MacCursorData(cancel), nil, {0, 0}},
	98	// {"resize", IMAGEBITMAP, MacCursorData(resize), nil, {0, 0}},
	99	{"eyedrop", IMAGEBITMAP, MacCursorData(eyedrop), nil, {0, 0}},
	100	{"eyedrop-full", IMAGEBITMAP, MacCursorData(eyedrop_full), nil, {0, 0}},
	101	{"zoom-in", IMAGEBITMAP, MacCursorData(zoom_in), nil, {0, 0}},
	102	{"zoom-out", IMAGEBITMAP, MacCursorData(zoom_out), nil, {0, 0}},
	103	{"X_cursor", IMAGEBITMAP, MacXCursorData(X_cursor), nil, {0, 0}},
	104	// {"arrow", IMAGEBITMAP, MacXCursorData(arrow), nil, {0, 0}},
	105	{"based_arrow_down", IMAGEBITMAP, MacXCursorData(based_arrow_down), nil, {0, 0}},
	106	{"based_arrow_up", IMAGEBITMAP, MacXCursorData(based_arrow_up), nil, {0, 0}},
	107	{"boat", IMAGEBITMAP, MacXCursorData(boat), nil, {0, 0}},
	108	{"bogosity", IMAGEBITMAP, MacXCursorData(bogosity), nil, {0, 0}},
	109	{"bottom_left_corner", IMAGEBITMAP, MacXCursorData(bottom_left_corner), nil, {0, 0}},
	110	{"bottom_right_corner", IMAGEBITMAP, MacXCursorData(bottom_right_corner), nil, {0, 0}},
	111	{"bottom_side", IMAGEBITMAP, MacXCursorData(bottom_side), nil, {0, 0}},
	112	{"bottom_tee", IMAGEBITMAP, MacXCursorData(bottom_tee), nil, {0, 0}},
	113	{"box_spiral", IMAGEBITMAP, MacXCursorData(box_spiral), nil, {0, 0}},
	114	{"center_ptr", IMAGEBITMAP, MacXCursorData(center_ptr), nil, {0, 0}},
	115	{"circle", IMAGEBITMAP, MacXCursorData(circle), nil, {0, 0}},
	116	{"clock", IMAGEBITMAP, MacXCursorData(clock), nil, {0, 0}},
	117	{"coffee_mug", IMAGEBITMAP, MacXCursorData(coffee_mug), nil, {0, 0}},
	118	// {"cross", IMAGEBITMAP, MacXCursorData(cross), nil, {0, 0}},
	119	{"cross_reverse", IMAGEBITMAP, MacXCursorData(cross_reverse), nil, {0, 0}},
	120	// {"crosshair", IMAGEBITMAP, MacXCursorData(crosshair), nil, {0, 0}},
	121	{"diamond_cross", IMAGEBITMAP, MacXCursorData(diamond_cross), nil, {0, 0}},
	122	{"dot", IMAGEBITMAP, MacXCursorData(dot), nil, {0, 0}},
	123	{"dotbox", IMAGEBITMAP, MacXCursorData(dotbox), nil, {0, 0}},
	124	{"double_arrow", IMAGEBITMAP, MacXCursorData(double_arrow), nil, {0, 0}},
	125	{"draft_large", IMAGEBITMAP, MacXCursorData(draft_large), nil, {0, 0}},
	126	{"draft_small", IMAGEBITMAP, MacXCursorData(draft_small), nil, {0, 0}},
	127	{"draped_box", IMAGEBITMAP, MacXCursorData(draped_box), nil, {0, 0}},
	128	{"exchange", IMAGEBITMAP, MacXCursorData(exchange), nil, {0, 0}},
	129	{"fleur", IMAGEBITMAP, MacXCursorData(fleur), nil, {0, 0}},
	130	{"gobbler", IMAGEBITMAP, MacXCursorData(gobbler), nil, {0, 0}},
	131	{"gumby", IMAGEBITMAP, MacXCursorData(gumby), nil, {0, 0}},
	132	{"hand1", IMAGEBITMAP, MacXCursorData(hand1), nil, {0, 0}},
	133	{"hand2", IMAGEBITMAP, MacXCursorData(hand2), nil, {0, 0}},
	134	{"heart", IMAGEBITMAP, MacXCursorData(heart), nil, {0, 0}},
	135	{"icon", IMAGEBITMAP, MacXCursorData(icon), nil, {0, 0}},
	136	{"iron_cross", IMAGEBITMAP, MacXCursorData(iron_cross), nil, {0, 0}},
	137	// {"left_ptr", IMAGEBITMAP, MacXCursorData(left_ptr), nil, {0, 0}},
	138	{"left_side", IMAGEBITMAP, MacXCursorData(left_side), nil, {0, 0}},
	139	{"left_tee", IMAGEBITMAP, MacXCursorData(left_tee), nil, {0, 0}},
	140	{"leftbutton", IMAGEBITMAP, MacXCursorData(leftbutton), nil, {0, 0}},
	141	{"ll_angle", IMAGEBITMAP, MacXCursorData(ll_angle), nil, {0, 0}},
	142	{"lr_angle", IMAGEBITMAP, MacXCursorData(lr_angle), nil, {0, 0}},
	143	{"man", IMAGEBITMAP, MacXCursorData(man), nil, {0, 0}},
	144	{"middlebutton", IMAGEBITMAP, MacXCursorData(middlebutton), nil, {0, 0}},
	145	{"mouse", IMAGEBITMAP, MacXCursorData(mouse), nil, {0, 0}},
	146	{"pencil", IMAGEBITMAP, MacXCursorData(pencil), nil, {0, 0}},
	147	{"pirate", IMAGEBITMAP, MacXCursorData(pirate), nil, {0, 0}},
	148	{"plus", IMAGEBITMAP, MacXCursorData(plus), nil, {0, 0}},
	149	{"question_arrow", IMAGEBITMAP, MacXCursorData(question_arrow), nil, {0, 0}},
	150	{"right_ptr", IMAGEBITMAP, MacXCursorData(right_ptr), nil, {0, 0}},
	151	{"right_side", IMAGEBITMAP, MacXCursorData(right_side), nil, {0, 0}},
	152	{"right_tee", IMAGEBITMAP, MacXCursorData(right_tee), nil, {0, 0}},
	153	{"rightbutton", IMAGEBITMAP, MacXCursorData(rightbutton), nil, {0, 0}},
	154	{"rtl_logo", IMAGEBITMAP, MacXCursorData(rtl_logo), nil, {0, 0}},
	155	{"sailboat", IMAGEBITMAP, MacXCursorData(sailboat), nil, {0, 0}},
	156	{"sb_down_arrow", IMAGEBITMAP, MacXCursorData(sb_down_arrow), nil, {0, 0}},
	157	{"sb_h_double_arrow", IMAGEBITMAP, MacXCursorData(sb_h_double_arrow), nil, {0, 0}},
	158	{"sb_left_arrow", IMAGEBITMAP, MacXCursorData(sb_left_arrow), nil, {0, 0}},
	159	{"sb_right_arrow", IMAGEBITMAP, MacXCursorData(sb_right_arrow), nil, {0, 0}},
	160	{"sb_up_arrow", IMAGEBITMAP, MacXCursorData(sb_up_arrow), nil, {0, 0}},
	161	{"sb_v_double_arrow", IMAGEBITMAP, MacXCursorData(sb_v_double_arrow), nil, {0, 0}},
	162	{"shuttle", IMAGEBITMAP, MacXCursorData(shuttle), nil, {0, 0}},
	163	{"sizing", IMAGEBITMAP, MacXCursorData(sizing), nil, {0, 0}},
	164	{"spider", IMAGEBITMAP, MacXCursorData(spider), nil, {0, 0}},
	165	{"spraycan", IMAGEBITMAP, MacXCursorData(spraycan), nil, {0, 0}},
	166	{"star", IMAGEBITMAP, MacXCursorData(star), nil, {0, 0}},
	167	{"target", IMAGEBITMAP, MacXCursorData(target), nil, {0, 0}},
	168	// {"tcross", IMAGEBITMAP, MacXCursorData(tcross), nil, {0, 0}},
	169	// {"top_left_arrow", IMAGEBITMAP, MacXCursorData(top_left_arrow), nil, {0, 0}},
	170	{"top_left_corner", IMAGEBITMAP, MacXCursorData(top_left_corner), nil, {0, 0}},
	171	{"top_right_corner", IMAGEBITMAP, MacXCursorData(top_right_corner), nil, {0, 0}},
	172	{"top_side", IMAGEBITMAP, MacXCursorData(top_side), nil, {0, 0}},
	173	{"top_tee", IMAGEBITMAP, MacXCursorData(top_tee), nil, {0, 0}},
	174	{"trek", IMAGEBITMAP, MacXCursorData(trek), nil, {0, 0}},
	175	{"ul_angle", IMAGEBITMAP, MacXCursorData(ul_angle), nil, {0, 0}},
	176	{"umbrella", IMAGEBITMAP, MacXCursorData(umbrella), nil, {0, 0}},
	177	{"ur_angle", IMAGEBITMAP, MacXCursorData(ur_angle), nil, {0, 0}},
	178	{"watch", IMAGEBITMAP, MacXCursorData(watch), nil, {0, 0}},
	179	// {"xterm", IMAGEBITMAP, MacXCursorData(xterm), nil, {0, 0}},
	180	{NULL, 0, nil, nil, {0, 0}}
181	181	};
182	182
183	183	/*

270	270	break;
271	271	case IMAGEBITMAP: {
272	272	unsigned char bitmap = (unsigned char )(cursorNames[idx].id1);
273		NSBitmapImageRep *bitmapImageRep = NULL;
	273	NSBitmapImageRep *bitmapImageRep = nil;
274	274	CGImageRef img = NULL, mask = NULL, maskedImg = NULL;
275	275	static const CGFloat decodeWB[] = {1, 0};
276	276	CGColorSpaceRef colorspace = CGColorSpaceCreateWithName(

311	311	if (bitmapImageRep) {
312	312	image = [[NSImage alloc] initWithSize:NSMakeSize(pix, pix)];
313	313	[image addRepresentation:bitmapImageRep];
	314	[image setTemplate:YES];
314	315	[bitmapImageRep release];
315	316	}
316	317

373	374	TkCursor *
374	375	TkGetCursorByName(
375	376	Tcl_Interp interp, / Interpreter to use for error reporting. */
376		Tk_Window tkwin, /* Window in which cursor will be used. */
	377	TCL_UNUSED(Tk_Window), /* Window in which cursor will be used. */
377	378	Tk_Uid string) /* Description of cursor. See manual entry
378	379	* for details on legal syntax. */
379	380	{

388	389
389	390	if (Tcl_SplitList(interp, string, &argc, &argv) == TCL_OK) {
390	391	if (argc) {
391		macCursorPtr = ckalloc(sizeof(TkMacOSXCursor));
	392	macCursorPtr = (TkMacOSXCursor *)ckalloc(sizeof(TkMacOSXCursor));
392	393	macCursorPtr->info.cursor = (Tk_Cursor) macCursorPtr;
393	394	macCursorPtr->macCursor = nil;
394	395	macCursorPtr->type = 0;

427	428
428	429	TkCursor *
429	430	TkCreateCursorFromData(
430		Tk_Window tkwin, /* Window in which cursor will be used. */
431		const char source, / Bitmap data for cursor shape. */
432		const char mask, / Bitmap data for cursor mask. */
433		int width, int height, /* Dimensions of cursor. */
434		int xHot, int yHot, /* Location of hot-spot in cursor. */
435		XColor fgColor, /* Foreground color for cursor. */
436		XColor bgColor) /* Background color for cursor. */
	431	TCL_UNUSED(Tk_Window), /* Window in which cursor will be used. */
	432	TCL_UNUSED(const char ), / Bitmap data for cursor shape. */
	433	TCL_UNUSED(const char ), / Bitmap data for cursor mask. */
	434	TCL_UNUSED(int), /* Dimensions of cursor. */
	435	TCL_UNUSED(int),
	436	TCL_UNUSED(int), /* Location of hot-spot in cursor. */
	437	TCL_UNUSED(int),
	438	TCL_UNUSED(XColor), /* Foreground color for cursor. */
	439	TCL_UNUSED(XColor)) /* Background color for cursor. */
437	440	{
438	441	return NULL;
439	442	}

462	465	TkMacOSXCursor macCursorPtr = (TkMacOSXCursor ) cursorPtr;
463	466
464	467	[macCursorPtr->macCursor release];
465		macCursorPtr->macCursor = NULL;
	468	macCursorPtr->macCursor = nil;
466	469	if (macCursorPtr == gCurrentCursor) {
467	470	gCurrentCursor = NULL;
468	471	}

+1

-1

macosx/tkMacOSXDebug.c less more

63	63	for (i = 0; i < n; i++) {
64	64	if (module && *module) {
65	65	/* Find image with given module name */
66		char *name;
	66	const char *name;
67	67	const char *path = _dyld_get_image_name(i);
68	68
69	69	if (!path) {

+12

-21

macosx/tkMacOSXDefault.h less more

41	41	#define ACTIVE_FG "systemTextColor"
42	42	#define SELECT_BG "systemSelectedTextBackgroundColor"
43	43	#define SELECT_FG "systemSelectedTextColor"
44		#define INACTIVE_SELECT_BG "systemSelectedTextBackgroundColor"
	44	#define INACTIVE_SELECT_BG "systemUnemphasizedSelectedTextBackgroundColor"
45	45	#define TROUGH "#c3c3c3"
46	46	#define INDICATOR "#b03060"
47	47	#define DISABLED "#a3a3a3"
	48	#define IGNORED "#abcdef"
48	49
49	50	/*
50	51	* Defaults for labels, buttons, checkbuttons, and radiobuttons:

87	88	#define DEF_BUTTON_ON_VALUE "1"
88	89	#define DEF_BUTTON_TRISTATE_VALUE ""
89	90	#define DEF_BUTTON_OVER_RELIEF ""
90		//#if TK_MAC_BUTTON_USE_COMPATIBILITY_METRICS
91		//#define DEF_BUTTON_PADX "12"
92		//#define DEF_BUTTON_PADX_NOCM "1"
93		//#else
94	91	#define DEF_BUTTON_PADX "1"
95		//#endif
96	92	#define DEF_LABCHKRAD_PADX "1"
97		//#if TK_MAC_BUTTON_USE_COMPATIBILITY_METRICS
98		//#define DEF_BUTTON_PADY "3"
99		//#define DEF_BUTTON_PADY_NOCM "1"
100		//#else
101	93	#define DEF_BUTTON_PADY "1"
102		//#endif
103	94	#define DEF_LABCHKRAD_PADY "1"
104	95	#define DEF_BUTTON_RELIEF "flat"
105	96	#define DEF_LABCHKRAD_RELIEF "flat"

306	297	* Defaults for menus overall:
307	298	*/
308	299
309		#define DEF_MENU_ACTIVE_BG_COLOR "systemMenuActive"
310		#define DEF_MENU_ACTIVE_BG_MONO BLACK
	300	#define DEF_MENU_ACTIVE_BG_COLOR IGNORED
	301	#define DEF_MENU_ACTIVE_BG_MONO IGNORED
311	302	#define DEF_MENU_ACTIVE_BORDER_WIDTH "0"
312		#define DEF_MENU_ACTIVE_FG_COLOR "systemMenuActiveText"
313		#define DEF_MENU_ACTIVE_FG_MONO WHITE
314		#define DEF_MENU_BG_COLOR "systemMenu"
315		#define DEF_MENU_BG_MONO WHITE
	303	#define DEF_MENU_ACTIVE_FG_COLOR IGNORED
	304	#define DEF_MENU_ACTIVE_FG_MONO IGNORED
	305	#define DEF_MENU_BG_COLOR "#000001" /* Detects custom bg. */
	306	#define DEF_MENU_BG_MONO IGNORED
316	307	#define DEF_MENU_BORDER_WIDTH "0"
317	308	#define DEF_MENU_CURSOR "arrow"
318		#define DEF_MENU_DISABLED_FG_COLOR "systemMenuDisabled"
	309	#define DEF_MENU_DISABLED_FG_COLOR IGNORED
319	310	#define DEF_MENU_DISABLED_FG_MONO ""
320	311	#define DEF_MENU_FONT "menu" /* special: see tkMacOSXMenu.c */
321		#define DEF_MENU_FG "systemMenuText"
	312	#define DEF_MENU_FG "#010000" /* Detects custom fg. */
322	313	#define DEF_MENU_POST_COMMAND ""
323	314	#define DEF_MENU_RELIEF "flat"
324		#define DEF_MENU_SELECT_COLOR "systemMenuActive"
325		#define DEF_MENU_SELECT_MONO BLACK
	315	#define DEF_MENU_SELECT_COLOR IGNORED
	316	#define DEF_MENU_SELECT_MONO IGNORED
326	317	#define DEF_MENU_TAKE_FOCUS "0"
327	318	#define DEF_MENU_TEAROFF "0"
328	319	#define DEF_MENU_TEAROFF_CMD NULL

+99

-119

macosx/tkMacOSXDialog.c less more

22	22	#define modalOK NSModalResponseOK
23	23	#define modalCancel NSModalResponseCancel
24	24	#endif // MAC_OS_X_VERSION_MIN_REQUIRED < 1090
25		#define modalOther -1
	25	#define modalOther -1 // indicates that the -command option was used.
26	26	#define modalError -2
27	27
28	28	/*

51	51	* filter. */
52	52	} filepanelFilterInfo;
53	53
	54	/*
	55	* Only one of these is needed for the application, so they can be static.
	56	*/
	57
54	58	static filepanelFilterInfo filterInfo;
55	59	static NSOpenPanel *openpanel;
56	60	static NSSavePanel *savepanel;

197	201	@implementation TKApplication(TKDialog)
198	202
199	203	- (BOOL)panel:(id)sender shouldEnableURL:(NSURL *)url {
	204	(void)sender;
	205	(void)url;
200	206	return YES;
201	207	}
202	208
203	209	- (void)panel:(id)sender didChangeToDirectoryURL:(NSURL *)url {
	210	(void)sender; (void)url;
204	211	}
205	212
206	213	- (BOOL)panel:(id)sender validateURL:(NSURL )url error:(NSError *)outError {
	214	(void)sender; (void)url;
207	215	*outError = nil;
208	216	return YES;
209	217	}
210	218
211	219	- (void) tkFilePanelDidEnd: (NSSavePanel *) panel
212		returnCode: (NSInteger) returnCode contextInfo: (void *) contextInfo
	220	returnCode: (NSModalResponse) returnCode
	221	contextInfo: (void *) contextInfo
213	222	{
214	223	FilePanelCallbackInfo *callbackInfo = contextInfo;
215	224

231	240	callbackInfo->cmdObj, &objc, &objv);
232	241
233	242	if (result == TCL_OK && objc) {
234		tmpv = ckalloc(sizeof(Tcl_Obj ) (objc + 2));
	243	tmpv = (Tcl_Obj *)ckalloc(sizeof(Tcl_Obj ) * (objc + 2));
235	244	memcpy(tmpv, objv, sizeof(Tcl_Obj ) objc);
236	245	tmpv[objc] = resultObj;
237	246	TkBackgroundEvalObjv(callbackInfo->interp, objc + 1, tmpv,

244	253	} else if (returnCode == modalCancel) {
245	254	Tcl_ResetResult(callbackInfo->interp);
246	255	}
247		if (panel == [NSApp modalWindow]) {
248		[NSApp stopModalWithCode:returnCode];
249		}
250	256	if (callbackInfo->cmdObj) {
251	257	Tcl_DecrRefCount(callbackInfo->cmdObj);
	258	}
	259	if (callbackInfo) {
252	260	ckfree(callbackInfo);
253	261	}
	262	[NSApp stopModalWithCode:returnCode];
254	263	}
255	264
256	265	- (void) tkAlertDidEnd: (NSAlert *) alert returnCode: (NSInteger) returnCode

269	278	callbackInfo->cmdObj, &objc, &objv);
270	279
271	280	if (result == TCL_OK && objc) {
272		tmpv = ckalloc(sizeof(Tcl_Obj ) (objc + 2));
	281	tmpv = (Tcl_Obj *)ckalloc(sizeof(Tcl_Obj ) * (objc + 2));
273	282	memcpy(tmpv, objv, sizeof(Tcl_Obj ) objc);
274	283	tmpv[objc] = resultObj;
275	284	TkBackgroundEvalObjv(callbackInfo->interp, objc + 1, tmpv,

292	301	- (void)selectFormat:(id)sender {
293	302	NSPopUpButton button = (NSPopUpButton )sender;
294	303	filterInfo.fileTypeIndex = [button indexOfSelectedItem];
295
296	304	if ([[filterInfo.fileTypeAllowsAll objectAtIndex:filterInfo.fileTypeIndex] boolValue]) {
297	305	[openpanel setAllowsOtherFileTypes:YES];
298	306

342	350	{
343	351	NSInteger modalReturnCode;
344	352
345		if (parent && ![parent attachedSheet] && [NSApp macMinorVersion] < 15) {
	353	if (parent && ![parent attachedSheet]) {
346	354	[panel beginSheetModalForWindow:parent
347		completionHandler:^(NSInteger returnCode) {
	355	completionHandler:^(NSModalResponse returnCode) {
348	356	[NSApp tkFilePanelDidEnd:panel
349	357	returnCode:returnCode
350	358	contextInfo:callbackInfo ];
351	359	}];
352		modalReturnCode = callbackInfo->cmdObj ? modalOther :
353		[NSApp runModalForWindow:panel];
	360
	361	/*
	362	* The sheet has been prepared, so now we have to run it as a modal
	363	* window. Using [NSApp runModalForWindow:] on macOS 10.15 or later
	364	* generates warnings on stderr. But using [NSOpenPanel runModal] or
	365	* [NSSavePanel runModal] on 10.14 or earler does not cause the
	366	* completion handler to run when the panel is closed.
	367	*/
	368
	369	if ([NSApp macOSVersion] > 101400) {
	370	modalReturnCode = [panel runModal];
	371	} else {
	372	modalReturnCode = [NSApp runModalForWindow:panel];
	373	}
354	374	} else {
355		modalReturnCode = [panel runModal];
356		[NSApp tkFilePanelDidEnd:panel returnCode:modalReturnCode
357		contextInfo:callbackInfo];
358		}
359		return modalReturnCode;
	375
	376	/*
	377	* For the standalone file dialog, completion handlers do not work
	378	* at all on macOS 10.14 and earlier.
	379	*/
	380
	381	if ([NSApp macOSVersion] > 101400) {
	382	[panel beginWithCompletionHandler:^(NSModalResponse returnCode) {
	383	[NSApp tkFilePanelDidEnd:panel
	384	returnCode:returnCode
	385	contextInfo:callbackInfo ];
	386	}];
	387	modalReturnCode = [panel runModal];
	388	} else {
	389	modalReturnCode = [panel runModal];
	390	[NSApp tkFilePanelDidEnd:panel
	391	returnCode:modalReturnCode
	392	contextInfo:callbackInfo ];
	393	[panel close];
	394	}
	395	}
	396	return callbackInfo->cmdObj ? modalOther : modalReturnCode;
360	397	}
361	398
362	399	/*

653	690	NSInteger modalReturnCode = modalError;
654	691	BOOL parentIsKey = NO;
655	692
656		[openpanel setDelegate:NSApp];
657
658	693	for (i = 1; i < objc; i += 2) {
659	694	if (Tcl_GetIndexFromObjStruct(interp, objv[i], openOptionStrings,
660	695	sizeof(char *), "option", TCL_EXACT, &index) != TCL_OK) {

724	759	* panel. Prepend the title to the message in this case.
725	760	*/
726	761
727		if ([NSApp macMinorVersion] > 10) {
	762	if ([NSApp macOSVersion] > 101000) {
728	763	if (message) {
729	764	NSString *fullmessage =
730	765	[[NSString alloc] initWithFormat:@"%@\n%@", title, message];

762	797	[label setBezeled:NO];
763	798	[label setDrawsBackground:NO];
764	799	[popupButton addItemsWithTitles:filterInfo.fileTypeLabels];
	800	[popupButton setTarget:NSApp];
765	801	[popupButton setAction:@selector(selectFormat:)];
766	802	[accessoryView addSubview:label];
767	803	[accessoryView addSubview:popupButton];

803	839	}
804	840	Tcl_IncrRefCount(cmdObj);
805	841	}
806		callbackInfo = ckalloc(sizeof(FilePanelCallbackInfo));
	842	callbackInfo = (FilePanelCallbackInfo *)ckalloc(sizeof(FilePanelCallbackInfo));
807	843	callbackInfo->cmdObj = cmdObj;
808	844	callbackInfo->interp = interp;
809	845	callbackInfo->multiple = multiple;

813	849	[openpanel setDirectoryURL:fileURL];
814	850	}
815	851	if (haveParentOption) {
816		parent = TkMacOSXDrawableWindow(((TkWindow *) tkwin)->window);
	852	parent = TkMacOSXGetNSWindowForDrawable(((TkWindow *)tkwin)->window);
817	853	parentIsKey = parent && [parent isKeyWindow];
818	854	} else {
819	855	parent = nil;

865	901	selectedFilterIndex = filterInfo.fileTypeIndex; // The preselection from the typevariable
866	902	selectedFilter = [filterInfo.fileTypeNames objectAtIndex:selectedFilterIndex];
867	903	} else {
868		NSUInteger i;
869
870		for (i = 0; i < [filterInfo.fileTypeNames count]; i++) {
871		if (filterCompatible(extension, i)) {
872		selectedFilterIndex = i;
	904	NSUInteger j;
	905
	906	for (j = 0; j < [filterInfo.fileTypeNames count]; j++) {
	907	if (filterCompatible(extension, j)) {
	908	selectedFilterIndex = j;
873	909	break;
874	910	}
875	911	}
876		if (i == selectedFilterIndex) {
	912	if (j == selectedFilterIndex) {
877	913	selectedFilter = [filterInfo.fileTypeNames objectAtIndex:selectedFilterIndex];
878	914	} else {
879	915	selectedFilter = @"";

912	948	int objc, /* Number of arguments. */
913	949	Tcl_Obj const objv[]) / Argument objects. */
914	950	{
915		Tk_Window tkwin = clientData;
	951	Tk_Window tkwin = (Tk_Window)clientData;
916	952	char *str;
917	953	int i, result = TCL_ERROR, haveParentOption = 0;
918	954	int confirmOverwrite = 1;

926	962	savepanel = [NSSavePanel savePanel];
927	963	NSInteger modalReturnCode = modalError;
928	964	BOOL parentIsKey = NO;
929
930		[savepanel setDelegate:NSApp];
931	965
932	966	for (i = 1; i < objc; i += 2) {
933	967	if (Tcl_GetIndexFromObjStruct(interp, objv[i], saveOptionStrings,

1049	1083
1050	1084	[popupButton addItemsWithTitles:filterInfo.fileTypeLabels];
1051	1085	[popupButton selectItemAtIndex:filterInfo.fileTypeIndex];
	1086	[popupButton setTarget:NSApp];
1052	1087	[popupButton setAction:@selector(saveFormat:)];
1053
1054	1088	[accessoryView addSubview:label];
1055	1089	[accessoryView addSubview:popupButton];
1056	1090

1081	1115	}
1082	1116	Tcl_IncrRefCount(cmdObj);
1083	1117	}
1084		callbackInfo = ckalloc(sizeof(FilePanelCallbackInfo));
	1118	callbackInfo = (FilePanelCallbackInfo *)ckalloc(sizeof(FilePanelCallbackInfo));
1085	1119	callbackInfo->cmdObj = cmdObj;
1086	1120	callbackInfo->interp = interp;
1087	1121	callbackInfo->multiple = 0;

1101	1135	[savepanel setNameFieldStringValue:@""];
1102	1136	}
1103	1137	if (haveParentOption) {
1104		parent = TkMacOSXDrawableWindow(((TkWindow *) tkwin)->window);
	1138	parent = TkMacOSXGetNSWindowForDrawable(((TkWindow *)tkwin)->window);
1105	1139	parentIsKey = parent && [parent isKeyWindow];
1106	1140	} else {
1107	1141	parent = nil;

1156	1190	int objc, /* Number of arguments. */
1157	1191	Tcl_Obj const objv[]) / Argument objects. */
1158	1192	{
1159		Tk_Window tkwin = clientData;
	1193	Tk_Window tkwin = (Tk_Window)clientData;
1160	1194	char *str;
1161	1195	int i, result = TCL_ERROR, haveParentOption = 0;
1162	1196	int index, len, mustexist = 0;

1170	1204	NSInteger modalReturnCode = modalError;
1171	1205	BOOL parentIsKey = NO;
1172	1206
1173		[panel setDelegate:NSApp];
1174
1175	1207	for (i = 1; i < objc; i += 2) {
1176	1208	if (Tcl_GetIndexFromObjStruct(interp, objv[i], chooseOptionStrings,
1177	1209	sizeof(char *), "option", TCL_EXACT, &index) != TCL_OK) {

1232	1264	}
1233	1265	Tcl_IncrRefCount(cmdObj);
1234	1266	}
1235		callbackInfo = ckalloc(sizeof(FilePanelCallbackInfo));
	1267	callbackInfo = (FilePanelCallbackInfo *)ckalloc(sizeof(FilePanelCallbackInfo));
1236	1268	callbackInfo->cmdObj = cmdObj;
1237	1269	callbackInfo->interp = interp;
1238	1270	callbackInfo->multiple = 0;

1245	1277	if (!directory) {
1246	1278	directory = @"/";
1247	1279	}
1248		parent = TkMacOSXDrawableWindow(((TkWindow *) tkwin)->window);
	1280	parent = TkMacOSXGetNSWindowForDrawable(((TkWindow *)tkwin)->window);
1249	1281	[panel setDirectoryURL:[NSURL fileURLWithPath:directory isDirectory:YES]];
1250	1282	if (haveParentOption) {
1251		parent = TkMacOSXDrawableWindow(((TkWindow *) tkwin)->window);
	1283	parent = TkMacOSXGetNSWindowForDrawable(((TkWindow *)tkwin)->window);
1252	1284	parentIsKey = parent && [parent isKeyWindow];
1253	1285	} else {
1254	1286	parent = nil;

1282	1314	void
1283	1315	TkAboutDlg(void)
1284	1316	{
1285		NSImage *image;
1286		NSString *path = [NSApp tkFrameworkImagePath: @"Tk.tiff"];
1287
1288		if (path) {
1289		image = [[[NSImage alloc] initWithContentsOfFile:path] autorelease];
1290		} else {
1291		image = [NSApp applicationIconImage];
1292		}
1293
1294		NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
1295
1296		[dateFormatter setFormatterBehavior:NSDateFormatterBehavior10_4];
1297		[dateFormatter setDateFormat:@"Y"];
1298
1299		NSString *year = [dateFormatter stringFromDate:[NSDate date]];
1300
1301		[dateFormatter release];
1302
1303		/*
1304		* This replaces the old about dialog with a standard alert that displays
1305		* correctly on 10.14.
1306		*/
1307
1308		NSString *version = @"Tcl " TCL_PATCH_LEVEL " & Tk " TCL_PATCH_LEVEL;
1309		NSString *url = @"www.tcl-lang.org";
1310		NSTextView *credits = [[NSTextView alloc] initWithFrame:NSMakeRect(0,0,300,300)];
1311		NSFont *font = [NSFont systemFontOfSize:[NSFont systemFontSize]];
1312		NSDictionary *textAttributes = [NSDictionary dictionaryWithObject:font
1313		forKey:NSFontAttributeName];
1314
1315		[credits insertText: [[NSAttributedString alloc]
1316		initWithString:[NSString stringWithFormat: @"\n"
1317		"Tcl and Tk are distributed under a modified BSD license: "
1318		"www.tcl.tk/software/tcltk/license.html\n\n"
1319		"%1$C 1987-%2$@ Tcl Core Team and Contributers.\n\n"
1320		"%1$C 2011-%2$@ Kevin Walzer/WordTech Communications LLC.\n\n"
1321		"%1$C 2014-%2$@ Marc Culler.\n\n"
1322		"%1$C 2002-2012 Daniel A. Steffen.\n\n"
1323		"%1$C 2001-2009 Apple Inc.\n\n"
1324		"%1$C 2001-2002 Jim Ingham & Ian Reid\n\n"
1325		"%1$C 1998-2000 Jim Ingham & Ray Johnson\n\n"
1326		"%1$C 1998-2000 Scriptics Inc.\n\n"
1327		"%1$C 1996-1997 Sun Microsystems Inc.", 0xA9, year]
1328		attributes:textAttributes]
1329		replacementRange:NSMakeRange(0,0)];
1330		[credits setDrawsBackground:NO];
1331		[credits setEditable:NO];
1332
1333		NSAlert *about = [[NSAlert alloc] init];
1334
1335		[[about window] setTitle:@"About Tcl & Tk"];
1336		[about setMessageText: version];
1337		[about setInformativeText:url];
1338		about.accessoryView = credits;
1339		[about runModal];
1340		[about release];
1341		}
1342
	1317	[NSApp orderFrontStandardAboutPanel:nil];
	1318	}
	1319
1343	1320	/*
1344	1321	*----------------------------------------------------------------------
1345	1322	*

1358	1335
1359	1336	int
1360	1337	TkMacOSXStandardAboutPanelObjCmd(
1361		ClientData clientData, /* Unused. */
	1338	TCL_UNUSED(void *),
1362	1339	Tcl_Interp interp, / Current interpreter. */
1363	1340	int objc, /* Number of arguments. */
1364	1341	Tcl_Obj const objv[]) / Argument objects. */

1367	1344	Tcl_WrongNumArgs(interp, 1, objv, NULL);
1368	1345	return TCL_ERROR;
1369	1346	}
1370		TkAboutDlg();
	1347	[NSApp orderFrontStandardAboutPanel:nil];
1371	1348	return TCL_OK;
1372	1349	}
1373	1350

1394	1371	int objc, /* Number of arguments. */
1395	1372	Tcl_Obj const objv[]) / Argument objects. */
1396	1373	{
1397		Tk_Window tkwin = clientData;
	1374	Tk_Window tkwin = (Tk_Window)clientData;
1398	1375	char *str;
1399	1376	int i, result = TCL_ERROR, haveParentOption = 0;
1400	1377	int index, typeIndex, iconIndex, indexDefaultOption = 0;

1528	1505	}
1529	1506	Tcl_IncrRefCount(cmdObj);
1530	1507	}
1531		callbackInfo = ckalloc(sizeof(AlertCallbackInfo));
	1508	callbackInfo = (AlertCallbackInfo *)ckalloc(sizeof(AlertCallbackInfo));
1532	1509	callbackInfo->cmdObj = cmdObj;
1533	1510	callbackInfo->interp = interp;
1534	1511	callbackInfo->typeIndex = typeIndex;
1535		parent = TkMacOSXDrawableWindow(((TkWindow *) tkwin)->window);
	1512	parent = TkMacOSXGetNSWindowForDrawable(((TkWindow *)tkwin)->window);
1536	1513	if (haveParentOption && parent && ![parent attachedSheet]) {
1537	1514	parentIsKey = [parent isKeyWindow];
1538	1515	#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1090

1629	1606	- (void) changeFont: (id) sender
1630	1607	{
1631	1608	NSFontManager *fm = [NSFontManager sharedFontManager];
	1609	(void)sender;
1632	1610
1633	1611	if ([fm currentFontAction] == NSViaPanelFontAction) {
1634	1612	NSFont *font = [fm convertFont:fontPanelFont];

1652	1630	}
1653	1631	}
1654	1632
1655		- (NSUInteger) validModesForFontPanel: (NSFontPanel *) fontPanel
1656		{
	1633	- (NSUInteger) validModesForFontPanel: (NSFontPanel *)fontPanel
	1634	{
	1635	(void)fontPanel;
	1636
1657	1637	return (NSFontPanelStandardModesMask & ~NSFontPanelAllEffectsModeMask) \|
1658	1638	NSFontPanelUnderlineEffectModeMask \|
1659	1639	NSFontPanelStrikethroughEffectModeMask;
1660	1640	}
1661	1641
1662		- (void) windowDidOrderOffScreen: (NSNotification *) notification
	1642	- (void) windowDidOrderOffScreen: (NSNotification *)notification
1663	1643	{
1664	1644	#ifdef TK_MAC_DEBUG_NOTIFICATIONS
1665	1645	TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification);

1683	1663	* None.
1684	1664	*
1685	1665	* Side effects:
1686		* Additional events may be place on the Tk event queue.
	1666	* Additional events may be placed on the Tk event queue.
1687	1667	*
1688	1668	*----------------------------------------------------------------------
1689	1669	*/

1717	1697	result = Tcl_ListObjGetElements(fontchooserInterp,
1718	1698	fcdPtr->cmdObj, &objc, &objv);
1719	1699	if (result == TCL_OK) {
1720		tmpv = ckalloc(sizeof(Tcl_Obj ) (objc + 2));
	1700	tmpv = (Tcl_Obj *)ckalloc(sizeof(Tcl_Obj ) * (objc + 2));
1721	1701	memcpy(tmpv, objv, sizeof(Tcl_Obj ) objc);
1722	1702	tmpv[objc] = fontObj;
1723	1703	TkBackgroundEvalObjv(fontchooserInterp, objc + 1, tmpv,

1759	1739	case FontchooserParent:
1760	1740	if (fcdPtr->parent != None) {
1761	1741	resObj = Tcl_NewStringObj(
1762		((TkWindow *) fcdPtr->parent)->pathName, -1);
	1742	((TkWindow *)fcdPtr->parent)->pathName, -1);
1763	1743	} else {
1764	1744	resObj = Tcl_NewStringObj(".", 1);
1765	1745	}

1980	1960	FontchooserShowCmd(
1981	1961	ClientData clientData, /* Main window */
1982	1962	Tcl_Interp *interp,
1983		int objc,
1984		Tcl_Obj *const objv[])
	1963	TCL_UNUSED(int),
	1964	TCL_UNUSED(Tcl_Obj const ))
1985	1965	{
1986	1966	FontchooserData *fcdPtr = Tcl_GetAssocData(interp, "::tk::fontchooser",
1987	1967	NULL);
1988	1968
1989	1969	if (fcdPtr->parent == None) {
1990		fcdPtr->parent = (Tk_Window) clientData;
	1970	fcdPtr->parent = (Tk_Window)clientData;
1991	1971	Tk_CreateEventHandler(fcdPtr->parent, StructureNotifyMask,
1992	1972	FontchooserParentEventHandler, fcdPtr);
1993	1973	}

2026	2006
2027	2007	static int
2028	2008	FontchooserHideCmd(
2029		ClientData clientData, /* Main window */
2030		Tcl_Interp *interp,
2031		int objc,
2032		Tcl_Obj *const objv[])
	2009	TCL_UNUSED(void ), / Main window */
	2010	TCL_UNUSED(Tcl_Interp *),
	2011	TCL_UNUSED(int),
	2012	TCL_UNUSED(Tcl_Obj const ))
2033	2013	{
2034	2014	NSFontPanel *fp = [[NSFontManager sharedFontManager] fontPanel:NO];
2035	2015

2128	2108	MODULE_SCOPE int
2129	2109	TkInitFontchooser(
2130	2110	Tcl_Interp *interp,
2131		ClientData clientData)
2132		{
2133		FontchooserData *fcdPtr = ckalloc(sizeof(FontchooserData));
	2111	TCL_UNUSED(void *))
	2112	{
	2113	FontchooserData fcdPtr = (FontchooserData )ckalloc(sizeof(FontchooserData));
2134	2114
2135	2115	bzero(fcdPtr, sizeof(FontchooserData));
2136	2116	Tcl_SetAssocData(interp, "::tk::fontchooser", DeleteFontchooserData,

+302

-630

macosx/tkMacOSXDraw.c less more

0	0	/*
1	1	* tkMacOSXDraw.c --
2	2	*
3		* This file contains functions that perform drawing to Xlib windows. Most
4		* of the functions simply emulate Xlib functions.
	3	* This file contains functions that draw to windows. Many of thees
	4	* functions emulate Xlib functions.
5	5	*
6	6	* Copyright (c) 1995-1997 Sun Microsystems, Inc.
7		* Copyright 2001-2009, Apple Inc.
	7	* Copyright (c) 2001-2009 Apple Inc.
8	8	* Copyright (c) 2006-2009 Daniel A. Steffen <das@users.sourceforge.net>
9		* Copyright 2014 Marc Culler.
	9	* Copyright (c) 2014-2020 Marc Culler.
10	10	*
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.

16	16	#include "tkMacOSXDebug.h"
17	17	#include "tkButton.h"
18	18
19		#if MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
	19	#if MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
20	20	#define GET_CGCONTEXT [[NSGraphicsContext currentContext] CGContext]
21	21	#else
22	22	#define GET_CGCONTEXT [[NSGraphicsContext currentContext] graphicsPort]

42	42
43	43	static int useThemedToplevel = 0;
44	44	static int useThemedFrame = 0;
	45	static unsigned long transparentColor;
45	46
46	47	/*
47	48	* Prototypes for functions used only in this file.
48	49	*/
49	50
50	51	static void ClipToGC(Drawable d, GC gc, HIShapeRef *clipRgnPtr);
	52	static NSImage *CreateNSImageFromPixmap(Pixmap pixmap, int width, int height);
	53
51	54
52	55	/*
53	56	*----------------------------------------------------------------------

68	71	MODULE_SCOPE int
69	72	TkMacOSXInitCGDrawing(
70	73	Tcl_Interp *interp,
71		int enable,
	74	TCL_UNUSED(int),
72	75	int limit)
73	76	{
74	77	static Boolean initialized = FALSE;

81	84	}
82	85
83	86	if (Tcl_LinkVar(interp, "::tk::mac::CGAntialiasLimit",
84		(char *) &cgAntiAliasLimit, TCL_LINK_INT) != TCL_OK) {
	87	(char *)&cgAntiAliasLimit, TCL_LINK_INT) != TCL_OK) {
85	88	Tcl_ResetResult(interp);
86	89	}
87	90	cgAntiAliasLimit = limit;

91	94	*/
92	95
93	96	if (Tcl_LinkVar(interp, "::tk::mac::useThemedToplevel",
94		(char *) &useThemedToplevel, TCL_LINK_BOOLEAN) != TCL_OK) {
	97	(char *)&useThemedToplevel, TCL_LINK_BOOLEAN) != TCL_OK) {
95	98	Tcl_ResetResult(interp);
96	99	}
97	100	if (Tcl_LinkVar(interp, "::tk::mac::useThemedFrame",
98		(char *) &useThemedFrame, TCL_LINK_BOOLEAN) != TCL_OK) {
	101	(char *)&useThemedFrame, TCL_LINK_BOOLEAN) != TCL_OK) {
99	102	Tcl_ResetResult(interp);
100	103	}
	104	transparentColor = TkMacOSXClearPixel();
101	105	}
102	106	return TCL_OK;
103	107	}

105	109	/*
106	110	*----------------------------------------------------------------------
107	111	*
108		* TkMacOSXBitmapRepFromDrawableRect
109		*
110		* Extract bitmap data from a MacOSX drawable as an NSBitmapImageRep.
111		*
112		* This is only used by XGetImage, which is never called. And this
113		* implementation does not work correctly. Originally it relied on
114		* [NSBitmapImageRep initWithFocusedViewRect:view_rect] which was
115		* deprecated by Apple in OSX 10.14 and also required the use of other
116		* deprecated functions such as [NSView lockFocus]. Apple's suggested
117		* replacement is [NSView cacheDisplayInRect: toBitmapImageRep:] and that
118		* is what is being used here. However, that method only works when the
119		* view has a valid CGContext, and a view is only guaranteed to have a
120		* valid context during a call to [NSView drawRect]. To further complicate
121		* matters, cacheDisplayInRect calls [NSView drawRect]. Essentially it is
122		* asking the view to draw a subrectangle of itself into a special
123		* graphics context which is linked to the BitmapImageRep. But our
124		* implementation of [NSView drawRect] does not allow recursive calls. If
125		* called recursively it returns immediately without doing any drawing.
126		* So the bottom line is that this function either returns a NULL pointer
127		* or a black image. To make it useful would require a significant amount
128		* of rewriting of the drawRect method. Perhaps the next release of OSX
129		* will include some more helpful ways of doing this.
130		*
131		* Results:
132		* Returns an NSBitmapRep representing the image of the given rectangle of
133		* the given drawable. This object is retained. The caller is responsible
134		* for releasing it.
135		*
136		* NOTE: The x,y coordinates should be relative to a coordinate system
137		* with origin at the top left, as used by XImage and CGImage, not bottom
138		* left as used by NSView.
139		*
140		* Side effects:
141		* None
142		*
143		*----------------------------------------------------------------------
144		*/
145
146		NSBitmapImageRep *
147		TkMacOSXBitmapRepFromDrawableRect(
148		Drawable drawable,
149		int x,
150		int y,
151		unsigned int width,
152		unsigned int height)
153		{
154		MacDrawable mac_drawable = (MacDrawable ) drawable;
155		CGContextRef cg_context = NULL;
156		CGImageRef cg_image = NULL, sub_cg_image = NULL;
157		NSBitmapImageRep *bitmap_rep = NULL;
158		NSView *view = NULL;
159		if (mac_drawable->flags & TK_IS_PIXMAP) {
160		/*
161		* This MacDrawable is a bitmap, so its view is NULL.
162		*/
163
164		CGRect image_rect = CGRectMake(x, y, width, height);
165
166		cg_context = TkMacOSXGetCGContextForDrawable(drawable);
167		cg_image = CGBitmapContextCreateImage((CGContextRef) cg_context);
168		sub_cg_image = CGImageCreateWithImageInRect(cg_image, image_rect);
169		if (sub_cg_image) {
170		bitmap_rep = [NSBitmapImageRep alloc];
171		[bitmap_rep initWithCGImage:sub_cg_image];
172		}
173		if (cg_image) {
174		CGImageRelease(cg_image);
175		}
176		} else if ((view = TkMacOSXDrawableView(mac_drawable)) != NULL) {
177		/*
178		* Convert Tk top-left to NSView bottom-left coordinates.
179		*/
180
181		int view_height = [view bounds].size.height;
182		NSRect view_rect = NSMakeRect(x + mac_drawable->xOff,
183		view_height - height - y - mac_drawable->yOff,
184		width, height);
185
186		/*
187		* Attempt to copy from the view to a bitmapImageRep. If the view does
188		* not have a valid CGContext, doing this will silently corrupt memory
189		* and make a big mess. So, in that case, we mark the view as needing
190		* display and return NULL.
191		*/
192
193		if (view == [NSView focusView]) {
194		bitmap_rep = [view bitmapImageRepForCachingDisplayInRect: view_rect];
195		[bitmap_rep retain];
196		[view cacheDisplayInRect:view_rect toBitmapImageRep:bitmap_rep];
197		} else {
198		TkMacOSXDbgMsg("No CGContext - cannot copy from screen to bitmap.");
199		[view setNeedsDisplay:YES];
200		return NULL;
201		}
202		} else {
203		TkMacOSXDbgMsg("Invalid source drawable");
204		}
205		return bitmap_rep;
206		}
207
208		/*
209		*----------------------------------------------------------------------
210		*
211		* XCopyArea --
212		*
213		* Copies data from one drawable to another.
214		*
215		* Results:
216		* None.
217		*
218		* Side effects:
219		* Data is moved from a window or bitmap to a second window or bitmap.
220		*
221		*----------------------------------------------------------------------
222		*/
223
224		int
225		XCopyArea(
226		Display display, / Display. */
227		Drawable src, /* Source drawable. */
228		Drawable dst, /* Destination drawable. */
229		GC gc, /* GC to use. */
230		int src_x, /* X & Y, width & height */
231		int src_y, /* define the source rectangle */
232		unsigned int width, /* that will be copied. */
233		unsigned int height,
234		int dest_x, /* Dest X & Y on dest rect. */
235		int dest_y)
236		{
237		TkMacOSXDrawingContext dc;
238		MacDrawable srcDraw = (MacDrawable ) src;
239		NSBitmapImageRep *bitmap_rep = NULL;
240		CGImageRef img = NULL;
241		CGRect bounds, srcRect, dstRect;
242
243		display->request++;
244		if (!width \|\| !height) {
245		return BadDrawable;
246		}
247
248		if (!TkMacOSXSetupDrawingContext(dst, gc, 1, &dc)) {
249		TkMacOSXDbgMsg("Failed to setup drawing context.");
250		return BadDrawable;
251		}
252
253		if (!dc.context) {
254		TkMacOSXDbgMsg("Invalid destination drawable - no context.");
255		return BadDrawable;
256		}
257
258		if (srcDraw->flags & TK_IS_PIXMAP) {
259		img = TkMacOSXCreateCGImageWithDrawable(src);
260		} else if (TkMacOSXDrawableWindow(src)) {
261		bitmap_rep = TkMacOSXBitmapRepFromDrawableRect(src,
262		src_x, src_y, width, height);
263		if (bitmap_rep) {
264		img = [bitmap_rep CGImage];
265		}
266		} else {
267		TkMacOSXDbgMsg("Invalid source drawable - neither window nor pixmap.");
268		}
269
270		if (img) {
271		bounds = CGRectMake(0, 0, srcDraw->size.width, srcDraw->size.height);
272		srcRect = CGRectMake(src_x, src_y, width, height);
273		dstRect = CGRectMake(dest_x, dest_y, width, height);
274		TkMacOSXDrawCGImage(dst, gc, dc.context, img,
275		gc->foreground, gc->background, bounds, srcRect, dstRect);
276		CFRelease(img);
277		} else {
278		TkMacOSXDbgMsg("Failed to construct CGImage.");
279		}
280
281		TkMacOSXRestoreDrawingContext(&dc);
282		return Success;
283		}
284
285		/*
286		*----------------------------------------------------------------------
287		*
288		* XCopyPlane --
289		*
290		* Copies a bitmap from a source drawable to a destination drawable. The
291		* plane argument specifies which bit plane of the source contains the
292		* bitmap. Note that this implementation ignores the gc->function.
293		*
294		* Results:
295		* None.
296		*
297		* Side effects:
298		* Changes the destination drawable.
299		*
300		*----------------------------------------------------------------------
301		*/
302
303		int
304		XCopyPlane(
305		Display display, / Display. */
306		Drawable src, /* Source drawable. */
307		Drawable dst, /* Destination drawable. */
308		GC gc, /* GC to use. */
309		int src_x, /* X & Y, width & height */
310		int src_y, /* define the source rectangle */
311		unsigned int width, /* that will be copied. */
312		unsigned int height,
313		int dest_x, /* Dest X & Y on dest rect. */
314		int dest_y,
315		unsigned long plane) /* Which plane to copy. */
316		{
317		TkMacOSXDrawingContext dc;
318		MacDrawable srcDraw = (MacDrawable ) src;
319		MacDrawable dstDraw = (MacDrawable ) dst;
320		CGRect bounds, srcRect, dstRect;
321		display->request++;
322		if (!width \|\| !height) {
323		/* TkMacOSXDbgMsg("Drawing of empty area requested"); */
324		return BadDrawable;
325		}
326		if (plane != 1) {
327		Tcl_Panic("Unexpected plane specified for XCopyPlane");
328		}
329		if (srcDraw->flags & TK_IS_PIXMAP) {
330		if (!TkMacOSXSetupDrawingContext(dst, gc, 1, &dc)) {
331		return BadDrawable;
332		}
333
334		CGContextRef context = dc.context;
335
336		if (context) {
337		CGImageRef img = TkMacOSXCreateCGImageWithDrawable(src);
338
339		if (img) {
340		TkpClipMask clipPtr = (TkpClipMask ) gc->clip_mask;
341		unsigned long imageBackground = gc->background;
342
343		if (clipPtr && clipPtr->type == TKP_CLIP_PIXMAP) {
344		srcRect = CGRectMake(src_x, src_y, width, height);
345		CGImageRef mask = TkMacOSXCreateCGImageWithDrawable(
346		clipPtr->value.pixmap);
347		CGImageRef submask = CGImageCreateWithImageInRect(
348		img, srcRect);
349		CGRect rect = CGRectMake(dest_x, dest_y, width, height);
350
351		rect = CGRectOffset(rect, dstDraw->xOff, dstDraw->yOff);
352		CGContextSaveGState(context);
353
354		/*
355		* Move the origin of the destination to top left.
356		*/
357
358		CGContextTranslateCTM(context,
359		0, rect.origin.y + CGRectGetMaxY(rect));
360		CGContextScaleCTM(context, 1, -1);
361
362		/*
363		* Fill with the background color, clipping to the mask.
364		*/
365
366		CGContextClipToMask(context, rect, submask);
367		TkMacOSXSetColorInContext(gc, gc->background, dc.context);
368		CGContextFillRect(context, rect);
369
370		/*
371		* Fill with the foreground color, clipping to the
372		* intersection of img and mask.
373		*/
374
375		CGImageRef subimage = CGImageCreateWithImageInRect(
376		img, srcRect);
377		CGContextClipToMask(context, rect, subimage);
378		TkMacOSXSetColorInContext(gc, gc->foreground, context);
379		CGContextFillRect(context, rect);
380		CGContextRestoreGState(context);
381		CGImageRelease(img);
382		CGImageRelease(mask);
383		CGImageRelease(submask);
384		CGImageRelease(subimage);
385		} else {
386		bounds = CGRectMake(0, 0,
387		srcDraw->size.width, srcDraw->size.height);
388		srcRect = CGRectMake(src_x, src_y, width, height);
389		dstRect = CGRectMake(dest_x, dest_y, width, height);
390		TkMacOSXDrawCGImage(dst, gc, dc.context, img,
391		gc->foreground, imageBackground, bounds,
392		srcRect, dstRect);
393		CGImageRelease(img);
394		}
395		} else {
396		/* no image */
397		TkMacOSXDbgMsg("Invalid source drawable");
398		}
399		} else {
400		TkMacOSXDbgMsg("Invalid destination drawable - "
401		"could not get a bitmap context.");
402		}
403		TkMacOSXRestoreDrawingContext(&dc);
404		return Success;
405		} else {
406		/*
407		* Source drawable is a Window, not a Pixmap.
408		*/
409
410		return XCopyArea(display, src, dst, gc, src_x, src_y, width, height,
411		dest_x, dest_y);
412		}
413		}
414
415		/*
416		*----------------------------------------------------------------------
417		*
418		* TkMacOSXCreateCGImageWithDrawable --
419		*
420		* Create a CGImage from the given Drawable.
421		*
422		* Results:
423		* CGImage, release after use.
424		*
425		* Side effects:
426		* None.
427		*
428		*----------------------------------------------------------------------
429		*/
430
431		CGImageRef
432		TkMacOSXCreateCGImageWithDrawable(
433		Drawable drawable)
434		{
435		CGImageRef img = NULL;
436		CGContextRef context = TkMacOSXGetCGContextForDrawable(drawable);
437
438		if (context) {
439		img = CGBitmapContextCreateImage(context);
440		}
441		return img;
442		}
443
444		/*
445		*----------------------------------------------------------------------
446		*
447		* CreateNSImageWithPixmap --
	112	* TkMacOSXGetNSImageFromTkImage --
	113	*
	114	* Get autoreleased NSImage for Tk_Image.
	115	*
	116	* Results:
	117	* NSImage.
	118	*
	119	* Side effects:
	120	* None.
	121	*
	122	*----------------------------------------------------------------------
	123	*/
	124
	125	NSImage *
	126	TkMacOSXGetNSImageFromTkImage(
	127	Display *display,
	128	Tk_Image image,
	129	int width,
	130	int height)
	131	{
	132	Pixmap pixmap;
	133	NSImage *nsImage;
	134	if (width == 0 \|\| height == 0) {
	135	return nsImage = [[NSImage alloc] initWithSize:NSMakeSize(0,0)];
	136	}
	137	pixmap = Tk_GetPixmap(display, None, width, height, 0);
	138	Tk_RedrawImage(image, 0, 0, width, height, pixmap, 0, 0);
	139	nsImage = CreateNSImageFromPixmap(pixmap, width, height);
	140	Tk_FreePixmap(display, pixmap);
	141
	142	return [nsImage autorelease];
	143	}
	144
	145	/*
	146	*----------------------------------------------------------------------
	147	*
	148	* TkMacOSXGetNSImageFromBitmap --
	149	*
	150	* Get autoreleased NSImage for Bitmap.
	151	*
	152	* Results:
	153	* NSImage.
	154	*
	155	* Side effects:
	156	* None.
	157	*
	158	*----------------------------------------------------------------------
	159	*/
	160
	161	NSImage *
	162	TkMacOSXGetNSImageFromBitmap(
	163	Display *display,
	164	Pixmap bitmap,
	165	GC gc,
	166	int width,
	167	int height)
	168	{
	169	Pixmap pixmap = Tk_GetPixmap(display, None, width, height, 0);
	170	NSImage *nsImage;
	171
	172	unsigned long origBackground = gc->background;
	173
	174	gc->background = transparentColor;
	175	XSetClipOrigin(display, gc, 0, 0);
	176	XCopyPlane(display, bitmap, pixmap, gc, 0, 0, width, height, 0, 0, 1);
	177	gc->background = origBackground;
	178	nsImage = CreateNSImageFromPixmap(pixmap, width, height);
	179	Tk_FreePixmap(display, pixmap);
	180
	181	return [nsImage autorelease];
	182	}
	183
	184	/*
	185	*----------------------------------------------------------------------
	186	*
	187	* CreateNSImageFromPixmap --
448	188	*
449	189	* Create NSImage for Pixmap.
450	190	*

458	198	*/
459	199
460	200	static NSImage *
461		CreateNSImageWithPixmap(
	201	CreateNSImageFromPixmap(
462	202	Pixmap pixmap,
463	203	int width,
464	204	int height)

466	206	CGImageRef cgImage;
467	207	NSImage *nsImage;
468	208	NSBitmapImageRep *bitmapImageRep;
469
470		cgImage = TkMacOSXCreateCGImageWithDrawable(pixmap);
	209	CGContextRef context = TkMacOSXGetCGContextForDrawable(pixmap);
	210
	211	if (context) {
	212	cgImage = CGBitmapContextCreateImage(context);
	213	} else {
	214	return NULL;
	215	}
471	216	nsImage = [[NSImage alloc] initWithSize:NSMakeSize(width, height)];
472	217	bitmapImageRep = [[NSBitmapImageRep alloc] initWithCGImage:cgImage];
473	218	[nsImage addRepresentation:bitmapImageRep];

480	225	/*
481	226	*----------------------------------------------------------------------
482	227	*
483		* TkMacOSXGetNSImageWithTkImage --
484		*
485		* Get autoreleased NSImage for Tk_Image.
486		*
487		* Results:
488		* NSImage.
489		*
490		* Side effects:
491		* None.
492		*
493		*----------------------------------------------------------------------
494		*/
495
496		NSImage *
497		TkMacOSXGetNSImageWithTkImage(
498		Display *display,
499		Tk_Image image,
500		int width,
501		int height)
502		{
503		Pixmap pixmap;
504		NSImage *nsImage;
505		if (width == 0 \|\| height == 0) {
506		return nsImage = [[NSImage alloc] initWithSize:NSMakeSize(0,0)];
507		}
508		pixmap = Tk_GetPixmap(display, None, width, height, 0);
509		Tk_RedrawImage(image, 0, 0, width, height, pixmap, 0, 0);
510		nsImage = CreateNSImageWithPixmap(pixmap, width, height);
511		Tk_FreePixmap(display, pixmap);
512
513		return [nsImage autorelease];
514		}
515
516		/*
517		*----------------------------------------------------------------------
518		*
519		* TkMacOSXGetNSImageWithBitmap --
520		*
521		* Get autoreleased NSImage for Bitmap.
522		*
523		* Results:
524		* NSImage.
525		*
526		* Side effects:
527		* None.
528		*
529		*----------------------------------------------------------------------
530		*/
531
532		NSImage *
533		TkMacOSXGetNSImageWithBitmap(
534		Display *display,
535		Pixmap bitmap,
536		GC gc,
537		int width,
538		int height)
539		{
540		Pixmap pixmap = Tk_GetPixmap(display, None, width, height, 0);
541		NSImage *nsImage;
542
543		unsigned long origBackground = gc->background;
544
545		gc->background = TRANSPARENT_PIXEL << 24;
546		XSetClipOrigin(display, gc, 0, 0);
547		XCopyPlane(display, bitmap, pixmap, gc, 0, 0, width, height, 0, 0, 1);
548		gc->background = origBackground;
549		nsImage = CreateNSImageWithPixmap(pixmap, width, height);
550		Tk_FreePixmap(display, pixmap);
551
552		return [nsImage autorelease];
553		}
554
555		/*
556		*----------------------------------------------------------------------
557		*
558	228	* TkMacOSXGetCGContextForDrawable --
559	229	*
560	230	* Get CGContext for given Drawable, creating one if necessary.

572	242	TkMacOSXGetCGContextForDrawable(
573	243	Drawable drawable)
574	244	{
575		MacDrawable macDraw = (MacDrawable ) drawable;
	245	MacDrawable macDraw = (MacDrawable )drawable;
576	246
577	247	if (macDraw && (macDraw->flags & TK_IS_PIXMAP) && !macDraw->context) {
578	248	const size_t bitsPerComponent = 8;

590	260
591	261	if (macDraw->flags & TK_IS_BW_PIXMAP) {
592	262	bitsPerPixel = 8;
593		bitmapInfo = (CGBitmapInfo) kCGImageAlphaOnly;
	263	bitmapInfo = (CGBitmapInfo)kCGImageAlphaOnly;
594	264	} else {
595	265	colorspace = CGColorSpaceCreateDeviceRGB();
596	266	bitsPerPixel = 32;

599	269	bytesPerRow = ((size_t)
600	270	macDraw->size.width * bitsPerPixel + 127) >> 3 & ~15;
601	271	len = macDraw->size.height * bytesPerRow;
602		data = ckalloc(len);
	272	data = (char *)ckalloc(len);
603	273	bzero(data, len);
604	274	macDraw->context = CGBitmapContextCreate(data, macDraw->size.width,
605	275	macDraw->size.height, bitsPerComponent, bytesPerRow,

643	313	CGRect srcBounds,
644	314	CGRect dstBounds)
645	315	{
646		MacDrawable macDraw = (MacDrawable ) d;
	316	MacDrawable macDraw = (MacDrawable )d;
647	317
648	318	if (macDraw && context && image) {
649	319	CGImageRef subImage = NULL;

661	331	dstBounds = CGRectOffset(dstBounds, macDraw->xOff, macDraw->yOff);
662	332	if (CGImageIsMask(image)) {
663	333	if (macDraw->flags & TK_IS_BW_PIXMAP) {
	334
664	335	/*
665	336	* Set fill color to black; background comes from the context,
666	337	* or is transparent.
667	338	*/
668	339
669		if (imageBackground != TRANSPARENT_PIXEL << 24) {
	340	if (imageBackground != transparentColor) {
670	341	CGContextClearRect(context, dstBounds);
671	342	}
672	343	CGContextSetRGBFillColor(context, 0.0, 0.0, 0.0, 1.0);
673	344	} else {
674		if (imageBackground != TRANSPARENT_PIXEL << 24) {
	345	if (imageBackground != transparentColor) {
675	346	TkMacOSXSetColorInContext(gc, imageBackground, context);
676	347	CGContextFillRect(context, dstBounds);
677	348	}

738	409	int npoints, /* Number of points. */
739	410	int mode) /* Line drawing mode. */
740	411	{
741		MacDrawable macWin = (MacDrawable ) d;
	412	MacDrawable macWin = (MacDrawable )d;
742	413	TkMacOSXDrawingContext dc;
743	414	int i, lw = gc->line_width;
744	415

747	418	}
748	419
749	420	display->request++;
750		if (!TkMacOSXSetupDrawingContext(d, gc, 1, &dc)) {
	421	if (!TkMacOSXSetupDrawingContext(d, gc, &dc)) {
751	422	return BadDrawable;
752	423	}
753	424	if (dc.context) {

810	481	XSegment *segments,
811	482	int nsegments)
812	483	{
813		MacDrawable macWin = (MacDrawable ) d;
	484	MacDrawable macWin = (MacDrawable )d;
814	485	TkMacOSXDrawingContext dc;
815	486	int i, lw = gc->line_width;
816	487
817	488	display->request++;
818		if (!TkMacOSXSetupDrawingContext(d, gc, 1, &dc)) {
	489	if (!TkMacOSXSetupDrawingContext(d, gc, &dc)) {
819	490	return BadDrawable;
820	491	}
821	492	if (dc.context) {

859	530	GC gc, /* Use this GC. */
860	531	XPoint points, / Array of points. */
861	532	int npoints, /* Number of points. */
862		int shape, /* Shape to draw. */
	533	TCL_UNUSED(int), /* Shape to draw. */
863	534	int mode) /* Drawing mode. */
864	535	{
865		MacDrawable macWin = (MacDrawable ) d;
	536	MacDrawable macWin = (MacDrawable )d;
866	537	TkMacOSXDrawingContext dc;
867	538	int i;
868	539
869	540	display->request++;
870		if (!TkMacOSXSetupDrawingContext(d, gc, 1, &dc)) {
	541	if (!TkMacOSXSetupDrawingContext(d, gc, &dc)) {
871	542	return BadDrawable;
872	543	}
873	544	if (dc.context) {

920	591	unsigned int width, /* Width & height of rect. */
921	592	unsigned int height)
922	593	{
923		MacDrawable macWin = (MacDrawable ) d;
	594	MacDrawable macWin = (MacDrawable )d;
924	595	TkMacOSXDrawingContext dc;
925	596	int lw = gc->line_width;
926	597

929	600	}
930	601
931	602	display->request++;
932		if (!TkMacOSXSetupDrawingContext(d, gc, 1, &dc)) {
	603	if (!TkMacOSXSetupDrawingContext(d, gc, &dc)) {
933	604	return BadDrawable;
934	605	}
935	606	if (dc.context) {

970	641	*----------------------------------------------------------------------
971	642	*/
972	643
973		void
	644	int
974	645	XDrawRectangles(
975	646	Display *display,
976		Drawable drawable,
	647	Drawable d,
977	648	GC gc,
978	649	XRectangle *rectArr,
979	650	int nRects)
980	651	{
981		MacDrawable macWin = (MacDrawable ) drawable;
	652	MacDrawable macWin = (MacDrawable )d;
982	653	TkMacOSXDrawingContext dc;
983	654	XRectangle * rectPtr;
984	655	int i, lw = gc->line_width;
985	656
986	657	display->request++;
987		if (!TkMacOSXSetupDrawingContext(d, gc, 1, &dc)) {
988		return;
	658	if (!TkMacOSXSetupDrawingContext(d, gc, &dc)) {
	659	return BadDrawable;
989	660	}
990	661	if (dc.context) {
991	662	CGRect rect;

1003	674	}
1004	675	}
1005	676	TkMacOSXRestoreDrawingContext(&dc);
	677	return Success;
1006	678	}
1007	679	#endif
1008	680

1030	702	XRectangle rectangles, / Rectangle array. */
1031	703	int n_rectangles) /* Number of rectangles. */
1032	704	{
1033		MacDrawable macWin = (MacDrawable ) d;
	705	MacDrawable macWin = (MacDrawable )d;
1034	706	TkMacOSXDrawingContext dc;
1035	707	XRectangle * rectPtr;
1036	708	int i;
1037	709
1038	710	display->request++;
1039		if (!TkMacOSXSetupDrawingContext(d, gc, 1, &dc)) {
	711	if (!TkMacOSXSetupDrawingContext(d, gc, &dc)) {
1040	712	return BadDrawable;
1041	713	}
1042	714	if (dc.context) {

1089	761	TkMacOSXDrawingContext dc;
1090	762	CGRect outerRect, innerRect;
1091	763
1092		if (!TkMacOSXSetupDrawingContext(d, gc, 1, &dc)) {
	764	if (!TkMacOSXSetupDrawingContext(d, gc, &dc)) {
1093	765	return;
1094	766	}
1095	767	if (dc.context) {

1132	804	int angle1, /* Staring angle of arc. */
1133	805	int angle2) /* Extent of arc. */
1134	806	{
1135		MacDrawable macWin = (MacDrawable ) d;
	807	MacDrawable macWin = (MacDrawable )d;
1136	808	TkMacOSXDrawingContext dc;
1137	809	int lw = gc->line_width;
1138	810

1141	813	}
1142	814
1143	815	display->request++;
1144		if (!TkMacOSXSetupDrawingContext(d, gc, 1, &dc)) {
	816	if (!TkMacOSXSetupDrawingContext(d, gc, &dc)) {
1145	817	return BadDrawable;
1146	818	}
1147	819	if (dc.context) {

1206	878	XArc *arcArr,
1207	879	int nArcs)
1208	880	{
1209		MacDrawable macWin = (MacDrawable ) d;
	881	MacDrawable macWin = (MacDrawable )d;
1210	882	TkMacOSXDrawingContext dc;
1211	883	XArc *arcPtr;
1212	884	int i, lw = gc->line_width;
1213	885
1214	886	display->request++;
1215		if (!TkMacOSXSetupDrawingContext(d, gc, 1, &dc)) {
	887	if (!TkMacOSXSetupDrawingContext(d, gc, &dc)) {
1216	888	return BadDrawable;
1217	889	}
1218	890	if (dc.context) {

1285	957	int angle1, /* Staring angle of arc. */
1286	958	int angle2) /* Extent of arc. */
1287	959	{
1288		MacDrawable macWin = (MacDrawable ) d;
	960	MacDrawable macWin = (MacDrawable )d;
1289	961	TkMacOSXDrawingContext dc;
1290	962	int lw = gc->line_width;
1291	963

1294	966	}
1295	967
1296	968	display->request++;
1297		if (!TkMacOSXSetupDrawingContext(d, gc, 1, &dc)) {
	969	if (!TkMacOSXSetupDrawingContext(d, gc, &dc)) {
1298	970	return BadDrawable;
1299	971	}
1300	972	if (dc.context) {

1354	1026	*----------------------------------------------------------------------
1355	1027	*/
1356	1028
1357		void
	1029	int
1358	1030	XFillArcs(
1359	1031	Display *display,
1360	1032	Drawable d,

1362	1034	XArc *arcArr,
1363	1035	int nArcs)
1364	1036	{
1365		MacDrawable macWin = (MacDrawable ) d;
	1037	MacDrawable macWin = (MacDrawable )d;
1366	1038	TkMacOSXDrawingContext dc;
1367	1039	XArc * arcPtr;
1368	1040	int i, lw = gc->line_width;
1369	1041
1370	1042	display->request++;
1371		if (!TkMacOSXSetupDrawingContext(d, gc, 1, &dc)) {
1372		return;
	1043	if (!TkMacOSXSetupDrawingContext(d, gc, &dc)) {
	1044	return BadDrawable;
1373	1045	}
1374	1046	if (dc.context) {
1375	1047	CGRect rect;

1417	1089	}
1418	1090	}
1419	1091	TkMacOSXRestoreDrawingContext(&dc);
	1092	return Success;
1420	1093	}
1421	1094	#endif
1422	1095

1458	1131	int
1459	1132	TkScrollWindow(
1460	1133	Tk_Window tkwin, /* The window to be scrolled. */
1461		GC gc, /* GC for window to be scrolled. */
	1134	TCL_UNUSED(GC), /* GC for window to be scrolled. */
1462	1135	int x, int y, /* Position rectangle to be scrolled. */
1463	1136	int width, int height,
1464	1137	int dx, int dy, /* Distance rectangle should be moved. */
1465	1138	TkRegion damageRgn) /* Region to accumulate damage in. */
1466	1139	{
1467	1140	Drawable drawable = Tk_WindowId(tkwin);
1468		MacDrawable macDraw = (MacDrawable ) drawable;
1469		TKContentView view = (TKContentView ) TkMacOSXDrawableView(macDraw);
	1141	MacDrawable macDraw = (MacDrawable )drawable;
	1142	TKContentView view = (TKContentView )TkMacOSXGetNSViewForDrawable(macDraw);
1470	1143	CGRect srcRect, dstRect;
1471	1144	HIShapeRef dmgRgn = NULL, extraRgn = NULL;
1472	1145	NSRect bounds, visRect, scrollSrc, scrollDst;

1554	1227
1555	1228	void
1556	1229	TkMacOSXSetUpGraphicsPort(
1557		GC gc, /* GC to apply to current port. */
1558		void *destPort)
	1230	TCL_UNUSED(GC), /* GC to apply to current port. */
	1231	TCL_UNUSED(void *))
1559	1232	{
1560	1233	Tcl_Panic("TkMacOSXSetUpGraphicsPort: Obsolete, no more QD!");
1561	1234	}

1566	1239	*
1567	1240	* TkMacOSXSetUpDrawingContext --
1568	1241	*
1569		* Set up a drawing context for the given drawable and GC.
1570		*
1571		* Results:
1572		* Boolean indicating whether it is ok to draw; if false, drawing context
1573		* was not setup, so do not attempt to draw and do not call
	1242	* Set up a drawing context for the given drawable from an X GC.
	1243	*
	1244	* Results:
	1245	* Boolean indicating whether it is ok to draw; if false, the drawing
	1246	* context was not setup, so do not attempt to draw and do not call
1574	1247	* TkMacOSXRestoreDrawingContext().
1575	1248	*
1576	1249	* Side effects:
1577		* None.
	1250	* May modify or create the drawable's graphics context. May expand the
	1251	* drawable's dirty rectangle. When the result is true The dcPtr
	1252	* parameter is set to reference the new or updated drawing context.
1578	1253	*
1579	1254	*----------------------------------------------------------------------
1580	1255	*/

1583	1258	TkMacOSXSetupDrawingContext(
1584	1259	Drawable d,
1585	1260	GC gc,
1586		int useCG, /* advisory only ! */
1587	1261	TkMacOSXDrawingContext *dcPtr)
1588	1262	{
1589		MacDrawable macDraw = (MacDrawable ) d;
	1263	MacDrawable macDraw = (MacDrawable )d;
1590	1264	Bool canDraw = true;
1591		NSWindow *win = NULL;
	1265	TKContentView *view = nil;
1592	1266	TkMacOSXDrawingContext dc = {};
1593		CGRect clipBounds;
1594	1267
1595	1268	/*
1596		* If the drawable is not a pixmap and it has an associated NSWindow then
1597		* we know we are drawing to a window.
	1269	* If the drawable is not a pixmap, get the associated NSView.
1598	1270	*/
1599	1271
1600	1272	if (!(macDraw->flags & TK_IS_PIXMAP)) {
1601		win = TkMacOSXDrawableWindow(d);
	1273	view = (TKContentView *)TkMacOSXGetNSViewForDrawable(d);
	1274	if (!view) {
	1275	Tcl_Panic("TkMacOSXSetupDrawingContext(): "
	1276	"no NSView to draw into !");
	1277	}
1602	1278	}
1603	1279
1604	1280	/*
1605		* Check that we have a non-empty clipping region.
	1281	* Intersect the drawable's clipping region with the region stored in the
	1282	* X GC. If the resulting region is empty, don't do any drawing.
1606	1283	*/
1607	1284
1608	1285	dc.clipRgn = TkMacOSXGetClipRgn(d);

1613	1290	}
1614	1291
1615	1292	/*
1616		* If we already have a CGContext, use it. Otherwise, if we are drawing to
1617		* a window then we can get one from the window.
	1293	* If the drawable already has a CGContext, use it. Otherwise, we must be
	1294	* drawing to a window and we use the current context of its ContentView.
1618	1295	*/
1619	1296
1620	1297	dc.context = TkMacOSXGetCGContextForDrawable(d);
1621	1298	if (dc.context) {
1622		dc.portBounds = clipBounds = CGContextGetClipBoundingBox(dc.context);
1623		} else if (win) {
1624		NSView *view = TkMacOSXDrawableView(macDraw);
1625
1626		if (!view) {
1627		Tcl_Panic("TkMacOSXSetupDrawingContext(): "
1628		"no NSView to draw into !");
1629		}
1630
1631		/*
1632		* We can only draw into the view when the current CGContext is valid
1633		* and belongs to the view. Validity can only be guaranteed inside of
1634		* a view's drawRect or setFrame methods. The isDrawing attribute
1635		* tells us whether we are being called from one of those methods.
1636		*
1637		* If the CGContext is not valid then we mark our view as needing
1638		* display in the bounding rectangle of the clipping region and
1639		* return failure. That rectangle should get drawn in a later call
1640		* to drawRect.
1641		*
1642		* As an exception to the above, if mouse buttons are pressed at the
1643		* moment when we fail to obtain a valid context we schedule the entire
1644		* view for a redraw rather than just the clipping region. The purpose
1645		* of this is to make sure that scrollbars get updated correctly.
1646		*/
1647
1648		if (![NSApp isDrawing] \|\| view != [NSView focusView]) {
1649		NSRect bounds = [view bounds];
1650		NSRect dirtyNS = bounds;
1651		if ([NSEvent pressedMouseButtons]) {
1652		[view setNeedsDisplay:YES];
1653		} else {
1654		CGAffineTransform t = { .a = 1, .b = 0, .c = 0, .d = -1, .tx = 0,
1655		.ty = dirtyNS.size.height};
1656		if (dc.clipRgn) {
1657		CGRect dirtyCG = NSRectToCGRect(dirtyNS);
1658		HIShapeGetBounds(dc.clipRgn, &dirtyCG);
1659		dirtyNS = NSRectToCGRect(CGRectApplyAffineTransform(dirtyCG, t));
1660		}
1661		[view setNeedsDisplayInRect:dirtyNS];
1662		}
1663		canDraw = false;
1664		goto end;
1665		}
	1299	dc.portBounds = CGContextGetClipBoundingBox(dc.context);
	1300	} else {
	1301	NSRect drawingBounds, currentBounds;
1666	1302
1667	1303	dc.view = view;
1668	1304	dc.context = GET_CGCONTEXT;
1669	1305	dc.portBounds = NSRectToCGRect([view bounds]);
1670	1306	if (dc.clipRgn) {
1671		clipBounds = CGContextGetClipBoundingBox(dc.context);
1672		}
1673		} else {
1674		Tcl_Panic("TkMacOSXSetupDrawingContext(): "
1675		"no context to draw into !");
	1307	CGRect clipBounds;
	1308	CGAffineTransform t = { .a = 1, .b = 0, .c = 0, .d = -1, .tx = 0,
	1309	.ty = [view bounds].size.height};
	1310	HIShapeGetBounds(dc.clipRgn, &clipBounds);
	1311	clipBounds = CGRectApplyAffineTransform(clipBounds, t);
	1312	drawingBounds = NSRectFromCGRect(clipBounds);
	1313	} else {
	1314	drawingBounds = [view bounds];
	1315	}
	1316
	1317	/*
	1318	* We can only draw into the NSView which is the current focusView.
	1319	* When the current [NSView focusView] is nil, the CGContext for
	1320	* [NSGraphicsContext currentContext] is nil. Otherwise the current
	1321	* CGContext draws into the current focusView. An NSView is guaranteed
	1322	* to be the focusView when its drawRect or setFrame methods are
	1323	* running. Prior to OSX 10.14 it was also possible to call the
	1324	* lockFocus method to force an NSView to become the current focusView.
	1325	* But that method was deprecated in 10.14 and so is no longer used by
	1326	* Tk. Instead, if the view is not the current focusView then we add
	1327	* the drawing bounds to its dirty rectangle and return false. The
	1328	* part of the view inside the drawing bounds will get redrawn during
	1329	* the next call to its drawRect method.
	1330	*/
	1331
	1332	if (view != [NSView focusView]) {
	1333	[view addTkDirtyRect:drawingBounds];
	1334	canDraw = false;
	1335	goto end;
	1336	}
	1337
	1338	/*
	1339	* Drawing will also fail when the view is the current focusView but
	1340	* the clipping rectangle set by drawRect does not contain the clipping
	1341	* region of our drawing context. (See bug [2a61eca3a8].) If part of
	1342	* the drawing bounds will be clipped then we draw whatever we can, but
	1343	* we also add the drawing bounds to the view's dirty rectangle so it
	1344	* will get redrawn in the next call to its drawRect method.
	1345	*/
	1346
	1347	currentBounds = NSRectFromCGRect(CGContextGetClipBoundingBox(dc.context));
	1348	if (!NSContainsRect(currentBounds, drawingBounds)) {
	1349	[view addTkDirtyRect:drawingBounds];
	1350	}
1676	1351	}
1677	1352
1678	1353	/*
1679		* Configure the drawing context.
	1354	* Finish configuring the drawing context.
1680	1355	*/
1681	1356
1682		if (dc.context) {
1683		CGAffineTransform t = {
1684		.a = 1, .b = 0,
1685		.c = 0, .d = -1,
1686		.tx = 0,
1687		.ty = dc.portBounds.size.height
	1357	CGAffineTransform t = {
	1358	.a = 1, .b = 0,
	1359	.c = 0, .d = -1,
	1360	.tx = 0,
	1361	.ty = dc.portBounds.size.height
	1362	};
	1363
	1364	dc.portBounds.origin.x += macDraw->xOff;
	1365	dc.portBounds.origin.y += macDraw->yOff;
	1366	CGContextSaveGState(dc.context);
	1367	CGContextSetTextDrawingMode(dc.context, kCGTextFill);
	1368	CGContextConcatCTM(dc.context, t);
	1369	if (dc.clipRgn) {
	1370
	1371	#ifdef TK_MAC_DEBUG_DRAWING
	1372	CGContextSaveGState(dc.context);
	1373	ChkErr(HIShapeReplacePathInCGContext, dc.clipRgn, dc.context);
	1374	CGContextSetRGBFillColor(dc.context, 1.0, 0.0, 0.0, 0.1);
	1375	CGContextEOFillPath(dc.context);
	1376	CGContextRestoreGState(dc.context);
	1377	#endif /* TK_MAC_DEBUG_DRAWING */
	1378
	1379	CGRect r;
	1380	CGRect b = CGRectApplyAffineTransform(
	1381	CGContextGetClipBoundingBox(dc.context), t);
	1382	if (!HIShapeIsRectangular(dc.clipRgn) \|\|
	1383	!CGRectContainsRect(*HIShapeGetBounds(dc.clipRgn, &r), b)) {
	1384	ChkErr(HIShapeReplacePathInCGContext, dc.clipRgn, dc.context);
	1385	CGContextEOClip(dc.context);
	1386	}
	1387	}
	1388	if (gc) {
	1389	static const CGLineCap cgCap[] = {
	1390	[CapNotLast] = kCGLineCapButt,
	1391	[CapButt] = kCGLineCapButt,
	1392	[CapRound] = kCGLineCapRound,
	1393	[CapProjecting] = kCGLineCapSquare,
1688	1394	};
1689
1690		dc.portBounds.origin.x += macDraw->xOff;
1691		dc.portBounds.origin.y += macDraw->yOff;
1692		CGContextSaveGState(dc.context);
1693		CGContextSetTextDrawingMode(dc.context, kCGTextFill);
1694		CGContextConcatCTM(dc.context, t);
1695		if (dc.clipRgn) {
1696		#ifdef TK_MAC_DEBUG_DRAWING
1697		CGContextSaveGState(dc.context);
1698		ChkErr(HIShapeReplacePathInCGContext, dc.clipRgn, dc.context);
1699		CGContextSetRGBFillColor(dc.context, 1.0, 0.0, 0.0, 0.1);
1700		CGContextEOFillPath(dc.context);
1701		CGContextRestoreGState(dc.context);
1702		#endif /* TK_MAC_DEBUG_DRAWING */
1703		CGRect r;
1704
1705		if (!HIShapeIsRectangular(dc.clipRgn) \|\| !CGRectContainsRect(
1706		*HIShapeGetBounds(dc.clipRgn, &r),
1707		CGRectApplyAffineTransform(clipBounds, t))) {
1708		ChkErr(HIShapeReplacePathInCGContext, dc.clipRgn, dc.context);
1709		CGContextEOClip(dc.context);
	1395	static const CGLineJoin cgJoin[] = {
	1396	[JoinMiter] = kCGLineJoinMiter,
	1397	[JoinRound] = kCGLineJoinRound,
	1398	[JoinBevel] = kCGLineJoinBevel,
	1399	};
	1400	bool shouldAntialias = !notAA(gc->line_width);
	1401	double w = gc->line_width;
	1402
	1403	TkMacOSXSetColorInContext(gc, gc->foreground, dc.context);
	1404	if (view) {
	1405	CGContextSetPatternPhase(dc.context, CGSizeMake(
	1406	dc.portBounds.size.width, dc.portBounds.size.height));
	1407	}
	1408	if (gc->function != GXcopy) {
	1409	TkMacOSXDbgMsg("Logical functions other than GXcopy are "
	1410	"not supported for CG drawing!");
	1411	}
	1412	if (!shouldAntialias) {
	1413
	1414	/*
	1415	* Make non-antialiased CG drawing look more like X11.
	1416	*/
	1417
	1418	w -= (gc->line_width ? NON_AA_CG_OFFSET : 0);
	1419	}
	1420	CGContextSetShouldAntialias(dc.context, shouldAntialias);
	1421	CGContextSetLineWidth(dc.context, w);
	1422	if (gc->line_style != LineSolid) {
	1423	int num = 0;
	1424	char *p = &gc->dashes;
	1425	CGFloat dashOffset = gc->dash_offset;
	1426	dashOffset -= (gc->line_width % 2) ? 0.5 : 0.0;
	1427	CGFloat lengths[10];
	1428
	1429	while (p[num] != '\0' && num < 10) {
	1430	lengths[num] = p[num];
	1431	num++;
1710	1432	}
1711		}
1712		if (gc) {
1713		static const CGLineCap cgCap[] = {
1714		[CapNotLast] = kCGLineCapButt,
1715		[CapButt] = kCGLineCapButt,
1716		[CapRound] = kCGLineCapRound,
1717		[CapProjecting] = kCGLineCapSquare,
1718		};
1719		static const CGLineJoin cgJoin[] = {
1720		[JoinMiter] = kCGLineJoinMiter,
1721		[JoinRound] = kCGLineJoinRound,
1722		[JoinBevel] = kCGLineJoinBevel,
1723		};
1724		bool shouldAntialias;
1725		double w = gc->line_width;
1726
1727		TkMacOSXSetColorInContext(gc, gc->foreground, dc.context);
1728		if (win) {
1729		CGContextSetPatternPhase(dc.context, CGSizeMake(
1730		dc.portBounds.size.width, dc.portBounds.size.height));
1731		}
1732		if (gc->function != GXcopy) {
1733		TkMacOSXDbgMsg("Logical functions other than GXcopy are "
1734		"not supported for CG drawing!");
1735		}
1736
1737		/*
1738		* When should we antialias?
1739		*/
1740
1741		shouldAntialias = !notAA(gc->line_width);
1742		if (!shouldAntialias) {
1743		/*
1744		* Make non-antialiased CG drawing look more like X11.
1745		*/
1746
1747		w -= (gc->line_width ? NON_AA_CG_OFFSET : 0);
1748		}
1749		CGContextSetShouldAntialias(dc.context, shouldAntialias);
1750		CGContextSetLineWidth(dc.context, w);
1751		if (gc->line_style != LineSolid) {
1752		int num = 0;
1753		char *p = &gc->dashes;
1754		CGFloat dashOffset = gc->dash_offset;
1755		CGFloat lengths[10];
1756
1757		while (p[num] != '\0' && num < 10) {
1758		lengths[num] = p[num];
1759		num++;
1760		}
1761		CGContextSetLineDash(dc.context, dashOffset, lengths, num);
1762		}
1763		if ((unsigned) gc->cap_style < sizeof(cgCap)/sizeof(CGLineCap)) {
1764		CGContextSetLineCap(dc.context,
1765		cgCap[(unsigned) gc->cap_style]);
1766		}
1767		if ((unsigned)gc->join_style < sizeof(cgJoin)/sizeof(CGLineJoin)) {
1768		CGContextSetLineJoin(dc.context,
1769		cgJoin[(unsigned) gc->join_style]);
1770		}
	1433	CGContextSetLineDash(dc.context, dashOffset, lengths, num);
	1434	}
	1435	if ((unsigned) gc->cap_style < sizeof(cgCap)/sizeof(CGLineCap)) {
	1436	CGContextSetLineCap(dc.context, cgCap[(unsigned) gc->cap_style]);
	1437	}
	1438	if ((unsigned)gc->join_style < sizeof(cgJoin)/sizeof(CGLineJoin)) {
	1439	CGContextSetLineJoin(dc.context, cgJoin[(unsigned) gc->join_style]);
1771	1440	}
1772	1441	}
1773	1442
1774	1443	end:
	1444
1775	1445	#ifdef TK_MAC_DEBUG_DRAWING
1776	1446	if (!canDraw && win != NULL) {
1777	1447	TkWindow *winPtr = TkMacOSXGetTkWindow(win);

1782	1452	}
1783	1453	}
1784	1454	#endif
	1455
1785	1456	if (!canDraw && dc.clipRgn) {
1786	1457	CFRelease(dc.clipRgn);
1787	1458	dc.clipRgn = NULL;

1843	1514	TkMacOSXGetClipRgn(
1844	1515	Drawable drawable) /* Drawable. */
1845	1516	{
1846		MacDrawable macDraw = (MacDrawable ) drawable;
	1517	MacDrawable macDraw = (MacDrawable )drawable;
1847	1518	HIShapeRef clipRgn = NULL;
1848	1519
1849	1520	if (macDraw->winPtr && macDraw->flags & TK_CLIP_INVALID) {

1851	1522	#ifdef TK_MAC_DEBUG_DRAWING
1852	1523	TkMacOSXDbgMsg("%s", macDraw->winPtr->pathName);
1853	1524
1854		NSView *view = TkMacOSXDrawableView(macDraw);
	1525	NSView *view = TkMacOSXGetNSViewForDrawable(macDraw);
	1526	CGContextRef context = GET_CGCONTEXT;
1855	1527
1856	1528	CGContextSaveGState(context);
1857	1529	CGContextConcatCTM(context, CGAffineTransformMake(1.0, 0.0, 0.0,

1913	1585
1914	1586	void
1915	1587	TkpClipDrawableToRect(
1916		Display *display,
	1588	TCL_UNUSED(Display *),
1917	1589	Drawable d,
1918	1590	int x, int y,
1919	1591	int width, int height)
1920	1592	{
1921		MacDrawable macDraw = (MacDrawable ) d;
	1593	MacDrawable macDraw = (MacDrawable )d;
1922	1594
1923	1595	if (macDraw->drawRgn) {
1924	1596	CFRelease(macDraw->drawRgn);

1965	1637	HIShapeRef clipRgnPtr) / must point to initialized variable */
1966	1638	{
1967	1639	if (gc && gc->clip_mask &&
1968		((TkpClipMask *) gc->clip_mask)->type == TKP_CLIP_REGION) {
1969		TkRegion gcClip = ((TkpClipMask *) gc->clip_mask)->value.region;
1970		int xOffset = ((MacDrawable *) d)->xOff + gc->clip_x_origin;
1971		int yOffset = ((MacDrawable *) d)->yOff + gc->clip_y_origin;
	1640	((TkpClipMask *)gc->clip_mask)->type == TKP_CLIP_REGION) {
	1641	TkRegion gcClip = ((TkpClipMask *)gc->clip_mask)->value.region;
	1642	int xOffset = ((MacDrawable *)d)->xOff + gc->clip_x_origin;
	1643	int yOffset = ((MacDrawable *)d)->yOff + gc->clip_y_origin;
1972	1644	HIShapeRef clipRgn = *clipRgnPtr, gcClipRgn;
1973	1645
1974		TkMacOSXOffsetRegion(gcClip, xOffset, yOffset);
	1646	XOffsetRegion(gcClip, xOffset, yOffset);
1975	1647	gcClipRgn = TkMacOSXGetNativeRegion(gcClip);
1976	1648	if (clipRgn) {
1977	1649	*clipRgnPtr = HIShapeCreateIntersection(gcClipRgn, clipRgn);

1980	1652	*clipRgnPtr = HIShapeCreateCopy(gcClipRgn);
1981	1653	}
1982	1654	CFRelease(gcClipRgn);
1983		TkMacOSXOffsetRegion(gcClip, -xOffset, -yOffset);
	1655	XOffsetRegion(gcClip, -xOffset, -yOffset);
1984	1656	}
1985	1657	}
1986	1658

2004	1676
2005	1677	void *
2006	1678	TkMacOSXMakeStippleMap(
2007		Drawable drawable, /* Window to apply stipple. */
2008		Drawable stipple) /* The stipple pattern. */
	1679	TCL_UNUSED(Drawable), /* Window to apply stipple. */
	1680	TCL_UNUSED(Drawable)) /* The stipple pattern. */
2009	1681	{
2010	1682	return NULL;
2011	1683	}

+6

-8

macosx/tkMacOSXEmbed.c less more

445	445	for (containerPtr = firstContainerPtr; containerPtr != NULL;
446	446	containerPtr = containerPtr->nextPtr) {
447	447	if (containerPtr->embeddedPtr == winPtr) {
448		return (MacDrawable *) containerPtr->parent;
	448	return (MacDrawable *)containerPtr->parent;
449	449	}
450	450	}
451	451	Tcl_Panic("TkMacOSXContainerId couldn't find window");

852	852	* Here we are following unix, by destroying the container.
853	853	*/
854	854
855		Tk_DestroyWindow((Tk_Window) winPtr);
	855	Tk_DestroyWindow((Tk_Window)winPtr);
856	856	}
857	857	Tk_DeleteErrorHandler(errHandler);
858	858	}

901	901
902	902	errHandler = Tk_CreateErrorHandler(eventPtr->xfocus.display, -1,
903	903	-1, -1, NULL, NULL);
904		Tk_MoveResizeWindow((Tk_Window) containerPtr->embeddedPtr, 0, 0,
905		(unsigned) Tk_Width((Tk_Window) containerPtr->parentPtr),
	904	Tk_MoveResizeWindow((Tk_Window)containerPtr->embeddedPtr, 0, 0,
	905	(unsigned) Tk_Width((Tk_Window)containerPtr->parentPtr),
906	906	(unsigned) Tk_Height((Tk_Window)containerPtr->parentPtr));
907	907	Tk_DeleteErrorHandler(errHandler);
908	908	}

1047	1047	* if the window's size didn't change then generate a configure event.
1048	1048	*/
1049	1049
1050		Tk_GeometryRequest((Tk_Window) winPtr, width, height);
1051		while (Tcl_DoOneEvent(TCL_IDLE_EVENTS)) {
1052		/* Empty loop body. */
1053		}
	1050	Tk_GeometryRequest((Tk_Window)winPtr, width, height);
	1051	while (Tcl_DoOneEvent(TCL_IDLE_EVENTS\|TCL_TIMER_EVENTS\|TCL_DONT_WAIT)) {}
1054	1052	if ((winPtr->changes.width != width)
1055	1053	\|\| (winPtr->changes.height != height)) {
1056	1054	EmbedSendConfigure(containerPtr);

+4

-4

macosx/tkMacOSXEntry.c less more

91	91	GC bgGC;
92	92	Tk_Window tkwin = entryPtr->tkwin;
93	93	int oldWidth = 0;
94		MacDrawable macDraw = (MacDrawable ) d;
	94	MacDrawable macDraw = (MacDrawable )d;
95	95	const HIThemeFrameDrawInfo info = {
96	96	.version = 0,
97	97	.kind = kHIThemeFrameTextFieldSquare,

154	154	bounds.origin.y = macDraw->yOff + MAC_OSX_FOCUS_WIDTH;
155	155	bounds.size.width = Tk_Width(tkwin) - 2*MAC_OSX_FOCUS_WIDTH;
156	156	bounds.size.height = Tk_Height(tkwin) - 2*MAC_OSX_FOCUS_WIDTH;
157		if (!TkMacOSXSetupDrawingContext(d, NULL, 1, &dc)) {
	157	if (!TkMacOSXSetupDrawingContext(d, NULL, &dc)) {
158	158
159	159	/*
160	160	* No graphics context is available. If the widget is a Spinbox, we

207	207	TkMacOSXDrawingContext dc;
208	208	XRectangle rects[1];
209	209	GC bgGC;
210		MacDrawable macDraw = (MacDrawable ) d;
	210	MacDrawable macDraw = (MacDrawable )d;
211	211	HIThemeButtonDrawInfo info = {
212	212	.version = 0,
213	213	.adornment = kThemeAdornmentNone,

264	264	rects[0].height = Tk_Height(tkwin);
265	265	XFillRectangles(Tk_Display(tkwin), d, bgGC, rects, 1);
266	266
267		if (!TkMacOSXSetupDrawingContext(d, NULL, 1, &dc)) {
	267	if (!TkMacOSXSetupDrawingContext(d, NULL, &dc)) {
268	268	return 0;
269	269	}
270	270	ChkErr(HIThemeDrawButton, &bounds, &info, dc.context, HIOrientation, NULL);

+1

-36

macosx/tkMacOSXEvent.c less more

103	103	return processedEvent;
104	104	}
105	105	@end
	106	#pragma mark -
106	107
107		#pragma mark -
108
109		/*
110		*----------------------------------------------------------------------
111		*
112		* TkMacOSXFlushWindows --
113		*
114		* This routine is a stub called by XSync, which is called during the Tk
115		* update command. The language specification does not require that the
116		* update command be synchronous but many of the tests implicitly assume
117		* that it is. It is definitely asynchronous on macOS since many idle
118		* tasks are run inside of the drawRect method of a window's contentView,
119		* which will not be called until after this function returns.
120		*
121		* Results:
122		* None.
123		*
124		* Side effects: Processes all pending idle events then calls the display
125		* method of each visible window.
126		*
127		*----------------------------------------------------------------------
128		*/
129
130		MODULE_SCOPE void
131		TkMacOSXFlushWindows(void)
132		{
133		if (Tk_GetNumMainWindows() == 0) {
134		return;
135		}
136		while (Tcl_DoOneEvent(TCL_IDLE_EVENTS)){}
137		for (NSWindow *w in [NSApp orderedWindows]) {
138		[w display];
139		}
140		}
141
142
143	108	/*
144	109	* Local Variables:
145	110	* mode: objc

+3

-1

macosx/tkMacOSXEvent.h less more

17	17	#include "tkMacOSXInt.h"
18	18	#endif
19	19
20		MODULE_SCOPE void TkMacOSXFlushWindows(void);
	20	/*
	21	* Currently nothing needs to be declared here.
	22	*/
21	23
22	24	#endif

+154

-214

macosx/tkMacOSXFont.c less more

55	55	#define ThemeFont(n, ...) { kTheme##n##Font, "system" #n "Font", ##__VA_ARGS__ }
56	56	static const struct SystemFontMapEntry systemFontMap[] = {
57	57	ThemeFont(System, "TkDefaultFont", "TkIconFont"),
58		ThemeFont(EmphasizedSystem, "TkCaptionFont"),
	58	ThemeFont(EmphasizedSystem, "TkCaptionFont", NULL),
59	59	ThemeFont(SmallSystem, "TkHeadingFont", "TkTooltipFont"),
60		ThemeFont(SmallEmphasizedSystem),
61		ThemeFont(Application, "TkTextFont"),
62		ThemeFont(Label, "TkSmallCaptionFont"),
63		ThemeFont(Views),
64		ThemeFont(MenuTitle),
65		ThemeFont(MenuItem, "TkMenuFont"),
66		ThemeFont(MenuItemMark),
67		ThemeFont(MenuItemCmdKey),
68		ThemeFont(WindowTitle),
69		ThemeFont(PushButton),
70		ThemeFont(UtilityWindowTitle),
71		ThemeFont(AlertHeader),
72		ThemeFont(Toolbar),
73		ThemeFont(MiniSystem),
74		{ kThemeSystemFontDetail, "systemDetailSystemFont" },
75		{ kThemeSystemFontDetailEmphasized, "systemDetailEmphasizedSystemFont" },
76		{ -1, NULL }
	60	ThemeFont(SmallEmphasizedSystem, NULL, NULL),
	61	ThemeFont(Application, "TkTextFont", NULL),
	62	ThemeFont(Label, "TkSmallCaptionFont", NULL),
	63	ThemeFont(Views, NULL, NULL),
	64	ThemeFont(MenuTitle, NULL, NULL),
	65	ThemeFont(MenuItem, "TkMenuFont", NULL),
	66	ThemeFont(MenuItemMark, NULL, NULL),
	67	ThemeFont(MenuItemCmdKey, NULL, NULL),
	68	ThemeFont(WindowTitle, NULL, NULL),
	69	ThemeFont(PushButton, NULL, NULL),
	70	ThemeFont(UtilityWindowTitle, NULL, NULL),
	71	ThemeFont(AlertHeader, NULL, NULL),
	72	ThemeFont(Toolbar, NULL, NULL),
	73	ThemeFont(MiniSystem, NULL, NULL),
	74	{ kThemeSystemFontDetail, "systemDetailSystemFont", NULL, NULL },
	75	{ kThemeSystemFontDetailEmphasized, "systemDetailEmphasizedSystemFont", NULL, NULL },
	76	{ -1, NULL, NULL, NULL }
77	77	};
78	78	#undef ThemeFont
79	79

92	92	static int CreateNamedSystemFont(Tcl_Interp *interp,
93	93	Tk_Window tkwin, const char *name,
94	94	TkFontAttributes *faPtr);
95		static void DrawCharsInContext(Display *display, Drawable drawable,
96		GC gc, Tk_Font tkfont, const char *source,
97		int numBytes, int rangeStart, int rangeLength,
98		int x, int y, double angle);
99	95
100	96	#pragma mark -
101	97	#pragma mark Font Helpers:
102	98
103	99	/*
104		*---------------------------------------------------------------------------
105		*
106		* TclUniToNSString --
107		*
108		* When Tcl is compiled with TCL_UTF_MAX = 3 (the default for 8.6) it cannot
109		* deal directly with UTF-8 encoded non-BMP characters, since their UTF-8
110		* encoding requires 4 bytes.
111		*
112		* As a workaround, these versions of Tcl encode non-BMP characters as a string
113		* of length 6 in which the high and low UTF-16 surrogates have been encoded
114		* using the UTF-8 algorithm. The UTF-8 encoding does not allow encoding
115		* surrogates, so these 6-byte strings are not valid UTF-8, and hence Apple's
116		* NString class will refuse to instantiate an NSString from the 6-byte
117		* encoding. This function allows creating an NSString from a C-string which
118		* has been encoded using this scheme.
119		*
120		* Results:
121		* An NSString, which may be nil.
122		*
123		* Side effects:
124		* None.
125		*---------------------------------------------------------------------------
126		*/
127
128		MODULE_SCOPE NSString*
129		TclUniToNSString(
130		const char *source,
131		int numBytes)
132		{
133		NSString string = [[NSString alloc] initWithBytesNoCopy:(void )source
134		length:numBytes
135		encoding:NSUTF8StringEncoding
136		freeWhenDone:NO];
137		if (!string) {
138		const unichar characters = ckalloc(numBytessizeof(unichar));
139		const char *in = source;
140		unichar out = (unichar ) characters;
141		while (in < source + numBytes) {
142		in += Tcl_UtfToUniChar(in, out++);
143		}
144		string = [[NSString alloc] initWithCharacters:characters
145		length:(out - characters)];
146		ckfree(characters);
147		}
148		return string;
149		}
150
151		/*
152		*---------------------------------------------------------------------------
153		*
154		* TclUniAtIndex --
155		*
156		* Write a sequence of bytes up to length 6 which is an encoding of a UTF-16
157		* character in an NSString. Also record the unicode code point of the character.
158		* this may be a non-BMP character constructed by reading two surrogates from
159		* the NSString.
160		*
161		* Results:
162		* Returns the number of bytes written.
163		*
164		* Side effects:
165		* Bytes are written to the char array referenced by the pointer uni and
166		* the unicode code point is written to the integer referenced by the
167		* pointer code.
168		*
169		*/
170
171		MODULE_SCOPE int
172		TclUniAtIndex(
173		NSString *string,
174		int index,
175		char *uni,
176		unsigned int *code)
177		{
178		char *ptr = uni;
179		UniChar uniChar = [string characterAtIndex: index];
180		if (CFStringIsSurrogateHighCharacter(uniChar)) {
181		UniChar lowChar = [string characterAtIndex: ++index];
182		*code = CFStringGetLongCharacterForSurrogatePair(
183		uniChar, lowChar);
184		ptr += Tcl_UniCharToUtf(uniChar, ptr);
185		ptr += Tcl_UniCharToUtf(lowChar, ptr);
186		return ptr - uni;
187		} else {
188		*code = (int) uniChar;
189		[[string substringWithRange: NSMakeRange(index, 1)]
190		getCString: uni
191		maxLength: XMaxTransChars
192		encoding: NSUTF8StringEncoding];
193		return strlen(uni);
194		}
195		}
196
197		/*
198		*---------------------------------------------------------------------------
199		*
200		* NSStringToTclUni --
201		*
202		* Encodes the unicode string represented by an NSString object with the
203		* internal encoding that Tcl uses when TCL_UTF_MAX = 3. This encoding
204		* is similar to UTF-8 except that non-BMP characters are encoded as two
205		* successive 3-byte sequences which are constructed from UTF-16 surrogates
206		* by applying the UTF-8 algorithm. Even though the UTF-8 encoding does not
207		* allow encoding surrogates, the algorithm does produce a well-defined
208		* 3-byte sequence.
209		*
210		* Results:
211		* Returns a pointer to a null-terminated byte array which encodes the
212		* NSString.
213		*
214		* Side effects:
215		* Memory is allocated to hold the byte array, which must be freed with
216		* ckalloc. If the pointer numBytes is not NULL the number of non-null
217		* bytes written to the array is stored in the integer it references.
218		*/
219
220		MODULE_SCOPE char*
221		NSStringToTclUni(
222		NSString *string,
223		int *numBytes)
224		{
225		unsigned int code;
226		int i;
227		char ptr, bytes = ckalloc(6*[string length] + 1);
228
229		ptr = bytes;
230		if (ptr) {
231		for (i = 0; i < [string length]; i++) {
232		ptr += TclUniAtIndex(string, i, ptr, &code);
233		if (code > 0xffff){
234		i++;
235		}
236		}
237		*ptr = '\0';
238		}
239		if (numBytes) {
240		*numBytes = ptr - bytes;
241		}
242		return bytes;
243		}
	100	* To avoid an extra copy, a TKNSString object wraps a Tcl_DString with an
	101	* NSString that uses the DString's buffer as its character buffer. It can be
	102	* constructed from a Tcl_DString and it has a DString property that handles
	103	* converting from an NSString to a Tcl_DString.
	104	*/
	105
	106	@implementation TKNSString
	107
	108	- (instancetype)initWithTclUtfBytes:(const void *)bytes
	109	length:(NSUInteger)len
	110	{
	111	self = [self init];
	112	if (self) {
	113	Tcl_DStringInit(&_ds);
	114	Tcl_UtfToUniCharDString(bytes, len, &_ds);
	115	_string = [[NSString alloc]
	116	initWithCharactersNoCopy:(unichar *)Tcl_DStringValue(&_ds)
	117	length:Tcl_DStringLength(&_ds)>>1
	118	freeWhenDone:NO];
	119	self.UTF8String = _string.UTF8String;
	120	}
	121	return self;
	122	}
	123
	124	- (instancetype)initWithString:(NSString *)aString
	125	{
	126	self = [self init];
	127	if (self) {
	128	_string = [[NSString alloc] initWithString:aString];
	129	_UTF8String = _string.UTF8String;
	130	}
	131	return self;
	132	}
	133
	134	- (void)dealloc
	135	{
	136	Tcl_DStringFree(&_ds);
	137	[_string release];
	138	[super dealloc];
	139	}
	140
	141	- (NSUInteger)length
	142	{
	143	return _string.length;
	144	}
	145
	146	- (unichar)characterAtIndex:(NSUInteger)index
	147	{
	148	return [_string characterAtIndex:index];
	149	}
	150
	151	- (Tcl_DString)DString
	152	{
	153	if ( _ds.string == NULL) {
	154
	155	/*
	156	* The DString has not been initialized. Construct it from
	157	* our string's unicode characters.
	158	*/
	159	char *p;
	160	NSUInteger index;
	161
	162	Tcl_DStringInit(&_ds);
	163	Tcl_DStringSetLength(&_ds, 3 * [_string length]);
	164	p = Tcl_DStringValue(&_ds);
	165	for (index = 0; index < [_string length]; index++) {
	166	p += Tcl_UniCharToUtf([_string characterAtIndex: index], p);
	167	}
	168	Tcl_DStringSetLength(&_ds, p - Tcl_DStringValue(&_ds));
	169	}
	170	return _ds;
	171	}
	172
	173	#ifndef __clang__
	174	@synthesize UTF8String = _UTF8String;
	175	@synthesize DString = _ds;
	176	#endif
	177	@end
244	178
245	179	#define GetNSFontTraitsFromTkFontAttributes(faPtr) \
246	180	((faPtr)->weight == TK_FW_BOLD ? NSBoldFontMask : NSUnboldFontMask) \| \

513	447	TkMainInfo mainPtr) / The application being created. */
514	448	{
515	449	Tcl_Interp *interp = mainPtr->interp;
516		Tk_Window tkwin = (Tk_Window) mainPtr->winPtr;
	450	Tk_Window tkwin = (Tk_Window)mainPtr->winPtr;
517	451	const struct SystemFontMapEntry *systemFont = systemFontMap;
518	452	NSFont *nsFont;
519	453	TkFontAttributes fa;

612	546
613	547	TkFont *
614	548	TkpGetNativeFont(
615		Tk_Window tkwin, /* For display where font will be used. */
	549	TCL_UNUSED(Tk_Window), /* For display where font will be used. */
616	550	const char name) / Platform-specific font name. */
617	551	{
618	552	MacFont *fontPtr = NULL;

631	565	ctFont = CTFontCreateUIFontForLanguage(
632	566	HIThemeGetUIFontType(themeFontId), 0, NULL);
633	567	if (ctFont) {
634		fontPtr = ckalloc(sizeof(MacFont));
	568	fontPtr = (MacFont *)ckalloc(sizeof(MacFont));
635	569	InitFont((NSFont*) ctFont, NULL, fontPtr);
636	570	}
637	571

699	633	Tcl_Panic("Could not determine NSFont from TkFontAttributes");
700	634	}
701	635	if (tkFontPtr == NULL) {
702		fontPtr = ckalloc(sizeof(MacFont));
	636	fontPtr = (MacFont *)ckalloc(sizeof(MacFont));
703	637	} else {
704	638	fontPtr = (MacFont *) tkFontPtr;
705	639	TkpDeleteFont(tkFontPtr);

761	695	void
762	696	TkpGetFontFamilies(
763	697	Tcl_Interp interp, / Interp to hold result. */
764		Tk_Window tkwin) /* For display to query. */
	698	TCL_UNUSED(Tk_Window)) /* For display to query. */
765	699	{
766	700	Tcl_Obj *resultPtr = Tcl_NewListObj(0, NULL);
767	701	NSArray *list = [[NSFontManager sharedFontManager] availableFontFamilies];

834	768
835	769	void
836	770	TkpGetFontAttrsForChar(
837		Tk_Window tkwin, /* Window on the font's display */
	771	TCL_UNUSED(Tk_Window), /* Window on the font's display */
838	772	Tk_Font tkfont, /* Font to query */
839	773	int c, /* Character of interest */
840	774	TkFontAttributes* faPtr) /* Output: Font attributes */

985	919	if (maxLength > 32767) {
986	920	maxLength = 32767;
987	921	}
988		string = TclUniToNSString((const char *)source, numBytes);
	922	string = [[TKNSString alloc] initWithTclUtfBytes:source length:numBytes];
989	923	if (!string) {
990	924	length = 0;
991	925	fit = rangeLength;

1097	1031	[attributedString release];
1098	1032	[string release];
1099	1033	length = ceil(width - offset);
1100		fit = (Tcl_UtfAtIndex(source, index) - source) - rangeStart;
	1034	fit = (TkUtfAtIndex(source, index) - source) - rangeStart;
1101	1035	done:
1102	1036	#ifdef TK_MAC_DEBUG_FONTS
1103	1037	TkMacOSXDbgMsg("measure: source=\"%s\" range=\"%.*s\" maxLength=%d "

1121	1055	* Draw a string of characters on the screen.
1122	1056	*
1123	1057	* With ATSUI we need the line context to do this right, so we have the
1124		* actual implementation in TkpDrawCharsInContext().
	1058	* actual implementation in TkpDrawAngledCharsInContext().
1125	1059	*
1126	1060	* Results:
1127	1061	* None.

1150	1084	int x, int y) /* Coordinates at which to place origin of the
1151	1085	* string when drawing. */
1152	1086	{
1153		DrawCharsInContext(display, drawable, gc, tkfont, source, numBytes,
	1087	TkpDrawAngledCharsInContext(display, drawable, gc, tkfont, source, numBytes,
1154	1088	0, numBytes, x, y, 0.0);
1155	1089	}
1156	1090

1173	1107	* string when drawing. */
1174	1108	double angle) /* What angle to put text at, in degrees. */
1175	1109	{
1176		DrawCharsInContext(display, drawable, gc, tkfont, source, numBytes,
	1110	TkpDrawAngledCharsInContext(display, drawable, gc, tkfont, source, numBytes,
1177	1111	0, numBytes, x, y, angle);
1178	1112	}
1179	1113

1218	1152	* whole (not just the range) string when
1219	1153	* drawing. */
1220	1154	{
1221		DrawCharsInContext(display, drawable, gc, tkfont, source, numBytes,
	1155	TkpDrawAngledCharsInContext(display, drawable, gc, tkfont, source, numBytes,
1222	1156	rangeStart, rangeLength, x, y, 0.0);
1223	1157	}
1224	1158
1225		static void
1226		DrawCharsInContext(
1227		Display display, / Display on which to draw. */
	1159	void
	1160	TkpDrawAngledCharsInContext(
	1161	TCL_UNUSED(Display ), / Display on which to draw. */
1228	1162	Drawable drawable, /* Window or pixmap in which to draw. */
1229	1163	GC gc, /* Graphics context for drawing characters. */
1230	1164	Tk_Font tkfont, /* Font in which characters will be drawn; must

1239	1173	int numBytes, /* Number of bytes in string. */
1240	1174	int rangeStart, /* Index of first byte to draw. */
1241	1175	int rangeLength, /* Length of range to draw in bytes. */
1242		int x, int y, /* Coordinates at which to place origin of the
	1176	double x, double y, /* Coordinates at which to place origin of the
1243	1177	* whole (not just the range) string when
1244	1178	* drawing. */
1245		double angle)
	1179	double angle) /* What angle to put text at, in degrees. */
1246	1180	{
1247	1181	const MacFont fontPtr = (const MacFont ) tkfont;
1248	1182	NSString *string;
1249	1183	NSMutableDictionary *attributes;
1250	1184	NSAttributedString *attributedString;
1251	1185	CTTypesetterRef typesetter;
1252		CFIndex start, len;
1253		CTLineRef line;
1254		MacDrawable macWin = (MacDrawable ) drawable;
	1186	CFIndex start, length;
	1187	CTLineRef line, full=nil;
	1188	MacDrawable macWin = (MacDrawable )drawable;
1255	1189	TkMacOSXDrawingContext drawingContext;
1256	1190	CGContextRef context;
1257	1191	CGColorRef fg;
1258	1192	NSFont *nsFont;
1259	1193	CGAffineTransform t;
1260		int h;
1261
1262		if (rangeStart < 0 \|\| rangeLength <= 0 \|\|
1263		rangeStart + rangeLength > numBytes \|\|
1264		!TkMacOSXSetupDrawingContext(drawable, gc, 1, &drawingContext)) {
	1194	CGFloat width, height, textX = (CGFloat) x, textY = (CGFloat) y;
	1195
	1196	if (rangeStart < 0 \|\| rangeLength <= 0 \|\|
	1197	rangeStart + rangeLength > numBytes \|\|
	1198	!TkMacOSXSetupDrawingContext(drawable, gc, &drawingContext)) {
1265	1199	return;
1266	1200	}
1267		string = TclUniToNSString((const char *)source, numBytes);
	1201	string = [[TKNSString alloc] initWithTclUtfBytes:source length:numBytes];
1268	1202	if (!string) {
1269	1203	return;
1270	1204	}
	1205
1271	1206	context = drawingContext.context;
1272		fg = TkMacOSXCreateCGColor(gc, gc->foreground);
	1207	TkSetMacColor(gc->foreground, &fg);
1273	1208	attributes = [fontPtr->nsAttributes mutableCopy];
1274	1209	[attributes setObject:(id)fg forKey:(id)kCTForegroundColorAttributeName];
1275		CFRelease(fg);
1276	1210	nsFont = [attributes objectForKey:NSFontAttributeName];
1277		[nsFont setInContext:[NSGraphicsContext graphicsContextWithGraphicsPort:
1278		context flipped:NO]];
	1211	[nsFont setInContext:GET_NSCONTEXT(context, NO)];
1279	1212	CGContextSetTextMatrix(context, CGAffineTransformIdentity);
1280	1213	attributedString = [[NSAttributedString alloc] initWithString:string
1281	1214	attributes:attributes];
1282	1215	typesetter = CTTypesetterCreateWithAttributedString(
1283	1216	(CFAttributedStringRef)attributedString);
1284		x += macWin->xOff;
1285		y += macWin->yOff;
1286		h = drawingContext.portBounds.size.height;
1287		y = h - y;
1288		t = CGAffineTransformMake(1.0, 0.0, 0.0, -1.0, 0.0, h);
	1217	textX += (CGFloat) macWin->xOff;
	1218	textY += (CGFloat) macWin->yOff;
	1219	height = drawingContext.portBounds.size.height;
	1220	textY = height - textY;
	1221	t = CGAffineTransformMake(1.0, 0.0, 0.0, -1.0, 0.0, height);
1289	1222	if (angle != 0.0) {
1290		t = CGAffineTransformTranslate(CGAffineTransformRotate(
1291		CGAffineTransformTranslate(t, x, y), angle*PI/180.0), -x, -y);
	1223	t = CGAffineTransformTranslate(
	1224	CGAffineTransformRotate(
	1225	CGAffineTransformTranslate(t, textX, textY), angle*PI/180.0),
	1226	-textX, -textY);
1292	1227	}
1293	1228	CGContextConcatCTM(context, t);
1294		CGContextSetTextPosition(context, x, y);
1295	1229	start = Tcl_NumUtfChars(source, rangeStart);
1296		len = Tcl_NumUtfChars(source, rangeStart + rangeLength);
	1230	length = Tcl_NumUtfChars(source, rangeStart + rangeLength) - start;
	1231	line = CTTypesetterCreateLine(typesetter, CFRangeMake(start, length));
1297	1232	if (start > 0) {
1298		CGRect clipRect = CGRectInfinite, startBounds;
1299
1300		line = CTTypesetterCreateLine(typesetter, CFRangeMake(0, start));
1301		startBounds = CTLineGetImageBounds(line, context);
1302		CFRelease(line);
1303		clipRect.origin.x = startBounds.origin.x + startBounds.size.width;
1304		CGContextClipToRect(context, clipRect);
1305		}
1306		line = CTTypesetterCreateLine(typesetter, CFRangeMake(0, len));
	1233
	1234	/*
	1235	* We are only drawing part of the string. To compute the x coordinate
	1236	* of the part we are drawing we subtract its typographical length from
	1237	* the typographical length of the full string. This accounts for the
	1238	* kerning after the initial part of the string.
	1239	*/
	1240
	1241	full = CTTypesetterCreateLine(typesetter, CFRangeMake(0, start + length));
	1242	width = CTLineGetTypographicBounds(full, NULL, NULL, NULL);
	1243	CFRelease(full);
	1244	textX += (width - CTLineGetTypographicBounds(line, NULL, NULL, NULL));
	1245	}
	1246	CGContextSetTextPosition(context, textX, textY);
1307	1247	CTLineDraw(line, context);
1308	1248	CFRelease(line);
1309	1249	CFRelease(typesetter);

1381	1321
1382	1322	int
1383	1323	TkMacOSXIsCharacterMissing(
1384		Tk_Font tkfont, /* The font we are looking in. */
1385		unsigned int searchChar) /* The character we are looking for. */
	1324	TCL_UNUSED(Tk_Font), /* The font we are looking in. */
	1325	TCL_UNUSED(unsigned int)) /* The character we are looking for. */
1386	1326	{
1387	1327	return 0;
1388	1328	}

1421	1361	NSStrikethroughStyleAttributeName];
1422	1362
1423	1363	objv[i++] = Tcl_NewStringObj(familyName, -1);
1424		objv[i++] = Tcl_NewIntObj([nsFont pointSize]);
1425		#define S(s) Tcl_NewStringObj(STRINGIFY(s),(int)(sizeof(STRINGIFY(s))-1))
	1364	objv[i++] = Tcl_NewWideIntObj([nsFont pointSize]);
	1365	#define S(s) Tcl_NewStringObj(STRINGIFY(s), (sizeof(STRINGIFY(s))-1))
1426	1366	objv[i++] = (traits & NSBoldFontMask) ? S(bold) : S(normal);
1427	1367	objv[i++] = (traits & NSItalicFontMask) ? S(italic) : S(roman);
1428	1368	if ([underline respondsToSelector:@selector(intValue)] &&

+55

-14

macosx/tkMacOSXHLEvents.c less more

38	38	const char *procedure;
39	39	Tcl_DString command;
40	40	NSAppleEventDescriptor replyEvent; / Only used for DoScriptText. */
	41	int retryCount;
41	42	} AppleEventInfo;
42	43
43	44	/*

64	65	- (void) terminate: (id) sender
65	66	{
66	67	[self handleQuitApplicationEvent:Nil withReplyEvent:Nil];
	68	}
	69
	70	- (void) superTerminate: (id) sender
	71	{
	72	[super terminate:nil];
67	73	}
68	74
69	75	- (void) preferences: (id) sender

147	153	AEKeyword keyword;
148	154	Tcl_DString pathName;
149	155
	156
150	157	/*
151	158	* Do nothing if we don't have an interpreter.
152	159	*/

214	221	AEInfo->interp = _eventInterp;
215	222	AEInfo->procedure = openDocumentProc;
216	223	AEInfo->replyEvent = nil;
217		Tcl_DoWhenIdle(ProcessAppleEvent, (ClientData)AEInfo);
	224	AEInfo->retryCount = 0;
	225
	226	if (Tcl_FindCommand(_eventInterp, "::tk::mac::OpenDocuments", NULL, 0)){
	227	ProcessAppleEvent((ClientData)AEInfo);
	228	} else {
	229	Tcl_CreateTimerHandler(500, ProcessAppleEvent, (ClientData)AEInfo);
	230	}
218	231	}
219	232
220	233	- (void) handlePrintDocumentsEvent: (NSAppleEventDescriptor *)event

231	244	AEInfo->interp = _eventInterp;
232	245	AEInfo->procedure = printDocProc;
233	246	AEInfo->replyEvent = nil;
234		Tcl_DoWhenIdle(ProcessAppleEvent, (ClientData)AEInfo);
	247	AEInfo->retryCount = 0;
	248	ProcessAppleEvent((ClientData)AEInfo);
235	249	}
236	250
237	251	- (void) handleDoScriptEvent: (NSAppleEventDescriptor *)event

292	306	AEInfo->interp = _eventInterp;
293	307	AEInfo->procedure = scriptFileProc;
294	308	AEInfo->replyEvent = nil;
295		Tcl_DoWhenIdle(ProcessAppleEvent, (ClientData)AEInfo);
	309	AEInfo->retryCount = 0;
	310	ProcessAppleEvent((ClientData)AEInfo);
296	311	}
297	312	}
298	313	} else if (noErr == AEGetParamPtr(theDesc, keyDirectObject, typeUTF8Text, &type,

308	323	if (noErr == AEGetParamPtr(theDesc, keyDirectObject,
309	324	typeUTF8Text, &type,
310	325	data, actual, NULL)) {
	326	data[actual] = '\0';
311	327	AppleEventInfo *AEInfo = ckalloc(sizeof(AppleEventInfo));
312	328	Tcl_DString *scriptTextCommand = &AEInfo->command;
313	329	Tcl_DStringInit(scriptTextCommand);

315	331	Tcl_DStringAppendElement(scriptTextCommand, data);
316	332	AEInfo->interp = _eventInterp;
317	333	AEInfo->procedure = scriptTextProc;
	334	AEInfo->retryCount = 0;
318	335	if (Tcl_FindCommand(AEInfo->interp, AEInfo->procedure, NULL, 0)) {
319	336	AEInfo->replyEvent = replyEvent;
320	337	ProcessAppleEvent((ClientData)AEInfo);
321	338	} else {
322	339	AEInfo->replyEvent = nil;
323		Tcl_DoWhenIdle(ProcessAppleEvent, (ClientData)AEInfo);
	340	ProcessAppleEvent((ClientData)AEInfo);
324	341	}
325	342	}
326	343	}

341	358	AEInfo->interp = _eventInterp;
342	359	AEInfo->procedure = launchURLProc;
343	360	AEInfo->replyEvent = nil;
344		Tcl_DoWhenIdle(ProcessAppleEvent, (ClientData)AEInfo);
	361	AEInfo->retryCount = 0;
	362	ProcessAppleEvent((ClientData)AEInfo);
345	363	}
346	364
347	365	@end

376	394	{
377	395	int code;
378	396	AppleEventInfo AEInfo = (AppleEventInfo) clientData;
379		if (!AEInfo->interp \|\|
380		!Tcl_FindCommand(AEInfo->interp, AEInfo->procedure, NULL, 0)) {
	397
	398	if (!AEInfo->interp) {
	399	return;
	400	}
	401
	402	/*
	403	* Apple events that are delivered during the app startup can arrive
	404	* before the Tcl procedure for handling the events has been defined.
	405	* If the command is not found we create a timer handler to process
	406	* the event later, hopefully after the command has been created.
	407	* We retry up to 2 times before giving up.
	408	*/
	409
	410	if (!Tcl_FindCommand(AEInfo->interp, AEInfo->procedure, NULL, 0)) {
	411	if (AEInfo->retryCount < 2) {
	412	AEInfo->retryCount++;
	413	Tcl_CreateTimerHandler(200, ProcessAppleEvent, clientData);
	414	} else {
	415	ckfree(clientData);
	416	}
381	417	return;
382	418	}
383	419	code = Tcl_EvalEx(AEInfo->interp, Tcl_DStringValue(&AEInfo->command),
384	420	Tcl_DStringLength(&AEInfo->command), TCL_EVAL_GLOBAL);
385		if (code != TCL_OK) {
386		Tcl_BackgroundException(AEInfo->interp, code);
387		}
388	421
389	422	if (AEInfo->replyEvent && code >= 0) {
390	423	int reslen;

399	432	AEPutParamPtr((AppleEvent*)[AEInfo->replyEvent aeDesc],
400	433	keyErrorNumber, typeSInt32, (Ptr) &code, sizeof(int));
401	434	}
402		}
	435	} else if (code != TCL_OK) {
	436	Tcl_BackgroundException(AEInfo->interp, code);
	437	}
	438
403	439	Tcl_DStringFree(&AEInfo->command);
404	440	ckfree(clientData);
405	441	}

533	569	static int
534	570	ReallyKillMe(
535	571	Tcl_Event *eventPtr,
536		int flags)
	572	TCL_UNUSED(int))
537	573	{
538	574	Tcl_Interp interp = ((KillEvent ) eventPtr)->interp;
539	575	int quit = Tcl_FindCommand(interp, "::tk::mac::Quit", NULL, 0)!=NULL;
540		int code = Tcl_EvalEx(interp, quit ? "::tk::mac::Quit" : "exit", -1, TCL_EVAL_GLOBAL);
541
	576
	577	if (!quit) {
	578	Tcl_Exit(0);
	579	}
	580
	581	int code = Tcl_EvalEx(interp, "::tk::mac::Quit", -1, TCL_EVAL_GLOBAL);
542	582	if (code != TCL_OK) {
	583
543	584	/*
544	585	* Should be never reached...
545	586	*/

+474

-163

macosx/tkMacOSXImage.c less more

5	5	* Copyright (c) 1995-1997 Sun Microsystems, Inc.
6	6	* Copyright 2001-2009, Apple Inc.
7	7	* Copyright (c) 2005-2009 Daniel A. Steffen <das@users.sourceforge.net>
8		* Copyright 2017-2018 Marc Culler.
	8	* Copyright (c) 2017-2020 Marc Culler.
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.

13	13
14	14	#include "tkMacOSXPrivate.h"
15	15	#include "xbytes.h"
	16
	17	static CGImageRef CreateCGImageFromPixmap(Drawable pixmap);
	18	static CGImageRef CreateCGImageFromDrawableRect( Drawable drawable,
	19	int x, int y, unsigned int width, unsigned int height);
16	20
17	21	#pragma mark XImage handling
18	22

130	134	/*
131	135	*----------------------------------------------------------------------
132	136	*
133		* XGetImage --
134		*
135		* This function copies data from a pixmap or window into an XImage. It
136		* is essentially never used. At one time it was called by
137		* pTkImgPhotoDisplay, but that is no longer the case. Currently it is
138		* called two places, one of which is requesting an XY image which we do
139		* not support. It probably does not work correctly -- see the comments
140		* for TkMacOSXBitmapRepFromDrawableRect.
141		*
142		* Results:
143		* Returns a newly allocated XImage containing the data from the given
144		* rectangle of the given drawable, or NULL if the XImage could not be
145		* constructed. NOTE: If we are copying from a window on a Retina
146		* display, the dimensions of the XImage will be 2width x 2height.
147		*
148		* Side effects:
149		* None.
150		*
151		*----------------------------------------------------------------------
152		*/
153		struct pixel_fmt {int r; int g; int b; int a;};
154		static struct pixel_fmt bgra = {2, 1, 0, 3};
155		static struct pixel_fmt abgr = {3, 2, 1, 0};
156
157		XImage *
158		XGetImage(
159		Display *display,
160		Drawable drawable,
161		int x,
162		int y,
163		unsigned int width,
164		unsigned int height,
165		unsigned long plane_mask,
166		int format)
167		{
168		NSBitmapImageRep* bitmap_rep = NULL;
169		NSUInteger bitmap_fmt = 0;
170		XImage* imagePtr = NULL;
171		char* bitmap = NULL;
172		char R, G, B, A;
173		int depth = 32, offset = 0, bitmap_pad = 0;
174		unsigned int bytes_per_row, size, row, n, m;
175		unsigned int scalefactor=1, scaled_height=height, scaled_width=width;
176		NSWindow *win = TkMacOSXDrawableWindow(drawable);
177		static enum {unknown, no, yes} has_retina = unknown;
178
179		if (win && has_retina == unknown) {
180		#ifdef __clang__
181		has_retina = [win respondsToSelector:@selector(backingScaleFactor)] ?
182		yes : no;
183		#else
184		has_retina = no;
185		#endif
186		}
187
188		if (has_retina == yes) {
189		/*
190		* We only allow scale factors 1 or 2, as Apple currently does.
191		*/
192
193		#ifdef __clang__
194		scalefactor = [win backingScaleFactor] == 2.0 ? 2 : 1;
195		#endif
196		scaled_height *= scalefactor;
197		scaled_width *= scalefactor;
198		}
199
200		if (format == ZPixmap) {
201		if (width == 0 \|\| height == 0) {
202		return NULL;
203		}
204
205		bitmap_rep = TkMacOSXBitmapRepFromDrawableRect(drawable,
206		x, y, width, height);
207		if (!bitmap_rep) {
208		TkMacOSXDbgMsg("XGetImage: Failed to construct NSBitmapRep");
209		return NULL;
210		}
211		bitmap_fmt = [bitmap_rep bitmapFormat];
212		size = [bitmap_rep bytesPerPlane];
213		bytes_per_row = [bitmap_rep bytesPerRow];
214		bitmap = ckalloc(size);
215		if (!bitmap
216		\|\| (bitmap_fmt != 0 && bitmap_fmt != 1)
217		\|\| [bitmap_rep samplesPerPixel] != 4
218		\|\| [bitmap_rep isPlanar] != 0
219		\|\| bytes_per_row < 4 * scaled_width
220		\|\| size != bytes_per_row * scaled_height) {
221		TkMacOSXDbgMsg("XGetImage: Unrecognized bitmap format");
222		CFRelease(bitmap_rep);
223		return NULL;
224		}
225		memcpy(bitmap, (char *)[bitmap_rep bitmapData], size);
226		CFRelease(bitmap_rep);
227
228		/*
229		* When Apple extracts a bitmap from an NSView, it may be in either
230		* BGRA or ABGR format. For an XImage we need RGBA.
231		*/
232
233		struct pixel_fmt pixel = bitmap_fmt == 0 ? bgra : abgr;
234
235		for (row = 0, n = 0; row < scaled_height; row++, n += bytes_per_row) {
236		for (m = n; m < n + 4*scaled_width; m += 4) {
237		R = *(bitmap + m + pixel.r);
238		G = *(bitmap + m + pixel.g);
239		B = *(bitmap + m + pixel.b);
240		A = *(bitmap + m + pixel.a);
241
242		*(bitmap + m) = R;
243		*(bitmap + m + 1) = G;
244		*(bitmap + m + 2) = B;
245		*(bitmap + m + 3) = A;
246		}
247		}
248		imagePtr = XCreateImage(display, NULL, depth, format, offset,
249		(char*) bitmap, scaled_width, scaled_height,
250		bitmap_pad, bytes_per_row);
251		if (scalefactor == 2) {
252		imagePtr->pixelpower = 1;
253		}
254		} else {
255		/*
256		* There are some calls to XGetImage in the generic Tk code which pass
257		* an XYPixmap rather than a ZPixmap. XYPixmaps should be handled
258		* here.
259		*/
260		TkMacOSXDbgMsg("XGetImage does not handle XYPixmaps at the moment.");
261		}
262		return imagePtr;
263		}
264
265		/*
266		*----------------------------------------------------------------------
267		*
268	137	* DestroyImage --
269	138	*
270	139	* Destroys storage associated with an image.

299	168	* Get a single pixel from an image.
300	169	*
301	170	* Results:
302		* Returns the 32 bit pixel value.
	171	* The XColor structure contains an unsigned long field named pixel which
	172	* identifies the color. This function returns the unsigned long that
	173	* would be used as the pixel value of an XColor that has the same red
	174	* green and blue components as the XImage pixel at the specified
	175	* location.
303	176	*
304	177	* Side effects:
305	178	* None.

315	188	{
316	189	unsigned char r = 0, g = 0, b = 0;
317	190
	191	/*
	192	* Compute 8 bit red green and blue values, which are passed as inputs to
	193	* TkMacOSXRGBPixel to produce the pixel value.
	194	*/
	195
318	196	if (image && image->data) {
319	197	unsigned char srcPtr = ((unsigned char) image->data)
320	198	+ (y * image->bytes_per_line)
321	199	+ (((image->xoffset + x) * image->bits_per_pixel) / NBBY);
322	200
323	201	switch (image->bits_per_pixel) {
324		case 32:
	202	case 32: /* 8 bits per channel */
325	203	r = (((unsigned int) srcPtr) >> 16) & 0xff;
326	204	g = (((unsigned int) srcPtr) >> 8) & 0xff;
327	205	b = (((unsigned int) srcPtr) ) & 0xff;

331	209	r = srcPtr[1]; g = srcPtr[2]; b = srcPtr[3];
332	210	}*/
333	211	break;
334		case 16:
	212	case 16: /* 5 bits per channel */
335	213	r = (((unsigned short) srcPtr) >> 7) & 0xf8;
336	214	g = (((unsigned short) srcPtr) >> 2) & 0xf8;
337	215	b = (((unsigned short) srcPtr) << 3) & 0xf8;
338	216	break;
339		case 8:
	217	case 8: /* 2 bits per channel */
340	218	r = (*srcPtr << 2) & 0xc0;
341	219	g = (*srcPtr << 4) & 0xc0;
342	220	b = (*srcPtr << 6) & 0xc0;

344	222	g \|= g >> 2 \| g >> 4 \| g >> 6;
345	223	b \|= b >> 2 \| b >> 4 \| b >> 6;
346	224	break;
347		case 4: {
	225	case 4: { /* 1 bit per channel */
348	226	unsigned char c = (x % 2) ? srcPtr : (srcPtr >> 4);
349	227
350	228	r = (c & 0x04) ? 0xff : 0;

352	230	b = (c & 0x01) ? 0xff : 0;
353	231	break;
354	232	}
355		case 1:
	233	case 1: /* Black-white bitmap. */
356	234	r = g = b = ((*srcPtr) & (0x80 >> (x % 8))) ? 0xff : 0;
357	235	break;
358	236	}
359	237	}
360		return (PIXEL_MAGIC << 24) \| (r << 16) \| (g << 8) \| b;
	238
	239	return TkMacOSXRGBPixel(r, g, b);
361	240	}
362	241
363	242	/*

462	341	ximage->data = data;
463	342	ximage->obdata = NULL;
464	343
465		/*
466		* The default pixelpower is 0. This must be explicitly set to 1 in the
467		* case of an XImage extracted from a Retina display.
468		*/
469
470		ximage->pixelpower = 0;
471
472	344	if (format == ZPixmap) {
473	345	ximage->bits_per_pixel = 32;
474	346	ximage->bitmap_unit = 32;

541	413	int dest_x, /* Destination X & Y. */
542	414	int dest_y,
543	415	unsigned int width, /* Same width & height for both */
544		unsigned int height) /* distination and source. */
	416	unsigned int height) /* destination and source. */
545	417	{
546	418	TkMacOSXDrawingContext dc;
547		MacDrawable macDraw = (MacDrawable ) drawable;
	419	MacDrawable macDraw = (MacDrawable )drawable;
548	420
549	421	display->request++;
550		if (!TkMacOSXSetupDrawingContext(drawable, gc, 1, &dc)) {
	422	if (!TkMacOSXSetupDrawingContext(drawable, gc, &dc)) {
551	423	return BadDrawable;
552	424	}
553	425	if (dc.context) {

563	435	}
564	436	if (img) {
565	437
566		/*
567		* If the XImage has big pixels, the source is rescaled to reflect
568		* the actual pixel dimensions. This is not currently used, but
569		* could arise if the image were copied from a retina monitor and
570		* redrawn on an ordinary monitor.
571		*/
572
573		int pp = image->pixelpower;
574
575	438	bounds = CGRectMake(0, 0, image->width, image->height);
576		srcRect = CGRectMake(src_x<<pp, src_y<<pp, width<<pp, height<<pp);
	439	srcRect = CGRectMake(src_x, src_y, width, height);
577	440	dstRect = CGRectMake(dest_x, dest_y, width, height);
578	441	TkMacOSXDrawCGImage(drawable, gc, dc.context,
579	442	img, gc->foreground, gc->background,

607	470	}
608	471
609	472	/*
	473	*----------------------------------------------------------------------
	474	*
	475	* CreateCGImageFromDrawableRect
	476	*
	477	* Extract image data from a MacOSX drawable as a CGImage.
	478	*
	479	* This is only called by XGetImage and XCopyArea. The Tk core uses
	480	* these functions on some platforms, but on macOS the core does not
	481	* call them with a source drawable which is a window. Such calls are
	482	* used only for double-buffered drawing. Since macOS defines the
	483	* macro TK_NO_DOUBLE_BUFFERING, the generic code never calls XGetImage
	484	* or XCopyArea on macOS. Nonetheless, these function are in the stubs
	485	* table and therefore could be used by extensions.
	486	*
	487	* This implementation does not work correctly. Originally it relied on
	488	* [NSBitmapImageRep initWithFocusedViewRect:view_rect] which was
	489	* deprecated by Apple in OSX 10.14 and also required the use of other
	490	* deprecated functions such as [NSView lockFocus]. Apple's suggested
	491	* replacement is [NSView cacheDisplayInRect: toBitmapImageRep:] and that
	492	* is what is being used here. However, that method only works when the
	493	* view has a valid CGContext, and a view is only guaranteed to have a
	494	* valid context during a call to [NSView drawRect]. To further complicate
	495	* matters, cacheDisplayInRect calls [NSView drawRect]. Essentially it is
	496	* asking the view to draw a subrectangle of itself using a special
	497	* graphics context which is linked to the BitmapImageRep. But our
	498	* implementation of [NSView drawRect] does not allow recursive calls. If
	499	* called recursively it returns immediately without doing any drawing.
	500	* So the bottom line is that this function either returns a NULL pointer
	501	* or a black image. To make it useful would require a significant amount
	502	* of rewriting of the drawRect method. Perhaps the next release of OSX
	503	* will include some more helpful ways of doing this.
	504	*
	505	* Results:
	506	* Returns an NSBitmapRep representing the image of the given rectangle of
	507	* the given drawable. This object is retained. The caller is responsible
	508	* for releasing it.
	509	*
	510	* NOTE: The x,y coordinates should be relative to a coordinate system
	511	* with origin at the top left, as used by XImage and CGImage, not bottom
	512	* left as used by NSView.
	513	*
	514	* Side effects:
	515	* None
	516	*
	517	*----------------------------------------------------------------------
	518	*/
	519
	520	static CGImageRef
	521	CreateCGImageFromDrawableRect(
	522	Drawable drawable,
	523	int x,
	524	int y,
	525	unsigned int width,
	526	unsigned int height)
	527	{
	528	MacDrawable mac_drawable = (MacDrawable )drawable;
	529	CGContextRef cg_context = NULL;
	530	CGImageRef cg_image = NULL, result = NULL;
	531	NSBitmapImageRep *bitmapRep = nil;
	532	NSView *view = nil;
	533	if (mac_drawable->flags & TK_IS_PIXMAP) {
	534	/*
	535	* This MacDrawable is a bitmap, so its view is NULL.
	536	*/
	537
	538	CGRect image_rect = CGRectMake(x, y, width, height);
	539
	540	cg_context = TkMacOSXGetCGContextForDrawable(drawable);
	541	cg_image = CGBitmapContextCreateImage((CGContextRef) cg_context);
	542	if (cg_image) {
	543	result = CGImageCreateWithImageInRect(cg_image, image_rect);
	544	CGImageRelease(cg_image);
	545	}
	546	} else if (TkMacOSXGetNSViewForDrawable(mac_drawable) != nil) {
	547
	548	/*
	549	* Convert Tk top-left to NSView bottom-left coordinates.
	550	*/
	551
	552	int view_height = [view bounds].size.height;
	553	NSRect view_rect = NSMakeRect(x + mac_drawable->xOff,
	554	view_height - height - y - mac_drawable->yOff,
	555	width, height);
	556
	557	/*
	558	* Attempt to copy from the view to a bitmapImageRep. If the view does
	559	* not have a valid CGContext, doing this will silently corrupt memory
	560	* and make a big mess. So, in that case, we just return NULL.
	561	*/
	562
	563	if (view == [NSView focusView]) {
	564	bitmapRep = [view bitmapImageRepForCachingDisplayInRect: view_rect];
	565	[view cacheDisplayInRect:view_rect toBitmapImageRep:bitmapRep];
	566	result = [bitmapRep CGImage];
	567	CFRelease(bitmapRep);
	568	} else {
	569	TkMacOSXDbgMsg("No CGContext - cannot copy from screen to bitmap.");
	570	result = NULL;
	571	}
	572	} else {
	573	TkMacOSXDbgMsg("Invalid source drawable");
	574	}
	575	return result;
	576	}
	577
	578	/*
	579	*----------------------------------------------------------------------
	580	*
	581	* CreateCGImageFromPixmap --
	582	*
	583	* Create a CGImage from an X Pixmap.
	584	*
	585	* Results:
	586	* CGImage, release after use.
	587	*
	588	* Side effects:
	589	* None.
	590	*
	591	*----------------------------------------------------------------------
	592	*/
	593
	594	static CGImageRef
	595	CreateCGImageFromPixmap(
	596	Drawable pixmap)
	597	{
	598	CGImageRef img = NULL;
	599	CGContextRef context = TkMacOSXGetCGContextForDrawable(pixmap);
	600
	601	if (context) {
	602	img = CGBitmapContextCreateImage(context);
	603	}
	604	return img;
	605	}
	606
	607	/*
	608	*----------------------------------------------------------------------
	609	*
	610	* XGetImage --
	611	*
	612	* This function copies data from a pixmap or window into an XImage. It
	613	* is essentially never used. At one time it was called by
	614	* pTkImgPhotoDisplay, but that is no longer the case. Currently it is
	615	* called two places, one of which is requesting an XY image which we do
	616	* not support. It probably does not work correctly -- see the comments
	617	* for CGImageFromDrawableRect.
	618	*
	619	* Results:
	620	* Returns a newly allocated XImage containing the data from the given
	621	* rectangle of the given drawable, or NULL if the XImage could not be
	622	* constructed.
	623	*
	624	* Side effects:
	625	* None.
	626	*
	627	*----------------------------------------------------------------------
	628	*/
	629	struct pixel_fmt {int r; int g; int b; int a;};
	630	static struct pixel_fmt bgra = {2, 1, 0, 3};
	631	static struct pixel_fmt abgr = {3, 2, 1, 0};
	632
	633	XImage *
	634	XGetImage(
	635	Display *display,
	636	Drawable drawable,
	637	int x,
	638	int y,
	639	unsigned int width,
	640	unsigned int height,
	641	unsigned long plane_mask,
	642	int format)
	643	{
	644	NSBitmapImageRep* bitmapRep = nil;
	645	NSUInteger bitmap_fmt = 0;
	646	XImage* imagePtr = NULL;
	647	char* bitmap = NULL;
	648	char R, G, B, A;
	649	int depth = 32, offset = 0, bitmap_pad = 0;
	650	unsigned int bytes_per_row, size, row, n, m;
	651
	652	if (format == ZPixmap) {
	653	CGImageRef cgImage;
	654	if (width == 0 \|\| height == 0) {
	655	return NULL;
	656	}
	657
	658	cgImage = CreateCGImageFromDrawableRect(drawable, x, y, width, height);
	659	if (cgImage) {
	660	bitmapRep = [NSBitmapImageRep alloc];
	661	[bitmapRep initWithCGImage:cgImage];
	662	CFRelease(cgImage);
	663	} else {
	664	TkMacOSXDbgMsg("XGetImage: Failed to construct CGImage");
	665	return NULL;
	666	}
	667	bitmap_fmt = [bitmapRep bitmapFormat];
	668	size = [bitmapRep bytesPerPlane];
	669	bytes_per_row = [bitmapRep bytesPerRow];
	670	bitmap = ckalloc(size);
	671	if (!bitmap
	672	\|\| (bitmap_fmt != 0 && bitmap_fmt != 1)
	673	\|\| [bitmapRep samplesPerPixel] != 4
	674	\|\| [bitmapRep isPlanar] != 0
	675	\|\| bytes_per_row < 4 * width
	676	\|\| size != bytes_per_row * height) {
	677	TkMacOSXDbgMsg("XGetImage: Unrecognized bitmap format");
	678	CFRelease(bitmapRep);
	679	return NULL;
	680	}
	681	memcpy(bitmap, (char *)[bitmapRep bitmapData], size);
	682	CFRelease(bitmapRep);
	683
	684	/*
	685	* When Apple extracts a bitmap from an NSView, it may be in either
	686	* BGRA or ABGR format. For an XImage we need RGBA.
	687	*/
	688
	689	struct pixel_fmt pixel = bitmap_fmt == 0 ? bgra : abgr;
	690
	691	for (row = 0, n = 0; row < height; row++, n += bytes_per_row) {
	692	for (m = n; m < n + 4*width; m += 4) {
	693	R = *(bitmap + m + pixel.r);
	694	G = *(bitmap + m + pixel.g);
	695	B = *(bitmap + m + pixel.b);
	696	A = *(bitmap + m + pixel.a);
	697
	698	*(bitmap + m) = R;
	699	*(bitmap + m + 1) = G;
	700	*(bitmap + m + 2) = B;
	701	*(bitmap + m + 3) = A;
	702	}
	703	}
	704	imagePtr = XCreateImage(display, NULL, depth, format, offset,
	705	(char*) bitmap, width, height,
	706	bitmap_pad, bytes_per_row);
	707	} else {
	708	/*
	709	* There are some calls to XGetImage in the generic Tk code which pass
	710	* an XYPixmap rather than a ZPixmap. XYPixmaps should be handled
	711	* here.
	712	*/
	713	TkMacOSXDbgMsg("XGetImage does not handle XYPixmaps at the moment.");
	714	}
	715	return imagePtr;
	716	}
	717
	718	/*
	719	*----------------------------------------------------------------------
	720	*
	721	* XCopyArea --
	722	*
	723	* Copies image data from one drawable to another.
	724	*
	725	* Results:
	726	* None.
	727	*
	728	* Side effects:
	729	* Image data is moved from a window or bitmap to a second window or bitmap.
	730	*
	731	*----------------------------------------------------------------------
	732	*/
	733
	734	int
	735	XCopyArea(
	736	Display display, / Display. */
	737	Drawable src, /* Source drawable. */
	738	Drawable dst, /* Destination drawable. */
	739	GC gc, /* GC to use. */
	740	int src_x, /* X & Y, width & height */
	741	int src_y, /* define the source rectangle */
	742	unsigned int width, /* that will be copied. */
	743	unsigned int height,
	744	int dest_x, /* Dest X & Y on dest rect. */
	745	int dest_y)
	746	{
	747	TkMacOSXDrawingContext dc;
	748	MacDrawable srcDraw = (MacDrawable )src;
	749	CGImageRef img = NULL;
	750	CGRect bounds, srcRect, dstRect;
	751
	752	display->request++;
	753	if (!width \|\| !height) {
	754	return BadDrawable;
	755	}
	756
	757	if (!TkMacOSXSetupDrawingContext(dst, gc, &dc)) {
	758	TkMacOSXDbgMsg("Failed to setup drawing context.");
	759	return BadDrawable;
	760	}
	761
	762	if (!dc.context) {
	763	TkMacOSXDbgMsg("Invalid destination drawable - no context.");
	764	return BadDrawable;
	765	}
	766
	767	if (srcDraw->flags & TK_IS_PIXMAP) {
	768	img = CreateCGImageFromPixmap(src);
	769	} else if (TkMacOSXGetNSWindowForDrawable(src)) {
	770	img = CreateCGImageFromDrawableRect(src, src_x, src_y, width, height);
	771	} else {
	772	TkMacOSXDbgMsg("Invalid source drawable - neither window nor pixmap.");
	773	}
	774
	775	if (img) {
	776	bounds = CGRectMake(0, 0, srcDraw->size.width, srcDraw->size.height);
	777	srcRect = CGRectMake(src_x, src_y, width, height);
	778	dstRect = CGRectMake(dest_x, dest_y, width, height);
	779	TkMacOSXDrawCGImage(dst, gc, dc.context, img,
	780	gc->foreground, gc->background, bounds, srcRect, dstRect);
	781	CFRelease(img);
	782	} else {
	783	TkMacOSXDbgMsg("Failed to construct CGImage.");
	784	}
	785
	786	TkMacOSXRestoreDrawingContext(&dc);
	787	return Success;
	788	}
	789
	790	/*
	791	*----------------------------------------------------------------------
	792	*
	793	* XCopyPlane --
	794	*
	795	* Copies a bitmap from a source drawable to a destination drawable. The
	796	* plane argument specifies which bit plane of the source contains the
	797	* bitmap. Note that this implementation ignores the gc->function.
	798	*
	799	* Results:
	800	* None.
	801	*
	802	* Side effects:
	803	* Changes the destination drawable.
	804	*
	805	*----------------------------------------------------------------------
	806	*/
	807
	808	int
	809	XCopyPlane(
	810	Display display, / Display. */
	811	Drawable src, /* Source drawable. */
	812	Drawable dst, /* Destination drawable. */
	813	GC gc, /* GC to use. */
	814	int src_x, /* X & Y, width & height */
	815	int src_y, /* define the source rectangle */
	816	unsigned int width, /* that will be copied. */
	817	unsigned int height,
	818	int dest_x, /* Dest X & Y on dest rect. */
	819	int dest_y,
	820	unsigned long plane) /* Which plane to copy. */
	821	{
	822	TkMacOSXDrawingContext dc;
	823	MacDrawable srcDraw = (MacDrawable )src;
	824	MacDrawable dstDraw = (MacDrawable )dst;
	825	CGRect bounds, srcRect, dstRect;
	826	display->request++;
	827	if (!width \|\| !height) {
	828	/* TkMacOSXDbgMsg("Drawing of empty area requested"); */
	829	return BadDrawable;
	830	}
	831	if (plane != 1) {
	832	Tcl_Panic("Unexpected plane specified for XCopyPlane");
	833	}
	834	if (srcDraw->flags & TK_IS_PIXMAP) {
	835	if (!TkMacOSXSetupDrawingContext(dst, gc, &dc)) {
	836	return BadDrawable;
	837	}
	838
	839	CGContextRef context = dc.context;
	840
	841	if (context) {
	842	CGImageRef img = CreateCGImageFromPixmap(src);
	843
	844	if (img) {
	845	TkpClipMask clipPtr = (TkpClipMask ) gc->clip_mask;
	846	unsigned long imageBackground = gc->background;
	847
	848	if (clipPtr && clipPtr->type == TKP_CLIP_PIXMAP) {
	849	srcRect = CGRectMake(src_x, src_y, width, height);
	850	CGImageRef mask = CreateCGImageFromPixmap(
	851	clipPtr->value.pixmap);
	852	CGImageRef submask = CGImageCreateWithImageInRect(
	853	img, srcRect);
	854	CGRect rect = CGRectMake(dest_x, dest_y, width, height);
	855
	856	rect = CGRectOffset(rect, dstDraw->xOff, dstDraw->yOff);
	857	CGContextSaveGState(context);
	858
	859	/*
	860	* Move the origin of the destination to top left.
	861	*/
	862
	863	CGContextTranslateCTM(context,
	864	0, rect.origin.y + CGRectGetMaxY(rect));
	865	CGContextScaleCTM(context, 1, -1);
	866
	867	/*
	868	* Fill with the background color, clipping to the mask.
	869	*/
	870
	871	CGContextClipToMask(context, rect, submask);
	872	TkMacOSXSetColorInContext(gc, gc->background, dc.context);
	873	CGContextFillRect(context, rect);
	874
	875	/*
	876	* Fill with the foreground color, clipping to the
	877	* intersection of img and mask.
	878	*/
	879
	880	CGImageRef subimage = CGImageCreateWithImageInRect(
	881	img, srcRect);
	882	CGContextClipToMask(context, rect, subimage);
	883	TkMacOSXSetColorInContext(gc, gc->foreground, context);
	884	CGContextFillRect(context, rect);
	885	CGContextRestoreGState(context);
	886	CGImageRelease(img);
	887	CGImageRelease(mask);
	888	CGImageRelease(submask);
	889	CGImageRelease(subimage);
	890	} else {
	891	bounds = CGRectMake(0, 0,
	892	srcDraw->size.width, srcDraw->size.height);
	893	srcRect = CGRectMake(src_x, src_y, width, height);
	894	dstRect = CGRectMake(dest_x, dest_y, width, height);
	895	TkMacOSXDrawCGImage(dst, gc, dc.context, img,
	896	gc->foreground, imageBackground, bounds,
	897	srcRect, dstRect);
	898	CGImageRelease(img);
	899	}
	900	} else {
	901	/* no image */
	902	TkMacOSXDbgMsg("Invalid source drawable");
	903	}
	904	} else {
	905	TkMacOSXDbgMsg("Invalid destination drawable - "
	906	"could not get a bitmap context.");
	907	}
	908	TkMacOSXRestoreDrawingContext(&dc);
	909	return Success;
	910	} else {
	911	/*
	912	* Source drawable is a Window, not a Pixmap.
	913	*/
	914
	915	return XCopyArea(display, src, dst, gc, src_x, src_y, width, height,
	916	dest_x, dest_y);
	917	}
	918	}
	919
	920	/*
610	921	* Local Variables:
611	922	* mode: objc
612	923	* c-basic-offset: 4

+268

-172

macosx/tkMacOSXInit.c less more

13	13	*/
14	14
15	15	#include "tkMacOSXPrivate.h"
16
17		#include <sys/stat.h>
18	16	#include <dlfcn.h>
19	17	#include <objc/objc-auto.h>
	18	#include <sys/stat.h>
20	19
21	20	static char tkLibPath[PATH_MAX + 1] = "";
22	21

27	26
28	27	static char scriptPath[PATH_MAX + 1] = "";
29	28
	29	/*
	30	* Forward declarations...
	31	*/
	32
	33	static int TkMacOSXGetAppPathCmd(ClientData cd, Tcl_Interp *ip,
	34	int objc, Tcl_Obj *const objv[]);
	35
30	36	#pragma mark TKApplication(TKInit)
31	37
32	38	@implementation TKApplication
33	39	@synthesize poolLock = _poolLock;
34		@synthesize macMinorVersion = _macMinorVersion;
	40	@synthesize macOSVersion = _macOSVersion;
35	41	@synthesize isDrawing = _isDrawing;
	42	@synthesize needsToDraw = _needsToDraw;
36	43	@end
37	44
38	45	/*

74	81	#define observe(n, s) \
75	82	[nc addObserver:self selector:@selector(s) name:(n) object:nil]
76	83	observe(NSApplicationDidBecomeActiveNotification, applicationActivate:);
77		observe(NSApplicationDidResignActiveNotification, applicationDeactivate:);
	84	observe(NSApplicationWillResignActiveNotification, applicationDeactivate:);
78	85	observe(NSApplicationDidUnhideNotification, applicationShowHide:);
79	86	observe(NSApplicationDidHideNotification, applicationShowHide:);
80	87	observe(NSApplicationDidChangeScreenParametersNotification, displayChanged:);

84	91
85	92	-(void)applicationWillFinishLaunching:(NSNotification *)aNotification
86	93	{
	94	(void)aNotification;
87	95
88	96	/*
89	97	* Initialize notifications.

94	102	#endif
95	103	[self _setupWindowNotifications];
96	104	[self _setupApplicationNotifications];
	105	}
	106
	107	-(void)applicationDidFinishLaunching:(NSNotification *)notification
	108	{
	109	(void)notification;
	110
	111	/*
	112	* Initialize event processing.
	113	*/
	114
	115	TkMacOSXInitAppleEvents(_eventInterp);
	116
	117	/*
	118	* Initialize the graphics context.
	119	*/
	120	TkMacOSXUseAntialiasedText(_eventInterp, -1);
	121	TkMacOSXInitCGDrawing(_eventInterp, TRUE, 0);
97	122
98	123	/*
99	124	* Construct the menu bar.
100	125	*/
	126
101	127	_defaultMainMenu = nil;
102	128	[self _setupMenus];
103	129
104		/*
105		* Initialize event processing.
106		*/
107		TkMacOSXInitAppleEvents(_eventInterp);
108
109		/*
110		* Initialize the graphics context.
111		*/
112		TkMacOSXUseAntialiasedText(_eventInterp, -1);
113		TkMacOSXInitCGDrawing(_eventInterp, TRUE, 0);
114		}
115
116		-(void)applicationDidFinishLaunching:(NSNotification *)notification
117		{
118	130	/*
119	131	* It is not safe to force activation of the NSApp until this method is
120	132	* called. Activating too early can cause the menu bar to be unresponsive.
121	133	* The call to activateIgnoringOtherApps was moved here to avoid this.
122		* However, with the release of macOS 10.15 (Catalina) this was no longer
123		* sufficient. (See ticket bf93d098d7.) Apparently apps were being
124		* activated automatically, and this was sometimes being done too early.
125		* As a workaround we deactivate and then reactivate the app, even though
126		* Apple says that "Normally, you shouldn’t invoke this method".
127		*/
128
129		[NSApp deactivate];
	134	* However, with the release of macOS 10.15 (Catalina) that was no longer
	135	* sufficient. (See ticket bf93d098d7.) The call to setActivationPolicy
	136	* needed to be moved into this function as well.
	137	*/
	138
	139	[NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
130	140	[NSApp activateIgnoringOtherApps: YES];
131	141
132	142	/*

135	145	*/
136	146
137	147	[NSApp _lockAutoreleasePool];
138		while (Tcl_DoOneEvent(TCL_WINDOW_EVENTS\| TCL_DONT_WAIT)) {}
	148	while (Tcl_DoOneEvent(TCL_WINDOW_EVENTS\|TCL_DONT_WAIT)) {}
139	149	[NSApp _unlockAutoreleasePool];
140	150	}
141	151

155	165	/*
156	166	* Record the OS version we are running on.
157	167	*/
158		int minorVersion;
	168
	169	int minorVersion, majorVersion;
159	170	#if MAC_OS_X_VERSION_MAX_ALLOWED < 101000
160	171	Gestalt(gestaltSystemVersionMinor, (SInt32*)&minorVersion);
	172	majorVersion = 10;
161	173	#else
162	174	NSOperatingSystemVersion systemVersion;
163	175	systemVersion = [[NSProcessInfo processInfo] operatingSystemVersion];
	176	majorVersion = systemVersion.majorVersion;
164	177	minorVersion = systemVersion.minorVersion;
165	178	#endif
166		[NSApp setMacMinorVersion: minorVersion];
	179	[NSApp setMacOSVersion: 10000majorVersion + 100minorVersion];
167	180
168	181	/*
169	182	* We are not drawing right now.

176	189	*/
177	190
178	191	[self setDelegate:self];
179
180		/*
181		* Make sure we are allowed to open windows.
182		*/
183
184		[NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
185	192
186	193	/*
187	194	* If no icon has been set from an Info.plist file, use the Wish icon from

264	271	*----------------------------------------------------------------------
265	272	*/
266	273
	274	/*
	275	* Helper function which closes the shared NSFontPanel and NSColorPanel.
	276	*/
	277
	278	static void closePanels(
	279	void)
	280	{
	281	if ([NSFontPanel sharedFontPanelExists]) {
	282	[[NSFontPanel sharedFontPanel] orderOut:nil];
	283	}
	284	if ([NSColorPanel sharedColorPanelExists]) {
	285	[[NSColorPanel sharedColorPanel] orderOut:nil];
	286	}
	287	}
	288
	289	/*
	290	* This custom exit procedure is called by Tcl_Exit in place of the exit
	291	* function from the C runtime. It calls the terminate method of the
	292	* NSApplication class (superTerminate for a TKApplication). The purpose of
	293	* doing this is to ensure that the NSFontPanel and the NSColorPanel are closed
	294	* before the process exits, and that the application state is recorded
	295	* correctly for all termination scenarios.
	296	*
	297	* TkpWantsExitProc tells Tcl_AppInit whether to install our custom exit proc,
	298	* which terminates the process by calling [NSApplication terminate]. This
	299	* does not work correctly if the process is part of an exec pipeline, so it is
	300	* only done if the process was launched by the launcher or if both stdin and
	301	* stdout are ttys. To disable using the custom exit proc altogether, undefine
	302	* USE_CUSTOM_EXIT_PROC.
	303	*/
	304
	305	#if defined(USE_CUSTOM_EXIT_PROC)
	306	static Bool doCleanupFromExit = NO;
	307
	308	int TkpWantsExitProc(void) {
	309	return doCleanupFromExit == YES;
	310	}
	311
	312	TCL_NORETURN void TkpExitProc(
	313	void *clientdata)
	314	{
	315	Bool doCleanup = doCleanupFromExit;
	316	if (doCleanupFromExit) {
	317	doCleanupFromExit = NO; /* prevent possible recursive call. */
	318	closePanels();
	319	}
	320
	321	/*
	322	* Tcl_Exit does not call Tcl_Finalize if there is an exit proc installed.
	323	*/
	324
	325	Tcl_Finalize();
	326	if (doCleanup == YES) {
	327	[(TKApplication )NSApp superTerminate:nil]; / Should not return. */
	328	}
	329	exit((long)clientdata); /* Convince the compiler that we don't return. */
	330	}
	331	#endif
	332
	333	/*
	334	* This signal handler is installed for the SIGINT, SIGHUP and SIGTERM signals
	335	* so that normal finalization occurs when a Tk app is killed by one of these
	336	* signals (e.g when ^C is pressed while running Wish in the shell). It calls
	337	* Tcl_Exit instead of the C runtime exit function called by the default handler.
	338	* This is consistent with the Tcl_Exit manual page, which says that Tcl_Exit
	339	* should always be called instead of exit. When Tk is killed by a signal we
	340	* return exit status 1.
	341	*/
	342
	343	static void TkMacOSXSignalHandler(TCL_UNUSED(int)) {
	344
	345	Tcl_Exit(1);
	346	}
	347
267	348	int
268	349	TkpInit(
269	350	Tcl_Interp *interp)

271	352	static int initialized = 0;
272	353
273	354	/*
274		* Since it is possible for TkInit to be called multiple times and we
275		* don't want to do the following initialization multiple times we protect
276		* against doing it more than once.
	355	* TkpInit can be called multiple times with different interpreters. But
	356	* The application initialization should only be done onece.
277	357	*/
278	358
279	359	if (!initialized) {
280	360	struct stat st;
281
282		initialized = 1;
	361	Bool shouldOpenConsole = NO;
	362	Bool stdinIsNullish = (!isatty(0) &&
	363	(fstat(0, &st) \|\| (S_ISCHR(st.st_mode) && st.st_blocks == 0)));
283	364
284	365	/*
285	366	* Initialize/check OS version variable for runtime checks.

289	370	# error Mac OS X 10.6 required
290	371	#endif
291	372
	373	initialized = 1;
	374
292	375	#ifdef TK_FRAMEWORK
	376
293	377	/*
294	378	* When Tk is in a framework, force tcl_findLibrary to look in the
295	379	* framework scripts directory.

304	388	# endif
305	389	}
306	390	#endif
307
308		/*
309		* FIXME: Close stdin & stdout for remote debugging otherwise we will
310		* fight with gdb for stdin & stdout
311		*/
312
313		if (getenv("XCNOSTDIN") != NULL) {
314		close(0);
315		close(1);
316		}
317	391
318	392	/*
319	393	* Instantiate our NSApplication object. This needs to be done before

330	404	nil]];
331	405	[TKApplication sharedApplication];
332	406	[pool drain];
	407
	408	/*
	409	* WARNING: The finishLaunching method runs asynchronously. This
	410	* creates a race between the initialization of the NSApplication and
	411	* the initialization of Tk. If Tk wins the race bad things happen
	412	* with the root window (see below). If the NSApplication wins then an
	413	* AppleEvent created during launch, e.g. by dropping a file icon on
	414	* the application icon, will be delivered before the procedure meant
	415	* to to handle the AppleEvent has been defined. This is handled in
	416	* tkMacOSXHLEvents.c by scheduling a timer event to handle the
	417	* ApplEvent later, after the required procedure has been defined.
	418	*/
	419
333	420	[NSApp _setup:interp];
334
335		/*
336		* WARNING: The finishLaunching method runs asynchronously, apparently
337		* in a separate thread. This creates a race between the
338		* initialization of the NSApplication and the initialization of Tk.
339		* If Tk wins the race bad things happen with the root window (see
340		* below). If the NSApplication wins then an AppleEvent created during
341		* launch, e.g. by dropping a file icon on the application icon, will
342		* be delivered before the procedure meant to to handle the AppleEvent
343		* has been defined. This is now handled by processing the AppleEvent
344		* as an idle task. See tkMacOSXHLEvents.c.
345		*/
346
347	421	[NSApp finishLaunching];
348	422
349	423	/*

370	444	Tcl_DoOneEvent(TCL_WINDOW_EVENTS \| TCL_DONT_WAIT);
371	445
372	446	/*
373		* If we don't have a TTY and stdin is a special character file of
374		* length 0, (e.g. /dev/null, which is what Finder sets when double
375		* clicking Wish) then use the Tk based console interpreter.
376		*/
377
378		if (getenv("TK_CONSOLE") \|\|
379		(!isatty(0) && (fstat(0, &st) \|\|
380		(S_ISCHR(st.st_mode) && st.st_blocks == 0)))) {
	447	* Decide whether to open a console window. If the TK_CONSOLE
	448	* environment variable is not defined we only show the console if
	449	* stdin is not a tty and there is no startup script.
	450	*/
	451
	452	if (getenv("TK_CONSOLE")) {
	453	shouldOpenConsole = YES;
	454	} else if (stdinIsNullish && Tcl_GetStartupScript(NULL) == NULL) {
	455	const char *intvar = Tcl_GetVar2(interp, "tcl_interactive",
	456	NULL, TCL_GLOBAL_ONLY);
	457	if (intvar == NULL) {
	458	Tcl_SetVar2(interp, "tcl_interactive", NULL, "1",
	459	TCL_GLOBAL_ONLY);
	460	}
	461
	462	#if defined(USE_CUSTOM_EXIT_PROC)
	463	doCleanupFromExit = YES;
	464	#endif
	465
	466	shouldOpenConsole = YES;
	467	}
	468	if (shouldOpenConsole) {
381	469	Tk_InitConsoleChannels(interp);
382	470	Tcl_RegisterChannel(interp, Tcl_GetStdChannel(TCL_STDIN));
383	471	Tcl_RegisterChannel(interp, Tcl_GetStdChannel(TCL_STDOUT));
384	472	Tcl_RegisterChannel(interp, Tcl_GetStdChannel(TCL_STDERR));
385
386		/*
387		* Only show the console if we don't have a startup script and
388		* tcl_interactive hasn't been set already.
389		*/
390
391		if (Tcl_GetStartupScript(NULL) == NULL) {
392		const char *intvar = Tcl_GetVar2(interp,
393		"tcl_interactive", NULL, TCL_GLOBAL_ONLY);
394
395		if (intvar == NULL) {
396		Tcl_SetVar2(interp, "tcl_interactive", NULL, "1",
397		TCL_GLOBAL_ONLY);
398		}
399		}
400	473	if (Tk_CreateConsoleWindow(interp) == TCL_ERROR) {
401	474	return TCL_ERROR;
402	475	}
	476	} else if (stdinIsNullish) {
	477
	478	/*
	479	* When launched as a macOS application with no console,
	480	* redirect stderr and stdout to /dev/null. This avoids waiting
	481	* forever for those files to become writable if the underlying
	482	* Tcl program tries to write to them with a puts command.
	483	*/
	484
	485	FILE *null = fopen("/dev/null", "w");
	486	dup2(fileno(null), STDOUT_FILENO);
	487	dup2(fileno(null), STDERR_FILENO);
	488	#if defined(USE_CUSTOM_EXIT_PROC)
	489	doCleanupFromExit = YES;
	490	#endif
	491	}
	492
	493	/*
	494	* FIXME: Close stdin & stdout for remote debugging if XCNOSTDIN is
	495	* set. Otherwise we will fight with gdb for stdin & stdout
	496	*/
	497
	498	if (getenv("XCNOSTDIN") != NULL) {
	499	close(0);
	500	close(1);
403	501	}
404	502
405	503	/*

409	507	*/
410	508
411	509	TkMacOSXServices_Init(interp);
412		}
	510
	511	/*
	512	* The root window has been created and mapped, but XMapWindow deferred its
	513	* call to makeKeyAndOrderFront because the first call to XMapWindow
	514	* occurs too early in the initialization process for that. Process idle
	515	* tasks now, so the root window is configured, then order it front.
	516	*/
	517
	518	while(Tcl_DoOneEvent(TCL_IDLE_EVENTS)) {};
	519	for (NSWindow *window in [NSApp windows]) {
	520	TkWindow *winPtr = TkMacOSXGetTkWindow(window);
	521	if (winPtr && Tk_IsMapped(winPtr)) {
	522	[window makeKeyAndOrderFront:NSApp];
	523	break;
	524	}
	525	}
	526
	527	# if defined(USE_CUSTOM_EXIT_PROC)
	528
	529	if ((isatty(0) && isatty(1))) {
	530	doCleanupFromExit = YES;
	531	}
	532
	533	# endif
	534
	535	/*
	536	* Install a signal handler for SIGINT, SIGHUP and SIGTERM which uses
	537	* Tcl_Exit instead of exit so that normal cleanup takes place if a TK
	538	* application is killed with one of these signals.
	539	*/
	540
	541	signal(SIGINT, TkMacOSXSignalHandler);
	542	signal(SIGHUP, TkMacOSXSignalHandler);
	543	signal(SIGTERM, TkMacOSXSignalHandler);
	544	}
	545
	546	/*
	547	* Initialization steps that are needed for all interpreters.
	548	*/
413	549
414	550	if (tkLibPath[0] != '\0') {
415	551	Tcl_SetVar2(interp, "tk_library", NULL, tkLibPath, TCL_GLOBAL_ONLY);

424	560	TkMacOSXStandardAboutPanelObjCmd, NULL, NULL);
425	561	Tcl_CreateObjCommand(interp, "::tk::mac::iconBitmap",
426	562	TkMacOSXIconBitmapObjCmd, NULL, NULL);
427		Tcl_CreateObjCommand(interp, "::tk::mac::GetAppPath", TkMacOSXGetAppPath, NULL, NULL);
	563	Tcl_CreateObjCommand(interp, "::tk::mac::GetAppPath",
	564	TkMacOSXGetAppPathCmd, NULL, NULL);
	565
428	566	return TCL_OK;
429	567	}
430	568

464	602	}
465	603	Tcl_DStringAppend(namePtr, name, -1);
466	604	}
467
468		/*
469		*----------------------------------------------------------------------
470		*
471		* TkMacOSXGetAppPath --
	605
	606	/*
	607	*----------------------------------------------------------------------
	608	*
	609	* TkMacOSXGetAppPathCmd --
472	610	*
473	611	* Returns the path of the Wish application bundle.
474	612	*

480	618	*
481	619	*----------------------------------------------------------------------
482	620	*/
483		int TkMacOSXGetAppPath(
484		ClientData cd,
485		Tcl_Interp *ip,
486		int objc,
487		Tcl_Obj *const objv[])
488		{
489
490		CFURLRef mainBundleURL = CFBundleCopyBundleURL(CFBundleGetMainBundle());
491
492
493		/*
494		* Convert the URL reference into a string reference.
495		*/
496
497		CFStringRef appPath = CFURLCopyFileSystemPath(mainBundleURL, kCFURLPOSIXPathStyle);
498
499		/*
500		* Get the system encoding method.
501		*/
502
503		CFStringEncoding encodingMethod = CFStringGetSystemEncoding();
504
505		/*
506		* Convert the string reference into a C string.
507		*/
508
509		char path = (char ) CFStringGetCStringPtr(appPath, encodingMethod);
510
511		Tcl_SetResult(ip, path, NULL);
512
513		CFRelease(mainBundleURL);
514		CFRelease(appPath);
515		return TCL_OK;
516
517		}
518
	621
	622	static int
	623	TkMacOSXGetAppPathCmd(
	624	TCL_UNUSED(void *),
	625	Tcl_Interp *interp,
	626	int objc,
	627	Tcl_Obj *const objv[])
	628	{
	629	if (objc != 1) {
	630	Tcl_WrongNumArgs(interp, 1, objv, NULL);
	631	return TCL_ERROR;
	632	}
	633
	634	/*
	635	* Get the application path URL and convert it to a string path reference.
	636	*/
	637
	638	CFURLRef mainBundleURL = CFBundleCopyBundleURL(CFBundleGetMainBundle());
	639	CFStringRef appPath =
	640	CFURLCopyFileSystemPath(mainBundleURL, kCFURLPOSIXPathStyle);
	641
	642	/*
	643	* Convert (and copy) the string reference into a Tcl result.
	644	*/
	645
	646	Tcl_SetObjResult(interp, Tcl_NewStringObj(
	647	CFStringGetCStringPtr(appPath, CFStringGetSystemEncoding()), -1));
	648
	649	CFRelease(mainBundleURL);
	650	CFRelease(appPath);
	651	return TCL_OK;
	652	}
	653
519	654	/*
520	655	*----------------------------------------------------------------------
521	656	*

582	717	CFURLRef scriptFldrURL;
583	718	char startupScript[PATH_MAX + 1];
584	719
585		if (CFURLGetFileSystemRepresentation (appMainURL, true,
	720	if (CFURLGetFileSystemRepresentation(appMainURL, true,
586	721	(unsigned char *) startupScript, PATH_MAX)) {
587	722	Tcl_SetStartupScript(Tcl_NewStringObj(startupScript,-1), NULL);
588	723	scriptFldrURL = CFURLCreateCopyDeletingLastPathComponent(NULL,

619	754
620	755	MODULE_SCOPE void*
621	756	TkMacOSXGetNamedSymbol(
622		const char* module,
623		const char* symbol)
	757	TCL_UNUSED(const char *),
	758	const char *symbol)
624	759	{
625	760	void *addr = dlsym(RTLD_NEXT, symbol);
	761
626	762	if (!addr) {
627	763	(void) dlerror(); /* Clear dlfcn error state */
628	764	}
629	765	return addr;
630		}
631
632		/*
633		*----------------------------------------------------------------------
634		*
635		* TkMacOSXGetStringObjFromCFString --
636		*
637		* Get a string object from a CFString as efficiently as possible.
638		*
639		* Results:
640		* New string object or NULL if conversion failed.
641		*
642		* Side effects:
643		* None.
644		*
645		*----------------------------------------------------------------------
646		*/
647
648		MODULE_SCOPE Tcl_Obj*
649		TkMacOSXGetStringObjFromCFString(
650		CFStringRef str)
651		{
652		Tcl_Obj *obj = NULL;
653		const char *c = CFStringGetCStringPtr(str, kCFStringEncodingUTF8);
654
655		if (c) {
656		obj = Tcl_NewStringObj(c, -1);
657		} else {
658		CFRange all = CFRangeMake(0, CFStringGetLength(str));
659		CFIndex len;
660
661		if (CFStringGetBytes(str, all, kCFStringEncodingUTF8, 0, false, NULL,
662		0, &len) > 0 && len < INT_MAX) {
663		obj = Tcl_NewObj();
664		Tcl_SetObjLength(obj, len);
665		CFStringGetBytes(str, all, kCFStringEncodingUTF8, 0, false,
666		(UInt8*) obj->bytes, len, NULL);
667		}
668		}
669		return obj;
670	766	}
671	767
672	768	/*

+2

-26

macosx/tkMacOSXInt.h less more

116	116	MODULE_SCOPE TkMacOSXEmbedHandler *tkMacOSXEmbedHandler;
117	117
118	118	/*
119		* GC CGColorRef cache for tkMacOSXColor.c
120		*/
121
122		typedef struct {
123		unsigned long cachedForeground;
124		CGColorRef cachedForegroundColor;
125		unsigned long cachedBackground;
126		CGColorRef cachedBackgroundColor;
127		} TkpGCCache;
128
129		MODULE_SCOPE TkpGCCache *TkpGetGCCache(GC gc);
130		MODULE_SCOPE void TkpInitGCCache(GC gc);
131		MODULE_SCOPE void TkpFreeGCCache(GC gc);
132
133		/*
134	119	* Undef compatibility platform types defined above.
135	120	*/
136	121

179	164	#define TK_MACOSX_HANDLE_EVENT_IMMEDIATELY 1024
180	165
181	166	/*
182		* Defines for tkTextDisp.c
	167	* Defines for tkTextDisp.c and tkFont.c
183	168	*/
184	169
185	170	#define TK_LAYOUT_WITH_BASE_CHUNKS 1

190	175	*/
191	176
192	177	MODULE_SCOPE void TkMacOSXDefaultStartupScript(void);
193		#if 0
194		MODULE_SCOPE int XSetClipRectangles(Display *d, GC gc, int clip_x_origin,
195		int clip_y_origin, XRectangle* rectangles, int n, int ordering);
196		#endif
197	178	MODULE_SCOPE void TkpClipDrawableToRect(Display *display, Drawable d, int x,
198	179	int y, int width, int height);
199		MODULE_SCOPE void TkpRetainRegion(TkRegion r);
200		MODULE_SCOPE void TkpReleaseRegion(TkRegion r);
201	180	MODULE_SCOPE void TkpShiftButton(NSButton *button, NSPoint delta);
202		MODULE_SCOPE Bool TkpAppIsDrawing(void);
203		MODULE_SCOPE void TkpDisplayWindow(Tk_Window tkwin);
204		MODULE_SCOPE Bool TkTestLogDisplay(void);
205		MODULE_SCOPE Bool TkMacOSXInDarkMode(Tk_Window tkwin);
	181	MODULE_SCOPE Bool TkTestLogDisplay(Drawable drawable);
206	182
207	183	/*
208	184	* Include the stubbed internal platform-specific API.

+354

-366

macosx/tkMacOSXKeyEvent.c less more

6	6	* Copyright 2001-2009, Apple Inc.
7	7	* Copyright (c) 2006-2009 Daniel A. Steffen <das@users.sourceforge.net>
8	8	* Copyright (c) 2012 Adrian Robert.
9		* Copyright 2015-2019 Marc Culler.
	9	* Copyright 2015-2020 Marc Culler.
10	10	*
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.

15	15	#include "tkMacOSXPrivate.h"
16	16	#include "tkMacOSXInt.h"
17	17	#include "tkMacOSXConstants.h"
	18	#include "tkMacOSXWm.h"
	19
	20	/*
	21	* See tkMacOSXPrivate.h for macros related to key event processing.
	22	*/
18	23
19	24	/*
20	25	#ifdef TK_MAC_DEBUG
21	26	#define TK_MAC_DEBUG_KEYBOARD
22	27	#endif
23	28	*/
	29
24	30	#define NS_KEYLOG 0
25
26		static Tk_Window keyboardGrabWinPtr = NULL;
27		/* Current keyboard grab window. */
28		static NSWindow *keyboardGrabNSWindow = nil;
29		/* NSWindow for the current keyboard grab
30		* window. */
	31	#define XEVENT_MOD_MASK (ControlMask \| Mod1Mask \| Mod3Mask \| Mod4Mask)
	32	static Tk_Window keyboardGrabWinPtr = NULL; /* Current keyboard grab window. */
	33	static NSWindow keyboardGrabNSWindow = nil; / Its underlying NSWindow.*/
31	34	static NSModalSession modalSession = nil;
32	35	static BOOL processingCompose = NO;
33	36	static Tk_Window composeWin = NULL;
34	37	static int caret_x = 0, caret_y = 0, caret_height = 0;
35		static unsigned short releaseCode;
36
37		static void setupXEvent(XEvent xEvent, NSWindow w, unsigned int state);
38		static unsigned isFunctionKey(unsigned int code);
39
	38	static void setupXEvent(XEvent *xEvent, Tk_Window tkwin, NSUInteger modifiers);
	39	static void setXEventPoint(XEvent xEvent, Tk_Window tkwin, NSWindow w);
	40	static NSUInteger textInputModifiers;
40	41
41	42	#pragma mark TKApplication(TKKeyEvent)
42	43

47	48	#ifdef TK_MAC_DEBUG_EVENTS
48	49	TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, theEvent);
49	50	#endif
50		NSWindow *w;
	51	NSWindow *w = [theEvent window];
	52	TkWindow winPtr = TkMacOSXGetTkWindow(w), grabWinPtr, *focusWinPtr;
	53	Tk_Window tkwin = (Tk_Window)winPtr;
51	54	NSEventType type = [theEvent type];
	55	NSUInteger virtual = [theEvent keyCode];
52	56	NSUInteger modifiers = ([theEvent modifierFlags] &
53	57	NSDeviceIndependentModifierFlagsMask);
54		NSUInteger len = 0;
55		BOOL repeat = NO;
56		unsigned short keyCode = [theEvent keyCode];
57		NSString characters = nil, charactersIgnoringModifiers = nil;
	58	XEvent xEvent;
	59	MacKeycode macKC;
	60	UniChar keychar = 0;
	61	Bool can_input_text, has_modifiers = NO, use_text_input = NO;
58	62	static NSUInteger savedModifiers = 0;
59		static NSMutableArray *nsEvArray;
	63	static NSMutableArray *nsEvArray = nil;
60	64
61	65	if (nsEvArray == nil) {
62	66	nsEvArray = [[NSMutableArray alloc] initWithCapacity: 1];
63	67	processingCompose = NO;
64	68	}
65
66		w = [theEvent window];
67		TkWindow *winPtr = TkMacOSXGetTkWindow(w);
68		Tk_Window tkwin = (Tk_Window) winPtr;
69		XEvent xEvent;
70
71	69	if (!winPtr) {
72	70	return theEvent;
73	71	}
74	72
75	73	/*
76		* Control-Tab and Control-Shift-Tab are used to switch tabs in a tabbed
77		* window. We do not want to generate an Xevent for these since that might
78		* cause the deselected tab to be reactivated.
79		*/
80
81		if (keyCode == 48 && (modifiers & NSControlKeyMask) == NSControlKeyMask) {
82		return theEvent;
83		}
84
85		switch (type) {
86		case NSKeyUp:
87		/Fix for bug #1ba71a86bb: key release firing on key press./
88		setupXEvent(&xEvent, w, 0);
89		xEvent.xany.type = KeyRelease;
90		xEvent.xkey.keycode = releaseCode;
91		xEvent.xany.serial = LastKnownRequestProcessed(Tk_Display(tkwin));
92		case NSKeyDown:
93		repeat = [theEvent isARepeat];
94		characters = [theEvent characters];
95		charactersIgnoringModifiers = [theEvent charactersIgnoringModifiers];
96		len = [charactersIgnoringModifiers length];
97		case NSFlagsChanged:
98
99		#if defined(TK_MAC_DEBUG_EVENTS) \|\| NS_KEYLOG == 1
100		TKLog(@"-[%@(%p) %s] r=%d mods=%u '%@' '%@' code=%u c=%d %@ %d", [self class], self, _cmd, repeat, modifiers, characters, charactersIgnoringModifiers, keyCode,([charactersIgnoringModifiers length] == 0) ? 0 : [charactersIgnoringModifiers characterAtIndex: 0], w, type);
101		#endif
102		break;
103
104		default:
105		return theEvent; /* Unrecognized key event. */
106		}
107
108		/*
109		* Create an Xevent to add to the Tk queue.
110		*/
111
112		if (!processingCompose) {
113		unsigned int state = 0;
114
115		if (modifiers & NSAlphaShiftKeyMask) {
116		state \|= LockMask;
117		}
118		if (modifiers & NSShiftKeyMask) {
119		state \|= ShiftMask;
120		}
121		if (modifiers & NSControlKeyMask) {
122		state \|= ControlMask;
123		}
124		if (modifiers & NSCommandKeyMask) {
125		state \|= Mod1Mask; /* command key */
126		}
127		if (modifiers & NSAlternateKeyMask) {
128		state \|= Mod2Mask; /* option key */
129		}
130		if (modifiers & NSNumericPadKeyMask) {
131		state \|= Mod3Mask;
132		}
133		if (modifiers & NSFunctionKeyMask) {
134		state \|= Mod4Mask;
135		}
136
137		/*
138		* Key events are only received for the front Window on the Macintosh. So
139		* to build an XEvent we look up the Tk window associated to the Front
140		* window.
141		*/
142
143		TkWindow *winPtr = TkMacOSXGetTkWindow(w);
144		Tk_Window tkwin = (Tk_Window) winPtr;
145
146		if (tkwin) {
147		TkWindow *grabWinPtr = winPtr->dispPtr->grabWinPtr;
	74	* If a local grab is in effect, key events for windows in the
	75	* grabber's application are redirected to the grabber. Key events
	76	* for other applications are delivered normally. If a global
	77	* grab is in effect all key events are redirected to the grabber.
	78	*/
	79
	80	grabWinPtr = winPtr->dispPtr->grabWinPtr;
	81	if (grabWinPtr) {
	82	if (winPtr->dispPtr->grabFlags \|\| /* global grab */
	83	grabWinPtr->mainPtr == winPtr->mainPtr){ /* same application */
	84	winPtr =winPtr->dispPtr->focusPtr;
	85	tkwin = (Tk_Window)winPtr;
	86	}
	87	}
	88
	89	/*
	90	* Extract the unicode character from KeyUp and KeyDown events.
	91	*/
	92
	93	if (type == NSKeyUp \|\| type == NSKeyDown) {
	94	if ([[theEvent characters] length] > 0) {
	95	keychar = [[theEvent characters] characterAtIndex:0];
148	96
149	97	/*
150		* If a local grab is in effect, key events for windows in the
151		* grabber's application are redirected to the grabber. Key events
152		* for other applications are delivered normally. If a global
153		* grab is in effect all key events are redirected to the grabber.
	98	* Currently, real keys always send BMP characters, but who knows?
154	99	*/
155	100
156		if (grabWinPtr) {
157		if (winPtr->dispPtr->grabFlags \|\| /* global grab */
158		grabWinPtr->mainPtr == winPtr->mainPtr){ /* same appl. */
159		tkwin = (Tk_Window) winPtr->dispPtr->focusPtr;
160		}
	101	if (CFStringIsSurrogateHighCharacter(keychar)) {
	102	UniChar lowChar = [[theEvent characters] characterAtIndex:1];
	103	keychar = CFStringGetLongCharacterForSurrogatePair(
	104	keychar, lowChar);
161	105	}
162	106	} else {
163		tkwin = (Tk_Window) winPtr->dispPtr->focusPtr;
164		}
165		if (!tkwin) {
166		TkMacOSXDbgMsg("tkwin == NULL");
167		return theEvent; /* Give up. No window for this event. */
168		}
169
170		/*
171		* If it's a function key, or we have modifiers other than Shift or
172		* Alt, pass it straight to Tk. Otherwise we'll send for input
173		* processing.
174		*/
175
176		int code = (len == 0) ? 0 :
177		[charactersIgnoringModifiers characterAtIndex: 0];
178		if (type != NSKeyDown \|\| isFunctionKey(code)
179		\|\| (len > 0 && state & (ControlMask \| Mod1Mask \| Mod3Mask \| Mod4Mask))) {
180		XEvent xEvent;
181
182		setupXEvent(&xEvent, w, state);
183		if (type == NSFlagsChanged) {
184		if (savedModifiers > modifiers) {
185		xEvent.xany.type = KeyRelease;
186		} else {
187		xEvent.xany.type = KeyPress;
188		}
189
190		/*
191		* Use special '-1' to signify a special keycode to our
192		* platform specific code in tkMacOSXKeyboard.c. This is rather
193		* like what happens on Windows.
194		*/
195
196		xEvent.xany.send_event = -1;
197
198		/*
199		* Set keycode (which was zero) to the changed modifier
200		*/
201
202		xEvent.xkey.keycode = (modifiers ^ savedModifiers);
203		} else {
204		if (type == NSKeyUp \|\| repeat) {
205		xEvent.xany.type = KeyRelease;
206		} else {
207		xEvent.xany.type = KeyPress;
208		}
209
210		if ([characters length] > 0) {
211		xEvent.xkey.keycode = (keyCode << 16) \|
212		(UInt16) [characters characterAtIndex:0];
213		if (![characters getCString:xEvent.xkey.trans_chars
214		maxLength:XMaxTransChars encoding:NSUTF8StringEncoding]) {
215		/* prevent SF bug 2907388 (crash on some composite chars) */
216		//PENDING: we might not need this anymore
217		TkMacOSXDbgMsg("characters too long");
218		return theEvent;
219		}
220		}
221
222		if (repeat) {
223		Tk_QueueWindowEvent(&xEvent, TCL_QUEUE_TAIL);
224		xEvent.xany.type = KeyPress;
225		xEvent.xany.serial = LastKnownRequestProcessed(Tk_Display(tkwin));
226		}
227		}
228		Tk_QueueWindowEvent(&xEvent, TCL_QUEUE_TAIL);
229		savedModifiers = modifiers;
230		return theEvent;
231		} /* if this is a function key or has modifiers */
232		} /* if not processing compose */
233
234		if (type == NSKeyDown) {
235		if (NS_KEYLOG) {
236		TKLog(@"keyDown: %s compose sequence.\n",
237		processingCompose == YES ? "Continue" : "Begin");
	107
	108	/*
	109	* This is a dead key, such as Option-e, so it should go to the
	110	* TextInputClient.
	111	*/
	112
	113	use_text_input = YES;
238	114	}
239	115
240	116	/*
241		* Call the interpretKeyEvents method to interpret composition key
242		* strokes. When it detects a complete composition sequence it will
243		* call our implementation of insertText: replacementRange, which
244		* generates a key down XEvent with the appropriate character. In IME
245		* when multiple characters have the same composition sequence and the
246		* chosen character is not the default it may be necessary to hit the
247		* enter key multiple times before the character is accepted and
248		* rendered. We send enter key events until inputText has cleared
249		* the processingCompose flag.
	117	* Apple uses 0x10 for unrecognized keys.
250	118	*/
251	119
252		processingCompose = YES;
253		while(processingCompose) {
	120	if (keychar == 0x10) {
	121	keychar = UNKNOWN_KEYCHAR;
	122	}
	123
	124	#if defined(TK_MAC_DEBUG_EVENTS) \|\| NS_KEYLOG == 1
	125	TKLog(@"-[%@(%p) %s] repeat=%d mods=%x char=%x code=%lu c=%d type=%d",
	126	[self class], self, _cmd,
	127	(type == NSKeyDown) && [theEvent isARepeat], modifiers, keychar,
	128	virtual, w, type);
	129	#endif
	130
	131	}
	132
	133	/*
	134	* Build a skeleton XEvent. We need to build it here, even if we will not
	135	* send it, so we can pass it to TkFocusKeyEvent to determine whether the
	136	* target widget can input text.
	137	*/
	138
	139	setupXEvent(&xEvent, tkwin, modifiers);
	140	has_modifiers = xEvent.xkey.state & XEVENT_MOD_MASK;
	141	focusWinPtr = TkFocusKeyEvent(winPtr, &xEvent);
	142	if (focusWinPtr == NULL) {
	143	TKContentView *contentView = [w contentView];
	144
	145	/*
	146	* This NSEvent is being sent to a window which does not have focus.
	147	* This could mean, for example, that the user deactivated the Tk app
	148	* while the NSTextInputClient's popup character selection window was
	149	* still open. We attempt to abandon any ongoing composition operation
	150	* and discard the event.
	151	*/
	152
	153	[contentView cancelComposingText];
	154	return theEvent;
	155	}
	156	can_input_text = ((focusWinPtr->flags & TK_CAN_INPUT_TEXT) != 0);
	157
	158	#if (NS_KEYLOG)
	159	TKLog(@"keyDown: %s compose sequence.\n",
	160	processingCompose == YES ? "Continue" : "Begin");
	161	#endif
	162
	163	/*
	164	* Decide whether this event should be processed with the NSTextInputClient
	165	* protocol.
	166	*/
	167
	168	if (processingCompose \|\|
	169	(type == NSKeyDown && can_input_text && !has_modifiers &&
	170	IS_PRINTABLE(keychar))
	171	) {
	172	use_text_input = YES;
	173	}
	174
	175	/*
	176	* If we are processing this KeyDown event as an NSTextInputClient we do
	177	* not queue an XEvent. We pass the NSEvent to our interpretKeyEvents
	178	* method. When the composition sequence is complete, the callback method
	179	* insertText: replacementRange will be called. That method generates a
	180	* keyPress XEvent with the selected character.
	181	*/
	182
	183	if (use_text_input) {
	184	textInputModifiers = modifiers;
	185
	186	/*
	187	* In IME the Enter key is used to terminate a composition sequence.
	188	* When there are multiple choices of input text available, and the
	189	* user's selected choice is not the default, it may be necessary to
	190	* hit the Enter key multiple times before the text is accepted and
	191	* rendered (See ticket 39de9677aa]). So when sending an Enter key
	192	* during composition, we continue sending Enter keys until the
	193	* inputText method has cleared the processingCompose flag.
	194	*/
	195
	196	if (processingCompose && [theEvent keyCode] == 36) {
	197	[nsEvArray addObject: theEvent];
	198	while(processingCompose) {
	199	[[w contentView] interpretKeyEvents: nsEvArray];
	200	}
	201	[nsEvArray removeObject: theEvent];
	202	} else {
254	203	[nsEvArray addObject: theEvent];
255	204	[[w contentView] interpretKeyEvents: nsEvArray];
256	205	[nsEvArray removeObject: theEvent];
257		if ([theEvent keyCode] != 36) {
258		break;
259		}
260		}
261		}
262		savedModifiers = modifiers;
	206	}
	207	return theEvent;
	208	}
	209
	210	/*
	211	* We are not handling this event as an NSTextInputClient, so we need to
	212	* finish constructing the XEvent and queue it.
	213	*/
	214
	215	macKC.v.o_s = ((modifiers & NSShiftKeyMask ? INDEX_SHIFT : 0) \|
	216	(modifiers & NSAlternateKeyMask ? INDEX_OPTION : 0));
	217	macKC.v.virtual = virtual;
	218	switch (type) {
	219	case NSFlagsChanged:
	220
	221	/*
	222	* This XEvent is a simulated KeyPress or KeyRelease event for a
	223	* modifier key. To determine the type, note that the highest bit
	224	* where the flags differ is 1 if and only if it is a KeyPress. The
	225	* modifiers are saved so we can detect the next flag change.
	226	*/
	227
	228	xEvent.xany.type = modifiers > savedModifiers ? KeyPress : KeyRelease;
	229	savedModifiers = modifiers;
	230
	231	/*
	232	* Set the keychar to MOD_KEYCHAR as a signal to TkpGetKeySym (see
	233	* tkMacOSXKeyboard.c) that this is a modifier key event.
	234	*/
	235
	236	keychar = MOD_KEYCHAR;
	237	break;
	238	case NSKeyUp:
	239	xEvent.xany.type = KeyRelease;
	240	break;
	241	case NSKeyDown:
	242	xEvent.xany.type = KeyPress;
	243	break;
	244	default:
	245	return theEvent; /* Unrecognized key event. */
	246	}
	247	macKC.v.keychar = keychar;
	248	xEvent.xkey.keycode = macKC.uint;
	249	setXEventPoint(&xEvent, tkwin, w);
	250
	251	/*
	252	* Finally we can queue the XEvent, inserting a KeyRelease before a
	253	* repeated KeyPress.
	254	*/
	255
	256	if (type == NSKeyDown && [theEvent isARepeat]) {
	257
	258	xEvent.xany.type = KeyRelease;
	259	Tk_QueueWindowEvent(&xEvent, TCL_QUEUE_TAIL);
	260	xEvent.xany.type = KeyPress;
	261	}
	262	Tk_QueueWindowEvent(&xEvent, TCL_QUEUE_TAIL);
263	263	return theEvent;
264	264	}
265	265	@end
266	266
267	267
268	268	@implementation TKContentView
269
270		-(id)init {
271		self = [super init];
272		if (self) {
273		_needsRedisplay = NO;
274		}
275		return self;
276		}
	269	@synthesize tkDirtyRect = _tkDirtyRect;
	270	@synthesize tkNeedsDisplay = _tkNeedsDisplay;
277	271
278	272	/*
279	273	* Implementation of the NSTextInputClient protocol.

281	275
282	276	/* [NSTextInputClient inputText: replacementRange:] is called by
283	277	* interpretKeyEvents when a composition sequence is complete. It is also
284		* called when we delete over working text. In that case the call is followed
	278	* called when we delete working text. In that case the call is followed
285	279	* immediately by doCommandBySelector: deleteBackward:
286	280	*/
287	281	- (void)insertText: (id)aString
288	282	replacementRange: (NSRange)repRange
289	283	{
290		int i, len;
	284	int i, len, state;
291	285	XEvent xEvent;
292		NSString *str;
	286	NSString str, keystr, *lower;
	287	TkWindow *winPtr = TkMacOSXGetTkWindow([self window]);
	288	Tk_Window tkwin = (Tk_Window)winPtr;
	289	Bool sendingIMEText = NO;
293	290
294	291	str = ([aString isKindOfClass: [NSAttributedString class]]) ?
295	292	[aString string] : aString;

299	296	TKLog(@"insertText '%@'\tlen = %d", aString, len);
300	297	}
301	298
302		processingCompose = NO;
303
304	299	/*
305	300	* Clear any working text.
306	301	*/
307	302
308	303	if (privateWorkingText != nil) {
	304	sendingIMEText = YES;
309	305	[self deleteWorkingText];
310	306	}
311	307

313	309	* Insert the string as a sequence of keystrokes.
314	310	*/
315	311
316		setupXEvent(&xEvent, [self window], 0);
	312	setupXEvent(&xEvent, tkwin, textInputModifiers);
	313	setXEventPoint(&xEvent, tkwin, [self window]);
317	314	xEvent.xany.type = KeyPress;
318	315
319	316	/*

324	321	*/
325	322
326	323	if (repRange.location == 0) {
327		TkWindow *winPtr = TkMacOSXGetTkWindow([self window]);
328		Tk_Window focusWin = (Tk_Window) winPtr->dispPtr->focusPtr;
	324	Tk_Window focusWin = (Tk_Window)winPtr->dispPtr->focusPtr;
329	325	TkSendVirtualEvent(focusWin, "TkAccentBackspace", NULL);
330	326	}
331	327
332	328	/*
333	329	* Next we generate an XEvent for each unicode character in our string.
	330	* This string could contain non-BMP characters, for example if the
	331	* emoji palette was used.
334	332	*
335	333	* NSString uses UTF-16 internally, which means that a non-BMP character is
336		* represented by a sequence of two 16-bit "surrogates". In principle we
337		* could record this in the XEvent by setting the keycode to the 32-bit
338		* unicode code point and setting the trans_chars string to the 4-byte
339		* UTF-8 string for the non-BMP character. However, that will not work
340		* when TCL_UTF_MAX is set to 3, as is the case for Tcl 8.6. A workaround
341		* used internally by Tcl 8.6 is to encode each surrogate as a 3-byte
342		* sequence using the UTF-8 algorithm (ignoring the fact that the UTF-8
343		* encoding specification does not allow encoding UTF-16 surrogates).
344		* This gives a 6-byte encoding of the non-BMP character which we write into
345		* the trans_chars field of the XEvent.
346		*/
347
	334	* represented by a sequence of two 16-bit "surrogates". We record this in
	335	* the XEvent by setting the low order 21-bits of the keycode to the UCS-32
	336	* value value of the character and the virtual keycode in the high order
	337	* byte to the special value NON_BMP.
	338	*/
	339
	340	state = xEvent.xkey.state;
348	341	for (i = 0; i < len; i++) {
349		xEvent.xkey.nbytes = TclUniAtIndex(str, i, xEvent.xkey.trans_chars,
350		&xEvent.xkey.keycode);
351		if (xEvent.xkey.keycode > 0xffff){
352		i++;
353		}
	342	UniChar keychar;
	343	MacKeycode macKC = {0};
	344
	345	keychar = [str characterAtIndex:i];
	346	macKC.v.keychar = keychar;
	347	if (CFStringIsSurrogateHighCharacter(keychar)) {
	348	UniChar lowChar = [str characterAtIndex:++i];
	349	macKC.v.keychar = CFStringGetLongCharacterForSurrogatePair(
	350	(UniChar)keychar, lowChar);
	351	macKC.v.virtual = NON_BMP_VIRTUAL;
	352	} else if (repRange.location == 0 \|\| sendingIMEText) {
	353	macKC.v.virtual = REPLACEMENT_VIRTUAL;
	354	} else {
	355	macKC.uint = TkMacOSXAddVirtual(macKC.uint);
	356	xEvent.xkey.state \|= INDEX2STATE(macKC.x.xvirtual);
	357	}
	358	keystr = [[NSString alloc] initWithCharacters:&keychar length:1];
	359	lower = [keystr lowercaseString];
	360	if (![keystr isEqual: lower]) {
	361	macKC.v.o_s \|= INDEX_SHIFT;
	362	xEvent.xkey.state \|= ShiftMask;
	363	}
	364	if (xEvent.xkey.state & Mod2Mask) {
	365	macKC.v.o_s \|= INDEX_OPTION;
	366	}
	367	xEvent.xkey.keycode = macKC.uint;
354	368	xEvent.xany.type = KeyPress;
355	369	Tk_QueueWindowEvent(&xEvent, TCL_QUEUE_TAIL);
356		}
357		releaseCode = (UInt16) [str characterAtIndex: 0];
	370	xEvent.xkey.state = state;
	371	}
358	372	}
359	373
360	374	/*

378	392	replacementRange: (NSRange)repRange
379	393	{
380	394	TkWindow *winPtr = TkMacOSXGetTkWindow([self window]);
381		Tk_Window focusWin = (Tk_Window) winPtr->dispPtr->focusPtr;
	395	Tk_Window focusWin = (Tk_Window)winPtr->dispPtr->focusPtr;
382	396	NSString *temp;
383	397	NSString *str;
384	398
385	399	str = ([aString isKindOfClass: [NSAttributedString class]]) ?
386	400	[aString string] : aString;
387
388	401	if (focusWin) {
389	402
390	403	/*

415	428	*/
416	429
417	430	TkSendVirtualEvent(focusWin, "TkStartIMEMarkedText", NULL);
	431	processingCompose = YES;
418	432	temp = [str copy];
419	433	[self insertText: temp replacementRange:repRange];
420	434	privateWorkingText = temp;
421		processingCompose = YES;
422	435	TkSendVirtualEvent(focusWin, "TkEndIMEMarkedText", NULL);
423	436	}
424	437

426	439	{
427	440	return privateWorkingText != nil;
428	441	}
429
430	442
431	443	- (NSRange)markedRange
432	444	{

440	452	return rng;
441	453	}
442	454
443		- (void)cancelComposingText
	455	- (void)unmarkText
444	456	{
445	457	if (NS_KEYLOG) {
446		TKLog(@"cancelComposingText");
	458	TKLog(@"unmarkText");
447	459	}
448	460	[self deleteWorkingText];
449	461	processingCompose = NO;
450	462	}
451
452		- (void)unmarkText
453		{
454		if (NS_KEYLOG) {
455		TKLog(@"unmarkText");
456		}
457		[self deleteWorkingText];
458		processingCompose = NO;
459		}
460
461	463
462	464	/*
463	465	* Called by the system to get a position for popup character selection windows

495	497	processingCompose = NO;
496	498	if (aSelector == @selector (deleteBackward:)) {
497	499	TkWindow *winPtr = TkMacOSXGetTkWindow([self window]);
498		Tk_Window focusWin = (Tk_Window) winPtr->dispPtr->focusPtr;
	500	Tk_Window focusWin = (Tk_Window)winPtr->dispPtr->focusPtr;
499	501	TkSendVirtualEvent(focusWin, "TkAccentBackspace", NULL);
500	502	}
501	503	}

542	544	}
543	545	/* End of NSTextInputClient implementation. */
544	546
545		@synthesize needsRedisplay = _needsRedisplay;
546	547	@end
547	548
548	549

572	573	}
573	574	}
574	575	}
	576
	577	- (void)cancelComposingText
	578	{
	579	if (NS_KEYLOG) {
	580	TKLog(@"cancelComposingText");
	581	}
	582	[self deleteWorkingText];
	583	processingCompose = NO;
	584	}
	585
575	586	@end
576	587
577	588	/*

579	590	*/
580	591
581	592	static void
582		setupXEvent(XEvent xEvent, NSWindow w, unsigned int state)
583		{
584		TkWindow *winPtr = TkMacOSXGetTkWindow(w);
585		Tk_Window tkwin = (Tk_Window) winPtr;
586
587		if (!winPtr) {
	593	setupXEvent(XEvent *xEvent, Tk_Window tkwin, NSUInteger modifiers)
	594	{
	595	unsigned int state = 0;
	596	Display *display = Tk_Display(tkwin);
	597
	598	if (tkwin == NULL) {
588	599	return;
589	600	}
590
	601	if (modifiers) {
	602	state = (modifiers & NSAlphaShiftKeyMask ? LockMask : 0) \|
	603	(modifiers & NSShiftKeyMask ? ShiftMask : 0) \|
	604	(modifiers & NSControlKeyMask ? ControlMask : 0) \|
	605	(modifiers & NSCommandKeyMask ? Mod1Mask : 0) \|
	606	(modifiers & NSAlternateKeyMask ? Mod2Mask : 0) \|
	607	(modifiers & NSNumericPadKeyMask ? Mod3Mask : 0) \|
	608	(modifiers & NSFunctionKeyMask ? Mod4Mask : 0) ;
	609	}
591	610	memset(xEvent, 0, sizeof(XEvent));
592		xEvent->xany.serial = LastKnownRequestProcessed(Tk_Display(tkwin));
	611	xEvent->xany.serial = LastKnownRequestProcessed(display);
593	612	xEvent->xany.display = Tk_Display(tkwin);
594	613	xEvent->xany.window = Tk_WindowId(tkwin);
595	614
596		xEvent->xkey.root = XRootWindow(Tk_Display(tkwin), 0);
	615	xEvent->xkey.root = XRootWindow(display, 0);
597	616	xEvent->xkey.time = TkpGetMS();
598	617	xEvent->xkey.state = state;
599	618	xEvent->xkey.same_screen = true;
600	619	/* No need to initialize other fields implicitly here,
601	620	* because of the memset() above. */
	621	}
	622
	623	static void
	624	setXEventPoint(
	625	XEvent *xEvent,
	626	Tk_Window tkwin,
	627	NSWindow *w)
	628	{
	629	TkWindow winPtr = (TkWindow ) tkwin;
	630	NSPoint local = [w mouseLocationOutsideOfEventStream];
	631	NSPoint global = [w tkConvertPointToScreen: local];
	632	int win_x, win_y;
	633
	634	if (Tk_IsEmbedded(winPtr)) {
	635	TkWindow *contPtr = TkpGetOtherWindow(winPtr);
	636	if (Tk_IsTopLevel(contPtr)) {
	637	local.x -= contPtr->wmInfoPtr->xInParent;
	638	local.y -= contPtr->wmInfoPtr->yInParent;
	639	} else {
	640	TkWindow *topPtr = TkMacOSXGetHostToplevel(winPtr)->winPtr;
	641	local.x -= (topPtr->wmInfoPtr->xInParent + contPtr->changes.x);
	642	local.y -= (topPtr->wmInfoPtr->yInParent + contPtr->changes.y);
	643	}
	644	} else if (winPtr->wmInfoPtr != NULL) {
	645	local.x -= winPtr->wmInfoPtr->xInParent;
	646	local.y -= winPtr->wmInfoPtr->yInParent;
	647	}
	648	tkwin = Tk_TopCoordsToWindow(tkwin, local.x, local.y, &win_x, &win_y);
	649	local.x = win_x;
	650	local.y = win_y;
	651	global.y = TkMacOSXZeroScreenHeight() - global.y;
	652	xEvent->xbutton.x = local.x;
	653	xEvent->xbutton.y = local.y;
	654	xEvent->xbutton.x_root = global.x;
	655	xEvent->xbutton.y_root = global.y;
602	656	}
603	657
604	658	#pragma mark -

632	686	TkWindow captureWinPtr = (TkWindow ) TkpGetCapture();
633	687
634	688	if (keyboardGrabWinPtr && captureWinPtr) {
635		NSWindow *w = TkMacOSXDrawableWindow(grab_window);
636		MacDrawable macWin = (MacDrawable ) grab_window;
	689	NSWindow *w = TkMacOSXGetNSWindowForDrawable(grab_window);
	690	MacDrawable macWin = (MacDrawable )grab_window;
637	691
638	692	if (w && macWin->toplevel->winPtr == (TkWindow *) captureWinPtr) {
639	693	if (modalSession) {

705	759	*
706	760	* Tk_SetCaretPos --
707	761	*
708		* This enables correct placement of the XIM caret. This is called by
709		* widgets to indicate their cursor placement, and the caret location is
710		* used by TkpGetString to place the XIM caret.
	762	* This enables correct placement of the popups used for character
	763	* selection by the NSTextInputClient. It gets called by text entry
	764	* widgets whenever the cursor is drawn. It does nothing if the widget's
	765	* NSWindow is not the current KeyWindow. Otherwise it updates the
	766	* display's caret structure and records the caret geometry in static
	767	* variables for use by the NSTextInputClient implementation. Any
	768	* widget passed to this function will be marked as being able to input
	769	* text by setting the TK_CAN_INPUT_TEXT flag.
711	770	*
712	771	* Results:
713	772	* None
714	773	*
715	774	* Side effects:
716		* None
	775	* Sets the CAN_INPUT_TEXT flag on the widget passed as tkwin. May update
	776	* the display's caret structure as well as the static variables caret_x,
	777	* caret_y and caret_height.
717	778	*
718	779	*----------------------------------------------------------------------
719	780	*/

725	786	int y,
726	787	int height)
727	788	{
728		TkCaret caretPtr = &(((TkWindow ) tkwin)->dispPtr->caret);
729
730		/*
731		* Prevent processing anything if the values haven't changed. Windows only
732		* has one display, so we can do this with statics.
733		*/
734
735		if ((caretPtr->winPtr == ((TkWindow *) tkwin))
736		&& (caretPtr->x == x) && (caretPtr->y == y)) {
	789	TkWindow winPtr = (TkWindow ) tkwin;
	790	TkCaret *caretPtr = &(winPtr->dispPtr->caret);
	791	NSWindow *w = TkMacOSXGetNSWindowForDrawable(Tk_WindowId(tkwin));
	792
	793	/*
	794	* Register this widget as being capable of text input, so we know we
	795	* should process (appropriate) key events for this window with the
	796	* NSTextInputClient protocol.
	797	*/
	798
	799	winPtr->flags \|= TK_CAN_INPUT_TEXT;
	800	if (w && ![w isKeyWindow]) {
737	801	return;
738	802	}
739
740		caretPtr->winPtr = ((TkWindow *) tkwin);
	803	if ((caretPtr->winPtr == winPtr
	804	&& caretPtr->x == x) && (caretPtr->y == y)) {
	805	return;
	806	}
	807
	808	/*
	809	* Update the display's caret information.
	810	*/
	811
	812	caretPtr->winPtr = winPtr;
741	813	caretPtr->x = x;
742	814	caretPtr->y = y;
743	815	caretPtr->height = height;
744	816
745	817	/*
746		* As in Windows, adjust to the toplevel to get the coords right.
747		*/
748
	818	* Record the caret geometry in static variables for use when processing
	819	* key events. We use the TKContextView coordinate system for this.
	820	*/
	821
	822	caret_height = height;
749	823	while (!Tk_IsTopLevel(tkwin)) {
750	824	x += Tk_X(tkwin);
751	825	y += Tk_Y(tkwin);

754	828	return;
755	829	}
756	830	}
757
758		/*
759		* But adjust for fact that NS uses flipped view.
760		*/
761
762		y = Tk_Height(tkwin) - y;
763
764	831	caret_x = x;
765		caret_y = y;
766		caret_height = height;
767		}
768
769
770		static unsigned convert_ns_to_X_keysym[] =
771		{
772		NSHomeFunctionKey, 0x50,
773		NSLeftArrowFunctionKey, 0x51,
774		NSUpArrowFunctionKey, 0x52,
775		NSRightArrowFunctionKey, 0x53,
776		NSDownArrowFunctionKey, 0x54,
777		NSPageUpFunctionKey, 0x55,
778		NSPageDownFunctionKey, 0x56,
779		NSEndFunctionKey, 0x57,
780		NSBeginFunctionKey, 0x58,
781		NSSelectFunctionKey, 0x60,
782		NSPrintFunctionKey, 0x61,
783		NSExecuteFunctionKey, 0x62,
784		NSInsertFunctionKey, 0x63,
785		NSUndoFunctionKey, 0x65,
786		NSRedoFunctionKey, 0x66,
787		NSMenuFunctionKey, 0x67,
788		NSFindFunctionKey, 0x68,
789		NSHelpFunctionKey, 0x6A,
790		NSBreakFunctionKey, 0x6B,
791
792		NSF1FunctionKey, 0xBE,
793		NSF2FunctionKey, 0xBF,
794		NSF3FunctionKey, 0xC0,
795		NSF4FunctionKey, 0xC1,
796		NSF5FunctionKey, 0xC2,
797		NSF6FunctionKey, 0xC3,
798		NSF7FunctionKey, 0xC4,
799		NSF8FunctionKey, 0xC5,
800		NSF9FunctionKey, 0xC6,
801		NSF10FunctionKey, 0xC7,
802		NSF11FunctionKey, 0xC8,
803		NSF12FunctionKey, 0xC9,
804		NSF13FunctionKey, 0xCA,
805		NSF14FunctionKey, 0xCB,
806		NSF15FunctionKey, 0xCC,
807		NSF16FunctionKey, 0xCD,
808		NSF17FunctionKey, 0xCE,
809		NSF18FunctionKey, 0xCF,
810		NSF19FunctionKey, 0xD0,
811		NSF20FunctionKey, 0xD1,
812		NSF21FunctionKey, 0xD2,
813		NSF22FunctionKey, 0xD3,
814		NSF23FunctionKey, 0xD4,
815		NSF24FunctionKey, 0xD5,
816
817		NSBackspaceCharacter, 0x08, /* 8: Not on some KBs. */
818		NSDeleteCharacter, 0xFF, /* 127: Big 'delete' key upper right. */
819		NSDeleteFunctionKey, 0x9F, /* 63272: Del forw key off main array. */
820
821		NSTabCharacter, 0x09,
822		0x19, 0x09, /* left tab->regular since pass shift */
823		NSCarriageReturnCharacter, 0x0D,
824		NSNewlineCharacter, 0x0D,
825		NSEnterCharacter, 0x8D,
826
827		0x1B, 0x1B /* escape */
828		};
829
830
831		static unsigned
832		isFunctionKey(
833		unsigned code)
834		{
835		const unsigned last_keysym = (sizeof(convert_ns_to_X_keysym)
836		/ sizeof(convert_ns_to_X_keysym[0]));
837		unsigned keysym;
838
839		for (keysym = 0; keysym < last_keysym; keysym += 2) {
840		if (code == convert_ns_to_X_keysym[keysym]) {
841		return 0xFF00 \| convert_ns_to_X_keysym[keysym + 1];
842		}
843		}
844		return 0;
	832	caret_y = Tk_Height(tkwin) - y;
845	833	}
846	834
847	835	/*

+589

-572

macosx/tkMacOSXKeyboard.c less more

5	5	* Copyright (c) 1995-1997 Sun Microsystems, Inc.
6	6	* Copyright 2001-2009, Apple Inc.
7	7	* Copyright (c) 2005-2009 Daniel A. Steffen <das@users.sourceforge.net>
	8	* Copyright (c) 2020 Marc Culler
8	9	*
9	10	* See the file "license.terms" for information on usage and redistribution
10	11	* of this file, and for a DISCLAIMER OF ALL WARRANTIES.

13	14	#include "tkMacOSXPrivate.h"
14	15	#include "tkMacOSXEvent.h"
15	16	#include "tkMacOSXConstants.h"
16		/*
17		* A couple of simple definitions to make code a bit more self-explaining.
18		*
19		* For the assignments of Mod1==meta==command and Mod2==alt==option, see also
20		* tkMacOSXMouseEvent.c.
21		*/
22
23		#define LATIN1_MAX 255
24		#define MAC_KEYCODE_MAX 0x7F
25		#define MAC_KEYCODE_MASK 0x7F
26		#define COMMAND_MASK Mod1Mask
27		#define OPTION_MASK Mod2Mask
28
29
30		/*
31		* Tables enumerating the special keys defined on Mac keyboards. These are
32		* necessary for correct keysym mappings for all keys where the keysyms are
33		* not identical with their ASCII or Latin-1 code points.
34		*/
35
36		typedef struct {
37		int keycode; /* Macintosh keycode. */
38		KeySym keysym; /* X windows keysym. */
39		} KeyInfo;
40
41		/*
42		* Notes on keyArray:
43		*
44		* 0x34, XK_Return - Powerbooks use this and some keymaps define it.
45		*
46		* 0x4C, XK_Return - XFree86 and Apple's X11 call this one XK_KP_Enter.
47		*
48		* 0x47, XK_Clear - This key is NumLock when used on PCs, but Mac
49		* applications don't use it like that, nor does Apple's X11.
50		*
51		* All other keycodes are taken from the published ADB keyboard layouts.
52		*/
53
54		static KeyInfo keyArray[] = {
55		{0x24, XK_Return},
56		{0x30, XK_Tab},
57		{0x33, XK_BackSpace},
58		{0x34, XK_Return},
59		{0x35, XK_Escape},
60
61		{0x47, XK_Clear},
62		{0x4C, XK_KP_Enter},
63
64		{0x72, XK_Help},
65		{0x73, XK_Home},
66		{0x74, XK_Page_Up},
67		{0x75, XK_Delete},
68		{0x77, XK_End},
69		{0x79, XK_Page_Down},
70
71		{0x7B, XK_Left},
72		{0x7C, XK_Right},
73		{0x7D, XK_Down},
74		{0x7E, XK_Up},
75
76		{0, 0}
77		};
78
79		static KeyInfo virtualkeyArray[] = {
80		{122, XK_F1},
81		{120, XK_F2},
82		{99, XK_F3},
83		{118, XK_F4},
84		{96, XK_F5},
85		{97, XK_F6},
86		{98, XK_F7},
87		{100, XK_F8},
88		{101, XK_F9},
89		{109, XK_F10},
90		{103, XK_F11},
91		{111, XK_F12},
92		{105, XK_F13},
93		{107, XK_F14},
94		{113, XK_F15},
95		{0, 0}
96		};
97
98		#define NUM_MOD_KEYCODES 14
99		static KeyCode modKeyArray[NUM_MOD_KEYCODES] = {
100		XK_Shift_L,
101		XK_Shift_R,
102		XK_Control_L,
103		XK_Control_R,
104		XK_Caps_Lock,
105		XK_Shift_Lock,
106		XK_Meta_L,
107		XK_Meta_R,
108		XK_Alt_L,
109		XK_Alt_R,
110		XK_Super_L,
111		XK_Super_R,
112		XK_Hyper_L,
113		XK_Hyper_R,
114		};
115
116		static int initialized = 0;
117		static Tcl_HashTable keycodeTable; /* keyArray hashed by keycode value. */
118		static Tcl_HashTable vkeyTable; /* virtualkeyArray hashed by virtual
119		* keycode value. */
120
121		static int latin1Table[LATIN1_MAX+1]; /* Reverse mapping table for
122		* controls, ASCII and Latin-1. */
123
124		static int keyboardChanged = 1;
	17	#include "tkMacOSXKeysyms.h"
	18
	19	/*
	20	* About keyboards
	21	* ---------------
	22	* Keyboards are complicated. This long comment is an attempt to provide
	23	* enough information about them to make it possible to read and understand
	24	* the code in this file.
	25	*
	26	* Every key on a keyboard is identified by a number between 0 and 127. In
	27	* macOS, pressing or releasing a key on the keyboard generates an NSEvent of
	28	* type KeyDown, KeyUp or FlagsChanged. The 8-bit identifier of the key that
	29	* was involved in this event is provided in the attribute [NSEvent keyCode].
	30	* Apple also refers to this number as a "Virtual KeyCode". In this file, to
	31	* avoid confusion with other uses of the word keycode, we will refer to this
	32	* key identifier as a "virtual keycode", usually the value of a variable named
	33	* "virtual".
	34	*
	35	* Some of the keys on a keyboard, such as the Shift, Option, Command or
	36	* Control keys, are "modifier" keys. The effect of pressing or releasing a
	37	* key depends on three quantities:
	38	* - which key is being pressed or released
	39	* - which modifier keys are being held down at the moment
	40	* - the current keyboard layout
	41	* If the key is a modifier key then the effect of pressing or releasing it is
	42	* only to change the list of which modifier keys are being held down. Apple
	43	* reports this by sending an NSEvent of type FlagsChanged. X11 reports this
	44	* as a KeyPress or KeyRelease event for the modifier key. Note that there may
	45	* be combinations of modifier key states and key presses which have no effect.
	46	*
	47	* In X11 every meaningful effect from a key action is identified by a 16 bit
	48	* value known as a keysym. Every keysym has an associated string name, also
	49	* known as a keysym. The Tk bind command uses the X11 keysym string to
	50	* specify a key event which should invoke a certain action and it provides the
	51	* numeric and symbolic keysyms to the bound proc as %N and %K respectively.
	52	* An X11 XEvent which reports a KeyPress or KeyRelease does not include the
	53	* keysym. Instead it includes a platform-specific numerical value called a
	54	* keycode which is available to the bound procedure as %k. A platform port of
	55	* Tk must provide functions which convert between keycodes and numerical
	56	* keysyms. Conversion between numerical and symbolic keysyms is provided by
	57	* the generic Tk code, although platforms are allowed to provide their own by
	58	* defining the XKeysymToString and XStringToKeysym functions and undefining
	59	* the macro REDO_KEYSYM_LOOKUP. This macOS port uses the conversion provided
	60	* by the generic code.
	61	*
	62	* When the keyboard focus is on a Tk widget which provides text input, there
	63	* are some X11 KeyPress events which cause text to be inserted. We will call
	64	* these "printable" events. The UCS-32 character stored in the keycode field
	65	* of an XKeyEvent depends on more than the three items above. It may also
	66	* depend on the sequence of keypresses that preceded the one being reported by
	67	* the XKeyEvent. For example, on macOS an <Alt-e> event does not cause text
	68	* to be inserted but a following <a> event causes an accented 'a' to be
	69	* inserted. The events in such a composition sequence, other than the final
	70	* one, are known as "dead-key" events.
	71	*
	72	* MacOS packages the information described above in a different way. Every
	73	* meaningful effect from a key action *other than changing the state of
	74	* modifier keys* is identified by a unicode string which is provided as the
	75	* [NSEvent characters] attribute of a KeyDown or KeyUp event. FlagsChanged
	76	* events do not have characters. In principle, the characters attribute could
	77	* be an arbitrary unicode string but in practice it is always a single UTF-16
	78	* character which we usually store in a variable named keychar. While the
	79	* keychar is a legal unicode code point, it does not necessarily represent a
	80	* glyph. MacOS uses unicode code points in the private-use range 0xF700-0xF8FF
	81	* for non-printable events which have no associated ASCII code point. For
	82	* example, pressing the F2 key generates an NSEvent with the character 0xF705,
	83	* the Backspace key produces 0x7F (ASCII del) and the Delete key produces
	84	* 0xF728.
	85	*
	86	* With the exception of modifier keys, it is possible to translate between
	87	* numerical X11 keysyms and macOS keychars; this file constructs Tcl hash
	88	* tables to do this job, using data defined in the file tkMacOSXKeysyms.h.
	89	* The code here adopts the convention that the keychar of any modifier key
	90	* is MOD_KEYCHAR. Keys which do not appear on any Macintosh keyboard, such
	91	* as the Menu key on PC keyboards, are assigned UNKNOWN_KEYCHAR.
	92	*
	93	* The macosx platform-specific scheme for generating a keycode when mapping an
	94	* NSEvent of type KeyUp, KeyDown or FlagsChanged to an XEvent of type KeyPress
	95	* or KeyRelease is as follows:
	96	* keycode = (virtual << 24) \| index << 22 \| keychar
	97	* where index is a 2-bit quantity whose bits indicate the state of the Option
	98	* and Shift keys.
	99	*
	100	* A few remarks are in order. First, we are using 32 bits for the keycode and
	101	* we are allowing room for up to 22 bits for the keychar. This means that
	102	* there is enough room in the keycode to hold a UTF-32 character, which only
	103	* requires 21 bits. Second, the KeyCode type for the keycode field in an
	104	* XEvent is currently defined as unsigned int, which was modified from the
	105	* unsigned short used in X11 in order to accomodate macOS. Finally, there is
	106	* no obstruction to generating KeyPress events for keys that represent letters
	107	* which do not exist on the current keyboard layout. And different keyboard
	108	* layouts can assign a given letter to different keys. So we need a
	109	* convention for what value to assign to "virtual" when computing the keycode
	110	* for a generated event. The convention used here is as follows: If there is
	111	* a key on the current keyboard which produces the keychar, use the virtual
	112	* keycode of that key. Otherwise set virtual = NO_VIRTUAL.
	113	*/
	114
	115
	116	/*
	117	* See tkMacOSXPrivate.h for macros and structures related to key event processing.
	118	*/
	119
	120	/*
	121	* Hash tables and array used to translate between various key attributes.
	122	*/
	123
	124	static Tcl_HashTable special2keysym; /* Special virtual keycode to keysym */
	125	static Tcl_HashTable keysym2keycode; /* keysym to XEvent keycode */
	126	static Tcl_HashTable keysym2unichar; /* keysym to unichar */
	127	static Tcl_HashTable unichar2keysym; /* unichar to X11 keysym */
	128	static Tcl_HashTable unichar2xvirtual; /* unichar to virtual with index */
	129	static UniChar xvirtual2unichar[512]; /* virtual with index to unichar */
	130
	131	/*
	132	* Flags.
	133	*/
	134
	135	static BOOL initialized = NO;
	136	static BOOL keyboardChanged = YES;
125	137
126	138	/*
127	139	* Prototypes for static functions used in this file.
128	140	*/
129	141
130		static void InitKeyMaps (void);
131		static void InitLatin1Table(Display *display);
132		static int XKeysymToMacKeycode(Display *display, KeySym keysym);
133		static int KeycodeToUnicode(UniChar * uniChars, int maxChars,
134		UInt16 keyaction, UInt32 keycode, UInt32 modifiers,
	142	static void InitHashTables(void);
	143	static void UpdateKeymaps(void);
	144	static int KeyDataToUnicode(UniChar *uniChars, int maxChars,
	145	UInt16 keyaction, UInt32 virtual, UInt32 modifiers,
135	146	UInt32 * deadKeyStatePtr);
136	147
137	148	#pragma mark TKApplication(TKKeyboard)

139	150	@implementation TKApplication(TKKeyboard)
140	151	- (void) keyboardChanged: (NSNotification *) notification
141	152	{
	153	(void)notification;
142	154	#ifdef TK_MAC_DEBUG_NOTIFICATIONS
143	155	TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification);
	156	#else
	157	(void)notification;
144	158	#endif
145		keyboardChanged = 1;
	159	keyboardChanged = YES;
	160	UpdateKeymaps();
146	161	}
147	162	@end
148	163

151	166	/*
152	167	*----------------------------------------------------------------------
153	168	*
154		* InitKeyMaps --
	169	* InitHashTables --
155	170	*
156	171	* Creates hash tables used by some of the functions in this file.
157	172	*
158		* FIXME: As keycodes are defined to be in the limited range 0-127, it
159		* would be easier and more efficient to use directly initialized plain
160		* arrays and drop this function.
161		*
162	173	* Results:
163	174	* None.
164	175	*

169	180	*/
170	181
171	182	static void
172		InitKeyMaps(void)
	183	InitHashTables(void)
173	184	{
174	185	Tcl_HashEntry *hPtr;
175		KeyInfo *kPtr;
176		int dummy;
177
178		Tcl_InitHashTable(&keycodeTable, TCL_ONE_WORD_KEYS);
179		for (kPtr = keyArray; kPtr->keycode != 0; kPtr++) {
180		hPtr = Tcl_CreateHashEntry(&keycodeTable, INT2PTR(kPtr->keycode),
181		&dummy);
	186	const KeyInfo *kPtr;
	187	const KeysymInfo *ksPtr;
	188	int dummy, index;
	189
	190	Tcl_InitHashTable(&special2keysym, TCL_ONE_WORD_KEYS);
	191	Tcl_InitHashTable(&keysym2keycode, TCL_ONE_WORD_KEYS);
	192	for (kPtr = keyArray; kPtr->virtual != 0; kPtr++) {
	193	MacKeycode macKC;
	194	macKC.v.o_s = 0;
	195	hPtr = Tcl_CreateHashEntry(&special2keysym, INT2PTR(kPtr->virtual),
	196	&dummy);
182	197	Tcl_SetHashValue(hPtr, INT2PTR(kPtr->keysym));
183		}
184		Tcl_InitHashTable(&vkeyTable, TCL_ONE_WORD_KEYS);
185		for (kPtr = virtualkeyArray; kPtr->keycode != 0; kPtr++) {
186		hPtr = Tcl_CreateHashEntry(&vkeyTable, INT2PTR(kPtr->keycode),
187		&dummy);
188		Tcl_SetHashValue(hPtr, INT2PTR(kPtr->keysym));
189		}
190		initialized = 1;
191		}
192
193		/*
194		*----------------------------------------------------------------------
195		*
196		* InitLatin1Table --
197		*
198		* Creates a simple table to be used for mapping from keysyms to keycodes.
199		* Always needs to be called before using latin1Table, because the
200		* keyboard layout may have changed, and than the table must be
201		* re-computed.
	198	hPtr = Tcl_CreateHashEntry(&keysym2keycode, INT2PTR(kPtr->keysym),
	199	&dummy);
	200	macKC.v.virtual = kPtr->virtual;
	201	macKC.v.keychar = kPtr->keychar;
	202	Tcl_SetHashValue(hPtr, INT2PTR(macKC.uint));
	203
	204	/*
	205	* The Carbon framework does not work for finding the unicode character
	206	* of a special key. But that does not depend on the keyboard layout,
	207	* so we can record the information here.
	208	*/
	209
	210	for (index = 3; index >= 0; index--) {
	211	macKC.v.o_s = index;
	212	xvirtual2unichar[macKC.x.xvirtual] = macKC.x.keychar;
	213	}
	214	}
	215	Tcl_InitHashTable(&keysym2unichar, TCL_ONE_WORD_KEYS);
	216	Tcl_InitHashTable(&unichar2keysym, TCL_ONE_WORD_KEYS);
	217	for (ksPtr = keysymTable; ksPtr->keysym != 0; ksPtr++) {
	218	hPtr = Tcl_CreateHashEntry(&keysym2unichar, INT2PTR(ksPtr->keysym),
	219	&dummy);
	220	Tcl_SetHashValue(hPtr, INT2PTR(ksPtr->keycode));
	221	hPtr = Tcl_CreateHashEntry(&unichar2keysym, INT2PTR(ksPtr->keycode),
	222	&dummy);
	223	Tcl_SetHashValue(hPtr, INT2PTR(ksPtr->keysym));
	224	}
	225	UpdateKeymaps();
	226	initialized = YES;
	227	}
	228
	229	/*
	230	*----------------------------------------------------------------------
	231	*
	232	* UpdateKeymaps --
	233	*
	234	* Called when the keyboard changes to update the hash tables that provide
	235	* maps between unicode characters and virtual keycodes with indexes. In
	236	* order for the map from characters to virtual keycodes to be
	237	* well-defined we have to ignore virtual keycodes for keypad keys, since
	238	* each keypad key has the same character as the corresponding key on the
	239	* main keyboard.
202	240	*
203	241	* Results:
204	242	* None.
205	243	*
206	244	* Side effects:
207		* Sets the global latin1Table.
	245	* Initializes, if necessary, and updates the unichar2xvirtual hash table
	246	* and the xvirtual2unichar array.
208	247	*
209	248	*----------------------------------------------------------------------
210	249	*/
211	250
212	251	static void
213		InitLatin1Table(
214		Display *display)
215		{
216		int keycode;
217		KeySym keysym;
218		int state;
219		int modifiers;
220
221		memset(latin1Table, 0, sizeof(latin1Table));
222
223		/*
224		* In the common X11 implementations, a keymap has four columns
225		* "plain", "Shift", "Mode_switch" and "Mode_switch + Shift". We don't
226		* use "Mode_switch", but we use "Option" instead. (This is similar to
227		* Apple's X11 implementation, where "Mode_switch" is used as an alias
228		* for "Option".)
229		*
230		* So here we go through all 4 columns of the keymap and find all
231		* Latin-1 compatible keycodes. We go through the columns back-to-front
232		* from the more exotic columns to the more simple, so that simple
233		* keycode-modifier combinations are preferred in the resulting table.
234		*/
235
236		for (state = 3; state >= 0; state--) {
237		modifiers = 0;
238		if (state & 1) {
239		modifiers \|= shiftKey;
240		}
241		if (state & 2) {
242		modifiers \|= optionKey;
243		}
244
245		for (keycode = 0; keycode <= MAC_KEYCODE_MAX; keycode++) {
246		keysym = XKeycodeToKeysym(display,keycode<<16,state);
247		if (keysym <= LATIN1_MAX) {
248		latin1Table[keysym] = keycode \| modifiers;
	252	UpdateKeymaps()
	253	{
	254	static Bool keymapInitialized = false;
	255	Tcl_HashEntry *hPtr;
	256	int virtual, index, dummy;
	257
	258	if (!keymapInitialized) {
	259	Tcl_InitHashTable(&unichar2xvirtual, TCL_ONE_WORD_KEYS);
	260	keymapInitialized = true;
	261	} else {
	262	Tcl_DeleteHashTable(&unichar2xvirtual);
	263	Tcl_InitHashTable(&unichar2xvirtual, TCL_ONE_WORD_KEYS);
	264	}
	265	/*
	266	* This loop goes backwards so that a lookup by keychar will provide the
	267	* minimal modifier mask. Simpler combinations will overwrite more complex
	268	* ones when constructing the table.
	269	*/
	270
	271	for (index = 3; index >= 0; index--) {
	272	for (virtual = 0; virtual < 128; virtual++) {
	273	MacKeycode macKC;
	274	macKC.v = (keycode_v) {.virtual = virtual, .o_s = index, .keychar = 0};
	275	int modifiers = INDEX2CARBON(index), result;
	276	UniChar keychar = 0;
	277	result = KeyDataToUnicode(&keychar, 1, kUCKeyActionDown, virtual,
	278	modifiers, NULL);
	279	if (keychar == 0x10) {
	280
	281	/*
	282	* This is a special key, handled in InitHashTables.
	283	*/
	284
	285	continue;
249	286	}
250		}
251		}
252		}
253
254		/*
255		*----------------------------------------------------------------------
256		*
257		* KeycodeToUnicode --
258		*
259		* Given MacOS key event data this function generates the Unicode
260		* characters. It does this using OS resources and APIs.
	287	macKC.v.keychar = keychar;
	288	if (! ON_KEYPAD(virtual)) {
	289	hPtr = Tcl_CreateHashEntry(&unichar2xvirtual,
	290	INT2PTR(macKC.x.keychar), &dummy);
	291	Tcl_SetHashValue(hPtr, INT2PTR(macKC.x.xvirtual));
	292	}
	293	xvirtual2unichar[macKC.x.xvirtual] = macKC.x.keychar;
	294	}
	295	}
	296	}
	297
	298	/*
	299	*----------------------------------------------------------------------
	300	*
	301	* KeyDataToUnicode --
	302	*
	303	* Given MacOS key event data this function generates the keychar. It
	304	* does this by using OS resources from the Carbon framework. Note that
	305	* the Carbon functions used here are not aware of the keychars in the
	306	* private-use range which macOS now uses for special keys. For those
	307	* keys this function returns 0x10 (ASCII dle).
261	308	*
262	309	* The parameter deadKeyStatePtr can be NULL, if no deadkey handling is
263		* needed.
264		*
265		* This function is called from XKeycodeToKeysym() in tkMacOSKeyboard.c.
	310	* needed (which is always the case here).
	311	*
	312	* This function is called in XKeycodeToKeysym and UpdateKeymaps.
266	313	*
267	314	* Results:
268	315	* The number of characters generated if any, 0 if we are waiting for
269		* another byte of a dead-key sequence. Fills in the uniChars array with a
270		* Unicode string.
	316	* another byte of a dead-key sequence.
271	317	*
272	318	* Side Effects:
273		* None
274		*
275		*----------------------------------------------------------------------
276		*/
	319	* Fills in the uniChars array with a Unicode string.
	320	*
	321	*----------------------------------------------------------------------
	322	*/
	323
277	324
278	325	static int
279		KeycodeToUnicode(
	326	KeyDataToUnicode(
280	327	UniChar *uniChars,
281	328	int maxChars,
282	329	UInt16 keyaction,
283		UInt32 keycode,
	330	UInt32 virtual,
284	331	UInt32 modifiers,
285	332	UInt32 *deadKeyStatePtr)
286	333	{
287		static const void *uchr = NULL;
	334	static const void *layoutData = NULL;
288	335	static UInt32 keyboardType = 0;
289	336	UniCharCount actuallength = 0;
290	337

297	344	currentKeyboardLayout, kTISPropertyUnicodeKeyLayoutData);
298	345
299	346	if (keyLayoutData) {
300		uchr = CFDataGetBytePtr(keyLayoutData);
	347	layoutData = CFDataGetBytePtr(keyLayoutData);
301	348	keyboardType = LMGetKbdType();
302	349	}
303	350	CFRelease(currentKeyboardLayout);
304	351	}
305	352	keyboardChanged = 0;
306	353	}
307		if (uchr) {
	354	if (layoutData) {
308	355	OptionBits options = 0;
309	356	UInt32 dummyState;
310	357	OSStatus err;
311	358
312		keycode &= 0xFF;
	359	virtual &= 0xFF;
313	360	modifiers = (modifiers >> 8) & 0xFF;
314
315	361	if (!deadKeyStatePtr) {
316	362	options = kUCKeyTranslateNoDeadKeysMask;
317	363	dummyState = 0;
318	364	deadKeyStatePtr = &dummyState;
319	365	}
320
321		err = ChkErr(UCKeyTranslate, uchr, keycode, keyaction, modifiers,
	366	err = ChkErr(UCKeyTranslate, layoutData, virtual, keyaction, modifiers,
322	367	keyboardType, options, deadKeyStatePtr, maxChars,
323	368	&actuallength, uniChars);
324
325	369	if (!actuallength && *deadKeyStatePtr) {
	370
326	371	/*
327		* More data later
	372	* We are waiting for another key.
328	373	*/
329	374
330	375	return 0;

342	387	*
343	388	* XKeycodeToKeysym --
344	389	*
345		* Translate from a system-dependent keycode to a system-independent
346		* keysym.
347		*
348		* Results:
349		* Returns the translated keysym, or NoSymbol on failure.
	390	* This is a stub function which translates from the keycode used in an
	391	* XEvent to a numerical keysym. On macOS, the display parameter is
	392	* ignored and only the the virtual keycode stored in the .virtual bitfield
	393	* of a MacKeycode.v.
	394	*
	395	* Results:
	396	* Returns the corresponding numerical keysym, or NoSymbol if the keysym
	397	* cannot be found.
350	398	*
351	399	* Side effects:
352	400	* None.
353	401	*
354	402	*----------------------------------------------------------------------
355	403	*/
	404
	405	KeySym
	406	XkbKeycodeToKeysym(
	407	TCL_UNUSED(Display *),
	408	unsigned int keycode,
	409	TCL_UNUSED(int),
	410	int index)
	411	{
	412	Tcl_HashEntry *hPtr;
	413	MacKeycode macKC;
	414	int modifiers, result;
	415	UniChar keychar = 0;
	416
	417	if (!initialized) {
	418	InitHashTables();
	419	}
	420	macKC.uint = keycode;
	421	macKC.v.o_s = index;
	422
	423	/*
	424	* First check if the virtual keycode corresponds to a special key, such as
	425	* an Fn function key or Tab, Backspace, Home, End, etc.
	426	*/
	427
	428	hPtr = Tcl_FindHashEntry(&special2keysym, INT2PTR(macKC.v.virtual));
	429	if (hPtr != NULL) {
	430	return (KeySym) Tcl_GetHashValue(hPtr);
	431	}
	432
	433	/*
	434	* If the virtual value in this keycode does not correspond to an actual
	435	* key in the current keyboard layout, try using its keychar to look up a
	436	* keysym.
	437	*/
	438
	439	if (macKC.v.virtual > 127) {
	440	hPtr = Tcl_FindHashEntry(&unichar2keysym, INT2PTR(macKC.v.keychar));
	441	if (hPtr != NULL) {
	442	return (KeySym) Tcl_GetHashValue(hPtr);
	443	}
	444	}
	445
	446	/*
	447	* If the virtual keycode does belong to a key, use the virtual and the
	448	* Option-Shift from index to look up a keychar by using the Carbon
	449	* Framework; then translate the keychar to a keysym using the
	450	* unicode2keysym hash table.
	451	*/
	452
	453	modifiers = INDEX2CARBON(macKC.v.o_s);
	454	result = KeyDataToUnicode(&keychar, 1, kUCKeyActionDown, macKC.v.virtual,
	455	modifiers, NULL);
	456	if (result) {
	457	hPtr = Tcl_FindHashEntry(&unichar2keysym, INT2PTR(keychar));
	458	if (hPtr != NULL) {
	459	return (KeySym) Tcl_GetHashValue(hPtr);
	460	}
	461	}
	462	return NoSymbol;
	463	}
356	464
357	465	KeySym
358	466	XKeycodeToKeysym(
359		Display* display,
	467	TCL_UNUSED(Display *),
360	468	KeyCode keycode,
361	469	int index)
362	470	{
363		register Tcl_HashEntry *hPtr;
364		int newKeycode;
365		UniChar newChar;
366
367		(void) display; /unused/
368
369		if (!initialized) {
370		InitKeyMaps();
371		}
372
373		/*
374		* When determining what keysym to produce we first check to see if the key
375		* is a function key. We then check to see if the character is another
376		* non-printing key. Finally, we return the key syms for all ASCII and
377		* Latin-1 chars.
378		*/
379
380		newKeycode = keycode >> 16;
381
382		if ((keycode & 0xFFFF) >= 0xF700) { /* NSEvent.h function key unicodes */
383		hPtr = Tcl_FindHashEntry(&vkeyTable, INT2PTR(newKeycode));
384		if (hPtr != NULL) {
385		return (KeySym) Tcl_GetHashValue(hPtr);
386		}
387		}
388		hPtr = Tcl_FindHashEntry(&keycodeTable, INT2PTR(newKeycode));
389		if (hPtr != NULL) {
390		return (KeySym) Tcl_GetHashValue(hPtr);
391		}
392
393		/*
394		* Add in the Mac modifier flags for shift and option.
395		*/
396
397		if (index & 1) {
398		newKeycode \|= shiftKey;
399		}
400		if (index & 2) {
401		newKeycode \|= optionKey;
402		}
403
404		newChar = 0;
405		KeycodeToUnicode(&newChar, 1, kUCKeyActionDown, newKeycode & 0x00FF,
406		newKeycode & 0xFF00, NULL);
407
408		/*
409		* X11 keysyms are identical to Unicode for ASCII and Latin-1. Give up for
410		* other characters for now.
411		*/
412
413		if ((newChar >= XK_space) && (newChar <= LATIN1_MAX)) {
414		return newChar;
415		}
416
417		return NoSymbol;
	471	return XkbKeycodeToKeysym(NULL, keycode, 0, index);
418	472	}
419	473
420	474	/*

422	476	*
423	477	* TkpGetString --
424	478	*
425		* Retrieve the string equivalent for the given keyboard event.
426		*
427		* Results:
428		* Returns the UTF string.
	479	* This is a stub function which retrieves the string stored in the
	480	* transchars field of an XEvent and converts it to a Tcl_DString.
	481	*
	482	* Results:
	483	* Returns a pointer to the string value of the DString.
429	484	*
430	485	* Side effects:
431	486	* None.

435	490
436	491	const char *
437	492	TkpGetString(
438		TkWindow winPtr, / Window where event occurred: Needed to get
	493	TCL_UNUSED(TkWindow ), / Window where event occurred: Needed to get
439	494	* input context. */
440	495	XEvent eventPtr, / X keyboard event. */
441	496	Tcl_DString dsPtr) / Uninitialized or empty string to hold
442	497	* result. */
443	498	{
444		(void) winPtr; /unused/
445		int ch;
	499	MacKeycode macKC;
	500	char utfChars[8];
	501	int length = 0;
	502
	503	macKC.uint = eventPtr->xkey.keycode;
	504	if (IS_PRINTABLE(macKC.v.keychar)) {
	505	length = TkUniCharToUtf(macKC.v.keychar, utfChars);
	506	}
	507	utfChars[length] = 0;
446	508
447	509	Tcl_DStringInit(dsPtr);
448		return Tcl_DStringAppend(dsPtr, eventPtr->xkey.trans_chars,
449		TkUtfToUniChar(eventPtr->xkey.trans_chars, &ch));
	510	return Tcl_DStringAppend(dsPtr, utfChars, length);
450	511	}
451	512
452	513	/*

454	515	*
455	516	* XGetModifierMapping --
456	517	*
457		* Fetch the current keycodes used as modifiers.
458		*
459		* Results:
460		* Returns a new modifier map.
	518	* X11 stub function to get the keycodes used as modifiers. This
	519	* is never called by the macOS port.
	520	*
	521	* Results:
	522	* Returns a newly allocated modifier map.
461	523	*
462	524	* Side effects:
463	525	* Allocates a new modifier map data structure.

467	529
468	530	XModifierKeymap *
469	531	XGetModifierMapping(
470		Display *display)
	532	TCL_UNUSED(Display *))
471	533	{
472	534	XModifierKeymap *modmap;
473	535
474		(void) display; /unused/
475
476		/*
477		* MacOSX doesn't use the key codes for the modifiers for anything, and we
478		* don't generate them either. So there is no modifier map.
479		*/
480		modmap = ckalloc(sizeof(XModifierKeymap));
	536	modmap = (XModifierKeymap *)ckalloc(sizeof(XModifierKeymap));
481	537	modmap->max_keypermod = 0;
482	538	modmap->modifiermap = NULL;
483	539	return modmap;

488	544	*
489	545	* XFreeModifiermap --
490	546	*
491		* Deallocate a modifier map that was created by XGetModifierMapping.
	547	* Deallocates a modifier map that was created by XGetModifierMapping.
	548	* This is also never called by the macOS port.
492	549	*
493	550	* Results:
494	551	* None.

515	572	*
516	573	* XKeysymToString, XStringToKeysym --
517	574	*
518		* These X window functions map keysyms to strings & strings to keysyms.
519		* However, Tk already does this for the most common keysyms. Therefore,
520		* these functions only need to support keysyms that will be specific to
521		* the Macintosh. Currently, there are none.
	575	* These X11 stub functions map keysyms to strings & strings to keysyms.
	576	* A platform can do its own conversion by defining these and undefining
	577	* REDO_KEYSYM_LOOKUP. The macOS port defines REDO_KEYSYM_LOOKUP so these
	578	* are never called and Tk does the conversion for us.
522	579	*
523	580	* Results:
524	581	* None.

531	588
532	589	char *
533	590	XKeysymToString(
534		KeySym keysym)
	591	TCL_UNUSED(KeySym))
535	592	{
536	593	return NULL;
537	594	}
538	595
539	596	KeySym
540	597	XStringToKeysym(
541		const char* string)
	598	TCL_UNUSED(const char *))
542	599	{
543	600	return NoSymbol;
544	601	}

546	603	/*
547	604	*----------------------------------------------------------------------
548	605	*
549		* XKeysymToMacKeycode --
550		*
551		* An internal function like XKeysymToKeycode but only generating the Mac
552		* specific keycode plus the modifiers Shift and Option.
553		*
554		* Results:
555		* A Mac keycode with the actual keycode in the low byte and Mac-style
556		* modifier bits in the high byte.
557		*
558		* Side effects:
559		* None.
560		*
561		*----------------------------------------------------------------------
562		*/
563
564		static int
565		XKeysymToMacKeycode(
566		Display *display,
567		KeySym keysym)
568		{
569		KeyInfo *kPtr;
570		if (keysym <= LATIN1_MAX) {
571		/*
572		* Handle keysyms in the Latin-1 range where keysym and Unicode
573		* character code point are the same.
574		*/
575
576		if (keyboardChanged) {
577		InitLatin1Table(display);
578		keyboardChanged = 0;
579		}
580		return latin1Table[keysym];
581		}
582
583		/*
584		* Handle special keys from our exception tables. Don't mind if this is
585		* slow, neither the test suite nor [event generate] need to be optimized
586		* (we hope).
587		*/
588
589		for (kPtr = keyArray; kPtr->keycode != 0; kPtr++) {
590		if (kPtr->keysym == keysym) {
591		return kPtr->keycode;
592		}
593		}
594		for (kPtr = virtualkeyArray; kPtr->keycode != 0; kPtr++) {
595		if (kPtr->keysym == keysym) {
596		return kPtr->keycode;
597		}
598		}
599
600		/*
601		* Modifier keycodes only come from generated events. No translation
602		* is needed.
603		*/
604
605		for (int i=0; i < NUM_MOD_KEYCODES; i++) {
606		if (keysym == modKeyArray[i]) {
607		return keysym;
608		}
609		}
610
611		/*
612		* For other keysyms (not Latin-1 and not special keys), we'd need a
613		* generic keysym-to-unicode table. We don't have that, so we give up here.
614		*/
615
616		return 0;
617		}
618
619		/*
620		*----------------------------------------------------------------------
621		*
622	606	* XKeysymToKeycode --
623	607	*
624		* The function XKeysymToKeycode takes an X11 keysym and converts it into
625		* a Mac keycode. It is in the stubs table for compatibility but not used
626		* anywhere in the core.
627		*
628		* Results:
629		* A 32 bit keycode with the the mac keycode (without modifiers) in the
630		* higher 16 bits of the keycode and the ASCII or Latin-1 code in the
631		* lower 8 bits of the keycode.
	608	* This is a stub function which converts a numerical keysym to the
	609	* platform-specific keycode used in a KeyPress or KeyRelease XEvent.
	610	* For macOS the keycode is an unsigned int with bitfields described
	611	* in the definition of the MacKeycode type.
	612	*
	613	* Results:
	614	*
	615	* A macOS KeyCode. See the description of keycodes at the top of this
	616	* file and the definition of the MacKeycode type in tkMacOSXPrivate.h.
632	617	*
633	618	* Side effects:
634	619	* None.

638	623
639	624	KeyCode
640	625	XKeysymToKeycode(
641		Display* display,
	626	TCL_UNUSED(Display *),
642	627	KeySym keysym)
643	628	{
644		int macKeycode = XKeysymToMacKeycode(display, keysym);
645		KeyCode result;
646
647		/*
648		* See also TkpSetKeycodeAndState. The 0x0010 magic is used in
649		* XKeycodeToKeysym. For special keys like XK_Return the lower 8 bits of
650		* the keysym are usually a related ASCII control code.
651		*/
652
653		if ((keysym >= XK_F1) && (keysym <= XK_F35)) {
654		result = 0x0010;
655		} else {
656		result = 0x00FF & keysym;
657		}
658		result \|= (macKeycode & MAC_KEYCODE_MASK) << 16;
659
660		return result;
	629	Tcl_HashEntry *hPtr;
	630	MacKeycode macKC;
	631	if (!initialized) {
	632	InitHashTables();
	633	}
	634
	635	/*
	636	* First check for a special key.
	637	*/
	638
	639	hPtr = Tcl_FindHashEntry(&keysym2keycode, INT2PTR(keysym));
	640	if (hPtr != NULL) {
	641	return (KeyCode) Tcl_GetHashValue(hPtr);
	642	}
	643
	644	/*
	645	* Initialize the keycode as if the keysym cannot be converted to anything
	646	* else.
	647	*/
	648
	649	macKC.v.virtual = NO_VIRTUAL;
	650	macKC.v.o_s = 0;
	651	macKC.v.keychar = 0;
	652
	653	/*
	654	* If the keysym is recognized fill in the keychar. Also fill in the
	655	* xvirtual field if the key exists on the current keyboard.
	656	*/
	657
	658	hPtr = (Tcl_HashEntry *) Tcl_FindHashEntry(&keysym2unichar,
	659	INT2PTR(keysym));
	660	if (hPtr != NULL) {
	661	unsigned long data = (unsigned long) Tcl_GetHashValue(hPtr);
	662	macKC.x.keychar = (unsigned int) data;
	663	hPtr = Tcl_FindHashEntry(&unichar2xvirtual, INT2PTR(macKC.x.keychar));
	664	if (hPtr != NULL) {
	665	data = (unsigned long) Tcl_GetHashValue(hPtr);
	666	macKC.x.xvirtual = (unsigned int) data;
	667	}
	668	}
	669	return (KeyCode) macKC.uint;
661	670	}
662	671
663	672	/*

665	674	*
666	675	* TkpSetKeycodeAndState --
667	676	*
668		* The function TkpSetKeycodeAndState takes a keysym and fills in the
669		* appropriate members of an XEvent. It is similar to XKeysymToKeycode,
670		* but it also sets the modifier mask in the XEvent. It is used by [event
671		* generate] and it is in the stubs table.
672		*
673		* Results:
674		* Fills an XEvent, sets the member xkey.keycode with a keycode
675		* formatted the same as XKeysymToKeycode and the member xkey.state with
676		* the modifiers implied by the keysym. Also fills in xkey.trans_chars,
677		* so that the actual characters can be retrieved later.
678		*
679		* Side effects:
680		* None.
681		*
682		*----------------------------------------------------------------------
683		*/
684
	677	* This function accepts a keysym and an XEvent and sets some fields of
	678	* the XEvent. It is used by the event generate command.
	679	*
	680	* Results:
	681	* None
	682	*
	683	* Side effects:
	684	*
	685	* Modifies the XEvent. Sets the xkey.keycode to a keycode value formatted
	686	* by XKeysymToKeycode and updates the shift and option flags in
	687	* xkey.state if either of those modifiers is required to generate the
	688	* keysym.
	689	*
	690	*----------------------------------------------------------------------
	691	*/
685	692	void
686	693	TkpSetKeycodeAndState(
687		Tk_Window tkwin,
	694	TCL_UNUSED(Tk_Window),
688	695	KeySym keysym,
689	696	XEvent *eventPtr)
690	697	{
691	698	if (keysym == NoSymbol) {
692	699	eventPtr->xkey.keycode = 0;
693		} else if ( modKeyArray[0] <= keysym &&
694		keysym <= modKeyArray[NUM_MOD_KEYCODES - 1]) {
	700	} else {
	701	int eventIndex = STATE2INDEX(eventPtr->xkey.state);
	702	MacKeycode macKC;
	703	macKC.uint = XKeysymToKeycode(NULL, keysym);
	704
695	705	/*
696		* Keysyms for pure modifiers only arise in generated events.
697		* We should just copy them to the keycode.
	706	* We have a virtual keycode and a minimal choice for Shift and Option
	707	* modifiers which generates the keychar that corresponds to the
	708	* specified keysym. But we might not have the correct keychar yet,
	709	* because the xEvent may have specified modifiers beyond our minimal
	710	* set. For example, the events described by <Oslash>, <Shift-oslash>,
	711	* <Shift-Option-O> and <Shift-Option-o> should all produce the same
	712	* uppercase Danish O. So we may need to add the extra modifiers and
	713	* do another lookup for the keychar. We don't want to do this for
	714	* special keys, however.
698	715	*/
699		eventPtr->xkey.keycode = keysym;
700		} else {
701		Display *display = Tk_Display(tkwin);
702		int macKeycode = XKeysymToMacKeycode(display, keysym);
703
704		/*
705		* See also XKeysymToKeycode.
706		*/
707		if ((keysym >= XK_F1) && (keysym <= XK_F35)) {
708		eventPtr->xkey.keycode = 0x0010;
709		} else {
710		eventPtr->xkey.keycode = 0x00FF & keysym;
711		}
712		eventPtr->xkey.keycode \|= (macKeycode & MAC_KEYCODE_MASK) << 16;
713
714		if (shiftKey & macKeycode) {
715		eventPtr->xkey.state \|= ShiftMask;
716		}
717		if (optionKey & macKeycode) {
718		eventPtr->xkey.state \|= OPTION_MASK;
719		}
720
721		if (keysym <= LATIN1_MAX) {
722		int done = TkUniCharToUtf(keysym, eventPtr->xkey.trans_chars);
723
724		eventPtr->xkey.trans_chars[done] = 0;
725		} else {
726		eventPtr->xkey.trans_chars[0] = 0;
727		}
	716
	717	if (macKC.v.o_s != eventIndex) {
	718	macKC.v.o_s \|= eventIndex;
	719	}
	720	if (macKC.v.keychar < 0xF700) {
	721	UniChar keychar = macKC.v.keychar;
	722	NSString str, lower, *upper;
	723	if (macKC.v.virtual != NO_VIRTUAL) {
	724	macKC.x.keychar = xvirtual2unichar[macKC.x.xvirtual];
	725	} else {
	726	str = [[NSString alloc] initWithCharacters:&keychar length:1];
	727	lower = [str lowercaseString];
	728	upper = [str uppercaseString];
	729	if (![str isEqual: lower]) {
	730	macKC.v.o_s \|= INDEX_SHIFT;
	731	}
	732	if (macKC.v.o_s & INDEX_SHIFT) {
	733	macKC.v.keychar = [upper characterAtIndex:0];
	734	}
	735	}
	736	}
	737	eventPtr->xkey.keycode = macKC.uint;
	738	eventPtr->xkey.state \|= INDEX2STATE(macKC.v.o_s);
728	739	}
729	740	}
730	741

733	744	*
734	745	* TkpGetKeySym --
735	746	*
736		* Given an X KeyPress or KeyRelease event, map the keycode in the event
737		* into a keysym.
	747	* This is a stub function called in tkBind.c. Given a KeyPress or
	748	* KeyRelease XEvent, it maps the keycode in the event to a numerical
	749	* keysym.
738	750	*
739	751	* Results:
740	752	* The return value is the keysym corresponding to eventPtr, or NoSymbol
741	753	* if no matching keysym could be found.
742	754	*
743	755	* Side effects:
744		* In the first call for a given display, keycode-to-keysym maps get
745		* loaded.
	756	* In the first call for a given display, calls TkpInitKeymapInfo.
	757	*
746	758	*
747	759	*----------------------------------------------------------------------
748	760	*/

754	766	{
755	767	KeySym sym;
756	768	int index;
	769	MacKeycode macKC;
	770	macKC.uint = eventPtr->xkey.keycode;
757	771
758	772	/*
759	773	* Refresh the mapping information if it's stale.

764	778	}
765	779
766	780	/*
767		* Handle pure modifier keys specially. We use -1 as a signal for
768		* this.
769		*/
770
771		if (eventPtr->xany.send_event == -1) {
772		int modifier = eventPtr->xkey.keycode & NSDeviceIndependentModifierFlagsMask;
773
774		if (modifier == NSCommandKeyMask) {
	781	* Modifier key events have a special mac keycode (see tkProcessKeyEvent).
	782	*/
	783
	784	if (macKC.v.keychar == MOD_KEYCHAR) {
	785	switch (macKC.v.virtual) {
	786	case 54:
	787	return XK_Meta_R;
	788	case 55:
775	789	return XK_Meta_L;
776		} else if (modifier == NSShiftKeyMask) {
	790	case 56:
777	791	return XK_Shift_L;
778		} else if (modifier == NSAlphaShiftKeyMask) {
	792	case 57:
779	793	return XK_Caps_Lock;
780		} else if (modifier == NSAlternateKeyMask) {
	794	case 58:
781	795	return XK_Alt_L;
782		} else if (modifier == NSControlKeyMask) {
	796	case 59:
783	797	return XK_Control_L;
784		} else if (modifier == NSNumericPadKeyMask) {
785		return XK_Num_Lock;
786		} else if (modifier == NSFunctionKeyMask) {
	798	case 60:
	799	return XK_Shift_R;
	800	case 61:
	801	return XK_Alt_R;
	802	case 62:
	803	return XK_Control_R;
	804	case 63:
787	805	return XK_Super_L;
788		/*
789		} else if (modifier == rightShiftKey) {
790		return XK_Shift_R;
791		} else if (modifier == rightOptionKey) {
792		return XK_Alt_R;
793		} else if (modifier == rightControlKey) {
794		return XK_Control_R;
795		*/
796		} else {
797		/*
798		* If we get here, we probably need to implement something new.
799		*/
800
	806	default:
801	807	return NoSymbol;
802	808	}
803		}
804
805		/* If nbytes has been set, it's not a function key, but a regular key that
806		has been translated in tkMacOSXKeyEvent.c; just use that. */
807		if (eventPtr->xkey.nbytes) {
808		return eventPtr->xkey.keycode;
809	809	}
810	810
811	811	/*
812	812	* Figure out which of the four slots in the keymap vector to use for this
813	813	* key. Refer to Xlib documentation for more info on how this computation
814		* works. (Note: We use "Option" in keymap columns 2 and 3 where other
815		* implementations have "Mode_switch".)
816		*/
817
818		index = 0;
819
820		/*
821		* We want Option key combinations to use their base chars as keysyms, so
822		* we ignore the option modifier here.
823		*/
824
825		#if 0
826		if (eventPtr->xkey.state & OPTION_MASK) {
827		index \|= 2;
828		}
829		#endif
830
831		if ((eventPtr->xkey.state & ShiftMask)
832		\|\| (/* (dispPtr->lockUsage != LU_IGNORE)
833		&& */ (eventPtr->xkey.state & LockMask))) {
834		index \|= 1;
835		}
836
837		/*
838		* First try of the actual translation.
839		*/
840
841		sym = XKeycodeToKeysym(dispPtr->display, eventPtr->xkey.keycode, index);
842
843		/*
844		* Special handling: If the key was shifted because of Lock, but lock is
845		* only caps lock, not shift lock, and the shifted keysym isn't upper-case
846		* alphabetic, then switch back to the unshifted keysym.
847		*/
848
849		if ((index & 1) && !(eventPtr->xkey.state & ShiftMask)
850		/&& (dispPtr->lockUsage == LU_CAPS)/ ) {
851		/*
852		* FIXME: Keysyms are only identical to Unicode for ASCII and Latin-1,
853		* so we can't use Tcl_UniCharIsUpper() for keysyms outside that range.
854		* This may be a serious problem here.
855		*/
856
857		if ((sym == NoSymbol) \|\| (sym > LATIN1_MAX)
858		\|\| !Tcl_UniCharIsUpper(sym)) {
859		index &= ~1;
860		sym = XKeycodeToKeysym(dispPtr->display, eventPtr->xkey.keycode,
861		index);
	814	* works.
	815	*/
	816
	817	index = STATE2INDEX(eventPtr->xkey.state);
	818	if (eventPtr->xkey.state & LockMask) {
	819	index \|= INDEX_SHIFT;
	820	}
	821
	822	/*
	823	* First do the straightforward lookup.
	824	*/
	825
	826	sym = XkbKeycodeToKeysym(dispPtr->display, macKC.uint, 0, index);
	827
	828	/*
	829	* Special handling: If the key was shifted because of Lock, which is only
	830	* caps lock on macOS, not shift lock, and if the shifted keysym isn't
	831	* upper-case alphabetic, then switch back to the unshifted keysym.
	832	*/
	833
	834	if ((index & INDEX_SHIFT) && !(eventPtr->xkey.state & ShiftMask)) {
	835	if ((sym == NoSymbol) \|\| !Tcl_UniCharIsUpper(sym)) {
	836	sym = XkbKeycodeToKeysym(dispPtr->display, macKC.uint, 0,
	837	index & ~INDEX_SHIFT);
862	838	}
863	839	}
864	840

867	843	* no keysym defined, then use the keysym for the unshifted key.
868	844	*/
869	845
870		if ((index & 1) && (sym == NoSymbol)) {
871		sym = XKeycodeToKeysym(dispPtr->display, eventPtr->xkey.keycode,
872		index & ~1);
	846	if ((index & INDEX_SHIFT) && (sym == NoSymbol)) {
	847	sym = XkbKeycodeToKeysym(dispPtr->display, macKC.uint, 0,
	848	index & ~INDEX_SHIFT);
873	849	}
874	850	return sym;
875	851	}

879	855	*
880	856	* TkpInitKeymapInfo --
881	857	*
882		* This procedure is invoked to scan keymap information to recompute stuff
883		* that's important for binding, such as the modifier key (if any) that
884		* corresponds to the "Mode_switch" keysym.
	858	* This procedure initializes fields in the display that pertain
	859	* to modifier keys.
885	860	*
886	861	* Results:
887	862	* None.
888	863	*
889	864	* Side effects:
890		* Keymap-related information in dispPtr is updated.
	865	* Modifier key information in dispPtr is initialized.
891	866	*
892	867	*--------------------------------------------------------------
893	868	*/

900	875	dispPtr->bindInfoStale = 0;
901	876
902	877	/*
903		* Behaviours that are variable on X11 are defined constant on MacOSX.
904		* lockUsage is only used above in TkpGetKeySym(), nowhere else currently.
	878	* On macOS the caps lock key is always interpreted to mean that alphabetic
	879	* keys become uppercase but other keys do not get shifted. (X11 allows
	880	* a configuration option which makes the caps lock equivalent to holding
	881	* down the shift key.)
905	882	* There is no offical "Mode_switch" key.
906	883	*/
907	884
908	885	dispPtr->lockUsage = LU_CAPS;
	886
	887	/* This field is no longer used by tkBind.c */
	888
909	889	dispPtr->modeModMask = 0;
910	890
911		#if 0
912		/*
913		* With this, <Alt> and <Meta> become synonyms for <Command> and <Option>
914		* in bindings like they are (and always have been) in the keysyms that
915		* are reported by KeyPress events. But the init scripts like text.tcl
916		* have some disabling bindings for <Meta>, so we don't want this without
917		* some changes in those scripts. See also bug #700311.
918		*/
919
920		dispPtr->altModMask = OPTION_MASK;
921		dispPtr->metaModMask = COMMAND_MASK;
922		#else
	891	/* The Alt and Meta keys are interchanged on Macintosh keyboards compared
	892	* to PC keyboards. These fields could be set to make the Alt key on a PC
	893	* keyboard behave likd an Alt key. That would also require interchanging
	894	* Mod1Mask and Mod2Mask in tkMacOSXKeyEvent.c.
	895	*/
	896
923	897	dispPtr->altModMask = 0;
924	898	dispPtr->metaModMask = 0;
925		#endif
926
927		/*
928		* MacOSX doesn't create a key event when a modifier key is pressed or
929		* released. However, it is possible to generate key events for
930		* modifier keys, and this is done in the tests. So we construct an array
931		* containing the keycodes of the standard modifier keys from static data.
	899
	900	/*
	901	* The modKeyCodes table lists the keycodes that appear in KeyPress or
	902	* KeyRelease XEvents for modifier keys. In tkBind.c this table is
	903	* searched to determine whether an XEvent corresponds to a modifier key.
932	904	*/
933	905
934	906	if (dispPtr->modKeyCodes != NULL) {

937	909	dispPtr->numModKeyCodes = NUM_MOD_KEYCODES;
938	910	dispPtr->modKeyCodes = (KeyCode )ckalloc(NUM_MOD_KEYCODES sizeof(KeyCode));
939	911	for (int i = 0; i < NUM_MOD_KEYCODES; i++) {
940		dispPtr->modKeyCodes[i] = modKeyArray[i];
941		}
942		}
943
	912	dispPtr->modKeyCodes[i] = XKeysymToKeycode(NULL, modKeyArray[i]);
	913	}
	914	}
	915
	916	/*
	917	*--------------------------------------------------------------
	918	*
	919	* TkMacOSXAddVirtual --
	920	*
	921	* This procedure is an internal utility which accepts an unsigned int
	922	* that has been partially filled as a MacKeycode, having the Option and
	923	* Shift state set in the o_s field and the keychar field set but with the
	924	* virtual keycode blank. It looks up the virtual keycode for the keychar
	925	* (possibly NO_VIRTUAL) and returns an unsigned int which is a complete
	926	* MacKeycode with the looked up virtual keycode added. This is used when
	927	* creating XEvents for the unicode characters which are generated by the
	928	* NSTextInputClient.
	929	*
	930	* Results:
	931	* An unsigned int which is a complete MacKeycode, including a virtual
	932	* keycode which matches the Option-Shift state and keychar.
	933	*
	934	* Side effects:
	935	* None
	936	*
	937	*--------------------------------------------------------------
	938	*/
	939	unsigned
	940	TkMacOSXAddVirtual(
	941	unsigned int keycode)
	942	{
	943	MacKeycode macKC;
	944	Tcl_HashEntry *hPtr;
	945	macKC.uint = keycode;
	946
	947	if (!initialized) {
	948	InitHashTables();
	949	}
	950
	951	hPtr = (Tcl_HashEntry *) Tcl_FindHashEntry(&unichar2xvirtual,
	952	INT2PTR(macKC.v.keychar));
	953	if (hPtr != NULL) {
	954	unsigned long data = (unsigned long) Tcl_GetHashValue(hPtr);
	955	macKC.x.xvirtual = (unsigned int) data;
	956	} else {
	957	macKC.v.virtual = NO_VIRTUAL;
	958	}
	959	return macKC.uint;
	960	}
944	961	/*
945	962	* Local Variables:
946	963	* mode: objc

+1308

-0

macosx/tkMacOSXKeysyms.h less more

	0	/*
	1	* tkMacOSXKeysyms.h --
	2	*
	3	* Contains data used for processing key events, some of which was
	4	* moved from tkMacOSXKeyboard.c.
	5	*
	6	* Copyright (c) 1990-1994 The Regents of the University of California.
	7	* Copyright (c) 1994-1997 Sun Microsystems, Inc.
	8	* Copyright 2001-2009, Apple Inc.
	9	* Copyright (c) 2006-2009 Daniel A. Steffen <das@users.sourceforge.net>
	10	* Copyright (c) 2020 Marc Culler
	11	*
	12	* See the file "license.terms" for information on usage and redistribution
	13	* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
	14	*/
	15
	16	#ifndef TKMACOSXKEYSYMS_H
	17	#define TKMACOSXKEYSYMS_H 1
	18
	19	/*
	20	* This table enumerates the keys on Mac keyboards which do not represent
	21	* letters. This is static data -- these keys do not change when the keyboard
	22	* layout changes. The unicode representation of a special key which is not a
	23	* modifier and does not have an ASCII code point lies in the reserved range
	24	* 0xF700 - 0xF8FF.
	25	*
	26	* The table includes every key listed in Apple's documentation of Function-Key
	27	* Unicodes which is not marked as "Not on most Macintosh keyboards", as well
	28	* as F20, which is reported to be usable in scripts even though it does not
	29	* appear on any Macintosh keyboard.
	30	*/
	31
	32	typedef struct {
	33	int virtual; /* value of [NSEvent keyCode] */
	34	KeySym keysym; /* X11 keysym */
	35	KeyCode keychar; /* XEvent keycode & 0xFFFF */
	36	} KeyInfo;
	37
	38	static const KeyInfo keyArray[] = {
	39	{36, XK_Return, NSNewlineCharacter},
	40	{48, XK_Tab, NSTabCharacter},
	41	{51, XK_BackSpace, NSDeleteCharacter},
	42	{52, XK_Return, NSNewlineCharacter}, /* Used on some Powerbooks */
	43	{53, XK_Escape, 0x1B},
	44	{54, XK_Meta_R, MOD_KEYCHAR},
	45	{55, XK_Meta_L, MOD_KEYCHAR},
	46	{56, XK_Shift_L, MOD_KEYCHAR},
	47	{57, XK_Caps_Lock, MOD_KEYCHAR},
	48	{58, XK_Alt_L, MOD_KEYCHAR},
	49	{59, XK_Control_L, MOD_KEYCHAR},
	50	{60, XK_Shift_R, MOD_KEYCHAR},
	51	{61, XK_Alt_R, MOD_KEYCHAR},
	52	{62, XK_Control_R, MOD_KEYCHAR},
	53	{63, XK_Super_L, MOD_KEYCHAR},
	54	{64, XK_F17, NSF17FunctionKey},
	55	{65, XK_KP_Decimal, '.'},
	56	{67, XK_KP_Multiply, '*'},
	57	{69, XK_KP_Add, '+'},
	58	{71, XK_Clear, NSClearLineFunctionKey}, /* Numlock on PC */
	59	{75, XK_KP_Divide, '/'},
	60	{76, XK_KP_Enter, NSEnterCharacter}, /* Fn Return */
	61	{78, XK_KP_Subtract, '-'},
	62	{79, XK_F18, NSF18FunctionKey},
	63	{80, XK_F19, NSF19FunctionKey},
	64	{81, XK_KP_Equal, '='},
	65	{82, XK_KP_0, '0'},
	66	{83, XK_KP_1, '1'},
	67	{84, XK_KP_2, '2'},
	68	{85, XK_KP_3, '3'},
	69	{86, XK_KP_4, '4'},
	70	{87, XK_KP_5, '5'},
	71	{88, XK_KP_6, '6'},
	72	{89, XK_KP_7, '7'},
	73	{90, XK_F20, NSF20FunctionKey}, /* For scripting only */
	74	{91, XK_KP_8, '8'},
	75	{92, XK_KP_9, '9'},
	76	{96, XK_F5, NSF5FunctionKey},
	77	{97, XK_F6, NSF6FunctionKey},
	78	{98, XK_F7, NSF7FunctionKey},
	79	{99, XK_F3, NSF3FunctionKey},
	80	{100, XK_F8, NSF8FunctionKey},
	81	{101, XK_F9, NSF9FunctionKey},
	82	{103, XK_F11, NSF11FunctionKey},
	83	{105, XK_F13, NSF13FunctionKey},
	84	{106, XK_F16, NSF16FunctionKey},
	85	{107, XK_F14, NSF14FunctionKey},
	86	{109, XK_F10, NSF10FunctionKey},
	87	{110, XK_Menu, UNKNOWN_KEYCHAR},
	88	{111, XK_F12, NSF12FunctionKey},
	89	{113, XK_F15, NSF15FunctionKey},
	90	{114, XK_Help, NSHelpFunctionKey},
	91	{115, XK_Home, NSHomeFunctionKey}, /* Fn Left */
	92	{116, XK_Page_Up, NSPageUpFunctionKey}, /* Fn Up */
	93	{117, XK_Delete, NSDeleteFunctionKey}, /* Fn Delete */
	94	{118, XK_F4, NSF4FunctionKey},
	95	{119, XK_End, NSEndFunctionKey}, /* Fn Right */
	96	{120, XK_F2, NSF2FunctionKey},
	97	{121, XK_Page_Down, NSPageDownFunctionKey}, /* Fn Down */
	98	{122, XK_F1, NSF1FunctionKey},
	99	{123, XK_Left, NSLeftArrowFunctionKey},
	100	{124, XK_Right, NSRightArrowFunctionKey},
	101	{125, XK_Down, NSDownArrowFunctionKey},
	102	{126, XK_Up, NSUpArrowFunctionKey},
	103	{0, 0, 0}
	104	};
	105
	106	/*
	107	* X11 keysyms for modifier keys, in order. This list includes keys
	108	* which do not appear on Apple keyboards, such as Shift_Lock and
	109	* Super_R. While most systems don't provide events for the "fn"
	110	* function key, Apple does. We map it to Super_L when processing a
	111	* FlagsChanged NSEvent.
	112	*/
	113
	114	#define NUM_MOD_KEYCODES 14
	115	static const KeyCode modKeyArray[NUM_MOD_KEYCODES] = {
	116	XK_Shift_L,
	117	XK_Shift_R,
	118	XK_Control_L,
	119	XK_Control_R,
	120	XK_Caps_Lock,
	121	XK_Shift_Lock,
	122	XK_Meta_L,
	123	XK_Meta_R,
	124	XK_Alt_L,
	125	XK_Alt_R,
	126	XK_Super_L,
	127	XK_Super_R,
	128	XK_Hyper_L,
	129	XK_Hyper_R,
	130	};
	131
	132	/*
	133	* This table pairs X11 Keysyms for alphanumeric characters with the
	134	* unicode code point for that letter.
	135	* The data comes from http://www.cl.cam.ac.uk/~mgk25/ucs/keysyms.txt
	136	*/
	137
	138	typedef struct KeysymInfo {
	139	KeySym keysym;
	140	KeyCode keycode;
	141	} KeysymInfo;
	142
	143	const KeysymInfo keysymTable[] = {
	144	{0x0020, 0x0020}, /* space */
	145	{0x0021, 0x0021}, /* exclam */
	146	{0x0022, 0x0022}, /* quotedbl */
	147	{0x0023, 0x0023}, /* numbersign */
	148	{0x0024, 0x0024}, /* dollar */
	149	{0x0025, 0x0025}, /* percent */
	150	{0x0026, 0x0026}, /* ampersand */
	151	{0x0027, 0x0027}, /* apostrophe */
	152	{0x0028, 0x0028}, /* parenleft */
	153	{0x0029, 0x0029}, /* parenright */
	154	{0x002a, 0x002a}, /* asterisk */
	155	{0x002b, 0x002b}, /* plus */
	156	{0x002c, 0x002c}, /* comma */
	157	{0x002d, 0x002d}, /* minus */
	158	{0x002e, 0x002e}, /* period */
	159	{0x002f, 0x002f}, /* slash */
	160	{0x0030, 0x0030}, /* 0 */
	161	{0x0031, 0x0031}, /* 1 */
	162	{0x0032, 0x0032}, /* 2 */
	163	{0x0033, 0x0033}, /* 3 */
	164	{0x0034, 0x0034}, /* 4 */
	165	{0x0035, 0x0035}, /* 5 */
	166	{0x0036, 0x0036}, /* 6 */
	167	{0x0037, 0x0037}, /* 7 */
	168	{0x0038, 0x0038}, /* 8 */
	169	{0x0039, 0x0039}, /* 9 */
	170	{0x003a, 0x003a}, /* colon */
	171	{0x003b, 0x003b}, /* semicolon */
	172	{0x003c, 0x003c}, /* less */
	173	{0x003d, 0x003d}, /* equal */
	174	{0x003e, 0x003e}, /* greater */
	175	{0x003f, 0x003f}, /* question */
	176	{0x0040, 0x0040}, /* at */
	177	{0x0041, 0x0041}, /* A */
	178	{0x0042, 0x0042}, /* B */
	179	{0x0043, 0x0043}, /* C */
	180	{0x0044, 0x0044}, /* D */
	181	{0x0045, 0x0045}, /* E */
	182	{0x0046, 0x0046}, /* F */
	183	{0x0047, 0x0047}, /* G */
	184	{0x0048, 0x0048}, /* H */
	185	{0x0049, 0x0049}, /* I */
	186	{0x004a, 0x004a}, /* J */
	187	{0x004b, 0x004b}, /* K */
	188	{0x004c, 0x004c}, /* L */
	189	{0x004d, 0x004d}, /* M */
	190	{0x004e, 0x004e}, /* N */
	191	{0x004f, 0x004f}, /* O */
	192	{0x0050, 0x0050}, /* P */
	193	{0x0051, 0x0051}, /* Q */
	194	{0x0052, 0x0052}, /* R */
	195	{0x0053, 0x0053}, /* S */
	196	{0x0054, 0x0054}, /* T */
	197	{0x0055, 0x0055}, /* U */
	198	{0x0056, 0x0056}, /* V */
	199	{0x0057, 0x0057}, /* W */
	200	{0x0058, 0x0058}, /* X */
	201	{0x0059, 0x0059}, /* Y */
	202	{0x005a, 0x005a}, /* Z */
	203	{0x005b, 0x005b}, /* bracketleft */
	204	{0x005c, 0x005c}, /* backslash */
	205	{0x005d, 0x005d}, /* bracketright */
	206	{0x005e, 0x005e}, /* asciicircum */
	207	{0x005f, 0x005f}, /* underscore */
	208	{0x0060, 0x0060}, /* grave */
	209	{0x0061, 0x0061}, /* a */
	210	{0x0062, 0x0062}, /* b */
	211	{0x0063, 0x0063}, /* c */
	212	{0x0064, 0x0064}, /* d */
	213	{0x0065, 0x0065}, /* e */
	214	{0x0066, 0x0066}, /* f */
	215	{0x0067, 0x0067}, /* g */
	216	{0x0068, 0x0068}, /* h */
	217	{0x0069, 0x0069}, /* i */
	218	{0x006a, 0x006a}, /* j */
	219	{0x006b, 0x006b}, /* k */
	220	{0x006c, 0x006c}, /* l */
	221	{0x006d, 0x006d}, /* m */
	222	{0x006e, 0x006e}, /* n */
	223	{0x006f, 0x006f}, /* o */
	224	{0x0070, 0x0070}, /* p */
	225	{0x0071, 0x0071}, /* q */
	226	{0x0072, 0x0072}, /* r */
	227	{0x0073, 0x0073}, /* s */
	228	{0x0074, 0x0074}, /* t */
	229	{0x0075, 0x0075}, /* u */
	230	{0x0076, 0x0076}, /* v */
	231	{0x0077, 0x0077}, /* w */
	232	{0x0078, 0x0078}, /* x */
	233	{0x0079, 0x0079}, /* y */
	234	{0x007a, 0x007a}, /* z */
	235	{0x007b, 0x007b}, /* braceleft */
	236	{0x007c, 0x007c}, /* bar */
	237	{0x007d, 0x007d}, /* braceright */
	238	{0x007e, 0x007e}, /* asciitilde */
	239	{0x00a0, 0x00a0}, /* nobreakspace */
	240	{0x00a1, 0x00a1}, /* exclamdown */
	241	{0x00a2, 0x00a2}, /* cent */
	242	{0x00a3, 0x00a3}, /* sterling */
	243	{0x00a4, 0x00a4}, /* currency */
	244	{0x00a5, 0x00a5}, /* yen */
	245	{0x00a6, 0x00a6}, /* brokenbar */
	246	{0x00a7, 0x00a7}, /* section */
	247	{0x00a8, 0x00a8}, /* diaeresis */
	248	{0x00a9, 0x00a9}, /* copyright */
	249	{0x00aa, 0x00aa}, /* ordfeminine */
	250	{0x00ab, 0x00ab}, /* guillemotleft */
	251	{0x00ac, 0x00ac}, /* notsign */
	252	{0x00ad, 0x00ad}, /* hyphen */
	253	{0x00ae, 0x00ae}, /* registered */
	254	{0x00af, 0x00af}, /* macron */
	255	{0x00b0, 0x00b0}, /* degree */
	256	{0x00b1, 0x00b1}, /* plusminus */
	257	{0x00b2, 0x00b2}, /* twosuperior */
	258	{0x00b3, 0x00b3}, /* threesuperior */
	259	{0x00b4, 0x00b4}, /* acute */
	260	{0x00b5, 0x00b5}, /* mu */
	261	{0x00b6, 0x00b6}, /* paragraph */
	262	{0x00b7, 0x00b7}, /* periodcentered */
	263	{0x00b8, 0x00b8}, /* cedilla */
	264	{0x00b9, 0x00b9}, /* onesuperior */
	265	{0x00ba, 0x00ba}, /* masculine */
	266	{0x00bb, 0x00bb}, /* guillemotright */
	267	{0x00bc, 0x00bc}, /* onequarter */
	268	{0x00bd, 0x00bd}, /* onehalf */
	269	{0x00be, 0x00be}, /* threequarters */
	270	{0x00bf, 0x00bf}, /* questiondown */
	271	{0x00c0, 0x00c0}, /* Agrave */
	272	{0x00c1, 0x00c1}, /* Aacute */
	273	{0x00c2, 0x00c2}, /* Acircumflex */
	274	{0x00c3, 0x00c3}, /* Atilde */
	275	{0x00c4, 0x00c4}, /* Adiaeresis */
	276	{0x00c5, 0x00c5}, /* Aring */
	277	{0x00c6, 0x00c6}, /* AE */
	278	{0x00c7, 0x00c7}, /* Ccedilla */
	279	{0x00c8, 0x00c8}, /* Egrave */
	280	{0x00c9, 0x00c9}, /* Eacute */
	281	{0x00ca, 0x00ca}, /* Ecircumflex */
	282	{0x00cb, 0x00cb}, /* Ediaeresis */
	283	{0x00cc, 0x00cc}, /* Igrave */
	284	{0x00cd, 0x00cd}, /* Iacute */
	285	{0x00ce, 0x00ce}, /* Icircumflex */
	286	{0x00cf, 0x00cf}, /* Idiaeresis */
	287	{0x00d0, 0x00d0}, /* ETH */
	288	{0x00d1, 0x00d1}, /* Ntilde */
	289	{0x00d2, 0x00d2}, /* Ograve */
	290	{0x00d3, 0x00d3}, /* Oacute */
	291	{0x00d4, 0x00d4}, /* Ocircumflex */
	292	{0x00d5, 0x00d5}, /* Otilde */
	293	{0x00d6, 0x00d6}, /* Odiaeresis */
	294	{0x00d7, 0x00d7}, /* multiply */
	295	{0x00d8, 0x00d8}, /* Oslash */
	296	{0x00d9, 0x00d9}, /* Ugrave */
	297	{0x00da, 0x00da}, /* Uacute */
	298	{0x00db, 0x00db}, /* Ucircumflex */
	299	{0x00dc, 0x00dc}, /* Udiaeresis */
	300	{0x00dd, 0x00dd}, /* Yacute */
	301	{0x00de, 0x00de}, /* THORN */
	302	{0x00df, 0x00df}, /* ssharp */
	303	{0x00e0, 0x00e0}, /* agrave */
	304	{0x00e1, 0x00e1}, /* aacute */
	305	{0x00e2, 0x00e2}, /* acircumflex */
	306	{0x00e3, 0x00e3}, /* atilde */
	307	{0x00e4, 0x00e4}, /* adiaeresis */
	308	{0x00e5, 0x00e5}, /* aring */
	309	{0x00e6, 0x00e6}, /* ae */
	310	{0x00e7, 0x00e7}, /* ccedilla */
	311	{0x00e8, 0x00e8}, /* egrave */
	312	{0x00e9, 0x00e9}, /* eacute */
	313	{0x00ea, 0x00ea}, /* ecircumflex */
	314	{0x00eb, 0x00eb}, /* ediaeresis */
	315	{0x00ec, 0x00ec}, /* igrave */
	316	{0x00ed, 0x00ed}, /* iacute */
	317	{0x00ee, 0x00ee}, /* icircumflex */
	318	{0x00ef, 0x00ef}, /* idiaeresis */
	319	{0x00f0, 0x00f0}, /* eth */
	320	{0x00f1, 0x00f1}, /* ntilde */
	321	{0x00f2, 0x00f2}, /* ograve */
	322	{0x00f3, 0x00f3}, /* oacute */
	323	{0x00f4, 0x00f4}, /* ocircumflex */
	324	{0x00f5, 0x00f5}, /* otilde */
	325	{0x00f6, 0x00f6}, /* odiaeresis */
	326	{0x00f7, 0x00f7}, /* division */
	327	{0x00f8, 0x00f8}, /* oslash */
	328	{0x00f9, 0x00f9}, /* ugrave */
	329	{0x00fa, 0x00fa}, /* uacute */
	330	{0x00fb, 0x00fb}, /* ucircumflex */
	331	{0x00fc, 0x00fc}, /* udiaeresis */
	332	{0x00fd, 0x00fd}, /* yacute */
	333	{0x00fe, 0x00fe}, /* thorn */
	334	{0x00ff, 0x00ff}, /* ydiaeresis */
	335	{0x01a1, 0x0104}, /* Aogonek */
	336	{0x01a2, 0x02d8}, /* breve */
	337	{0x01a3, 0x0141}, /* Lstroke */
	338	{0x01a5, 0x013d}, /* Lcaron */
	339	{0x01a6, 0x015a}, /* Sacute */
	340	{0x01a9, 0x0160}, /* Scaron */
	341	{0x01aa, 0x015e}, /* Scedilla */
	342	{0x01ab, 0x0164}, /* Tcaron */
	343	{0x01ac, 0x0179}, /* Zacute */
	344	{0x01ae, 0x017d}, /* Zcaron */
	345	{0x01af, 0x017b}, /* Zabovedot */
	346	{0x01b1, 0x0105}, /* aogonek */
	347	{0x01b2, 0x02db}, /* ogonek */
	348	{0x01b3, 0x0142}, /* lstroke */
	349	{0x01b5, 0x013e}, /* lcaron */
	350	{0x01b6, 0x015b}, /* sacute */
	351	{0x01b7, 0x02c7}, /* caron */
	352	{0x01b9, 0x0161}, /* scaron */
	353	{0x01ba, 0x015f}, /* scedilla */
	354	{0x01bb, 0x0165}, /* tcaron */
	355	{0x01bc, 0x017a}, /* zacute */
	356	{0x01bd, 0x02dd}, /* doubleacute */
	357	{0x01be, 0x017e}, /* zcaron */
	358	{0x01bf, 0x017c}, /* zabovedot */
	359	{0x01c0, 0x0154}, /* Racute */
	360	{0x01c3, 0x0102}, /* Abreve */
	361	{0x01c5, 0x0139}, /* Lacute */
	362	{0x01c6, 0x0106}, /* Cacute */
	363	{0x01c8, 0x010c}, /* Ccaron */
	364	{0x01ca, 0x0118}, /* Eogonek */
	365	{0x01cc, 0x011a}, /* Ecaron */
	366	{0x01cf, 0x010e}, /* Dcaron */
	367	{0x01d0, 0x0110}, /* Dstroke */
	368	{0x01d1, 0x0143}, /* Nacute */
	369	{0x01d2, 0x0147}, /* Ncaron */
	370	{0x01d5, 0x0150}, /* Odoubleacute */
	371	{0x01d8, 0x0158}, /* Rcaron */
	372	{0x01d9, 0x016e}, /* Uring */
	373	{0x01db, 0x0170}, /* Udoubleacute */
	374	{0x01de, 0x0162}, /* Tcedilla */
	375	{0x01e0, 0x0155}, /* racute */
	376	{0x01e3, 0x0103}, /* abreve */
	377	{0x01e5, 0x013a}, /* lacute */
	378	{0x01e6, 0x0107}, /* cacute */
	379	{0x01e8, 0x010d}, /* ccaron */
	380	{0x01ea, 0x0119}, /* eogonek */
	381	{0x01ec, 0x011b}, /* ecaron */
	382	{0x01ef, 0x010f}, /* dcaron */
	383	{0x01f0, 0x0111}, /* dstroke */
	384	{0x01f1, 0x0144}, /* nacute */
	385	{0x01f2, 0x0148}, /* ncaron */
	386	{0x01f5, 0x0151}, /* odoubleacute */
	387	{0x01f8, 0x0159}, /* rcaron */
	388	{0x01f9, 0x016f}, /* uring */
	389	{0x01fb, 0x0171}, /* udoubleacute */
	390	{0x01fe, 0x0163}, /* tcedilla */
	391	{0x01ff, 0x02d9}, /* abovedot */
	392	{0x02a1, 0x0126}, /* Hstroke */
	393	{0x02a6, 0x0124}, /* Hcircumflex */
	394	{0x02a9, 0x0130}, /* Iabovedot */
	395	{0x02ab, 0x011e}, /* Gbreve */
	396	{0x02ac, 0x0134}, /* Jcircumflex */
	397	{0x02b1, 0x0127}, /* hstroke */
	398	{0x02b6, 0x0125}, /* hcircumflex */
	399	{0x02b9, 0x0131}, /* idotless */
	400	{0x02bb, 0x011f}, /* gbreve */
	401	{0x02bc, 0x0135}, /* jcircumflex */
	402	{0x02c5, 0x010a}, /* Cabovedot */
	403	{0x02c6, 0x0108}, /* Ccircumflex */
	404	{0x02d5, 0x0120}, /* Gabovedot */
	405	{0x02d8, 0x011c}, /* Gcircumflex */
	406	{0x02dd, 0x016c}, /* Ubreve */
	407	{0x02de, 0x015c}, /* Scircumflex */
	408	{0x02e5, 0x010b}, /* cabovedot */
	409	{0x02e6, 0x0109}, /* ccircumflex */
	410	{0x02f5, 0x0121}, /* gabovedot */
	411	{0x02f8, 0x011d}, /* gcircumflex */
	412	{0x02fd, 0x016d}, /* ubreve */
	413	{0x02fe, 0x015d}, /* scircumflex */
	414	{0x03a2, 0x0138}, /* kra */
	415	{0x03a3, 0x0156}, /* Rcedilla */
	416	{0x03a5, 0x0128}, /* Itilde */
	417	{0x03a6, 0x013b}, /* Lcedilla */
	418	{0x03aa, 0x0112}, /* Emacron */
	419	{0x03ab, 0x0122}, /* Gcedilla */
	420	{0x03ac, 0x0166}, /* Tslash */
	421	{0x03b3, 0x0157}, /* rcedilla */
	422	{0x03b5, 0x0129}, /* itilde */
	423	{0x03b6, 0x013c}, /* lcedilla */
	424	{0x03ba, 0x0113}, /* emacron */
	425	{0x03bb, 0x0123}, /* gcedilla */
	426	{0x03bc, 0x0167}, /* tslash */
	427	{0x03bd, 0x014a}, /* ENG */
	428	{0x03bf, 0x014b}, /* eng */
	429	{0x03c0, 0x0100}, /* Amacron */
	430	{0x03c7, 0x012e}, /* Iogonek */
	431	{0x03cc, 0x0116}, /* Eabovedot */
	432	{0x03cf, 0x012a}, /* Imacron */
	433	{0x03d1, 0x0145}, /* Ncedilla */
	434	{0x03d2, 0x014c}, /* Omacron */
	435	{0x03d3, 0x0136}, /* Kcedilla */
	436	{0x03d9, 0x0172}, /* Uogonek */
	437	{0x03dd, 0x0168}, /* Utilde */
	438	{0x03de, 0x016a}, /* Umacron */
	439	{0x03e0, 0x0101}, /* amacron */
	440	{0x03e7, 0x012f}, /* iogonek */
	441	{0x03ec, 0x0117}, /* eabovedot */
	442	{0x03ef, 0x012b}, /* imacron */
	443	{0x03f1, 0x0146}, /* ncedilla */
	444	{0x03f2, 0x014d}, /* omacron */
	445	{0x03f3, 0x0137}, /* kcedilla */
	446	{0x03f9, 0x0173}, /* uogonek */
	447	{0x03fd, 0x0169}, /* utilde */
	448	{0x03fe, 0x016b}, /* umacron */
	449	{0x047e, 0x203e}, /* overline */
	450	{0x04a1, 0x3002}, /* kana_fullstop */
	451	{0x04a2, 0x300c}, /* kana_openingbracket */
	452	{0x04a3, 0x300d}, /* kana_closingbracket */
	453	{0x04a4, 0x3001}, /* kana_comma */
	454	{0x04a5, 0x30fb}, /* kana_conjunctive */
	455	{0x04a6, 0x30f2}, /* kana_WO */
	456	{0x04a7, 0x30a1}, /* kana_a */
	457	{0x04a8, 0x30a3}, /* kana_i */
	458	{0x04a9, 0x30a5}, /* kana_u */
	459	{0x04aa, 0x30a7}, /* kana_e */
	460	{0x04ab, 0x30a9}, /* kana_o */
	461	{0x04ac, 0x30e3}, /* kana_ya */
	462	{0x04ad, 0x30e5}, /* kana_yu */
	463	{0x04ae, 0x30e7}, /* kana_yo */
	464	{0x04af, 0x30c3}, /* kana_tsu */
	465	{0x04b0, 0x30fc}, /* prolongedsound */
	466	{0x04b1, 0x30a2}, /* kana_A */
	467	{0x04b2, 0x30a4}, /* kana_I */
	468	{0x04b3, 0x30a6}, /* kana_U */
	469	{0x04b4, 0x30a8}, /* kana_E */
	470	{0x04b5, 0x30aa}, /* kana_O */
	471	{0x04b6, 0x30ab}, /* kana_KA */
	472	{0x04b7, 0x30ad}, /* kana_KI */
	473	{0x04b8, 0x30af}, /* kana_KU */
	474	{0x04b9, 0x30b1}, /* kana_KE */
	475	{0x04ba, 0x30b3}, /* kana_KO */
	476	{0x04bb, 0x30b5}, /* kana_SA */
	477	{0x04bc, 0x30b7}, /* kana_SHI */
	478	{0x04bd, 0x30b9}, /* kana_SU */
	479	{0x04be, 0x30bb}, /* kana_SE */
	480	{0x04bf, 0x30bd}, /* kana_SO */
	481	{0x04c0, 0x30bf}, /* kana_TA */
	482	{0x04c1, 0x30c1}, /* kana_CHI */
	483	{0x04c2, 0x30c4}, /* kana_TSU */
	484	{0x04c3, 0x30c6}, /* kana_TE */
	485	{0x04c4, 0x30c8}, /* kana_TO */
	486	{0x04c5, 0x30ca}, /* kana_NA */
	487	{0x04c6, 0x30cb}, /* kana_NI */
	488	{0x04c7, 0x30cc}, /* kana_NU */
	489	{0x04c8, 0x30cd}, /* kana_NE */
	490	{0x04c9, 0x30ce}, /* kana_NO */
	491	{0x04ca, 0x30cf}, /* kana_HA */
	492	{0x04cb, 0x30d2}, /* kana_HI */
	493	{0x04cc, 0x30d5}, /* kana_FU */
	494	{0x04cd, 0x30d8}, /* kana_HE */
	495	{0x04ce, 0x30db}, /* kana_HO */
	496	{0x04cf, 0x30de}, /* kana_MA */
	497	{0x04d0, 0x30df}, /* kana_MI */
	498	{0x04d1, 0x30e0}, /* kana_MU */
	499	{0x04d2, 0x30e1}, /* kana_ME */
	500	{0x04d3, 0x30e2}, /* kana_MO */
	501	{0x04d4, 0x30e4}, /* kana_YA */
	502	{0x04d5, 0x30e6}, /* kana_YU */
	503	{0x04d6, 0x30e8}, /* kana_YO */
	504	{0x04d7, 0x30e9}, /* kana_RA */
	505	{0x04d8, 0x30ea}, /* kana_RI */
	506	{0x04d9, 0x30eb}, /* kana_RU */
	507	{0x04da, 0x30ec}, /* kana_RE */
	508	{0x04db, 0x30ed}, /* kana_RO */
	509	{0x04dc, 0x30ef}, /* kana_WA */
	510	{0x04dd, 0x30f3}, /* kana_N */
	511	{0x04de, 0x309b}, /* voicedsound */
	512	{0x04df, 0x309c}, /* semivoicedsound */
	513	{0x05ac, 0x060c}, /* Arabic_comma */
	514	{0x05bb, 0x061b}, /* Arabic_semicolon */
	515	{0x05bf, 0x061f}, /* Arabic_question_mark */
	516	{0x05c1, 0x0621}, /* Arabic_hamza */
	517	{0x05c2, 0x0622}, /* Arabic_maddaonalef */
	518	{0x05c3, 0x0623}, /* Arabic_hamzaonalef */
	519	{0x05c4, 0x0624}, /* Arabic_hamzaonwaw */
	520	{0x05c5, 0x0625}, /* Arabic_hamzaunderalef */
	521	{0x05c6, 0x0626}, /* Arabic_hamzaonyeh */
	522	{0x05c7, 0x0627}, /* Arabic_alef */
	523	{0x05c8, 0x0628}, /* Arabic_beh */
	524	{0x05c9, 0x0629}, /* Arabic_tehmarbuta */
	525	{0x05ca, 0x062a}, /* Arabic_teh */
	526	{0x05cb, 0x062b}, /* Arabic_theh */
	527	{0x05cc, 0x062c}, /* Arabic_jeem */
	528	{0x05cd, 0x062d}, /* Arabic_hah */
	529	{0x05ce, 0x062e}, /* Arabic_khah */
	530	{0x05cf, 0x062f}, /* Arabic_dal */
	531	{0x05d0, 0x0630}, /* Arabic_thal */
	532	{0x05d1, 0x0631}, /* Arabic_ra */
	533	{0x05d2, 0x0632}, /* Arabic_zain */
	534	{0x05d3, 0x0633}, /* Arabic_seen */
	535	{0x05d4, 0x0634}, /* Arabic_sheen */
	536	{0x05d5, 0x0635}, /* Arabic_sad */
	537	{0x05d6, 0x0636}, /* Arabic_dad */
	538	{0x05d7, 0x0637}, /* Arabic_tah */
	539	{0x05d8, 0x0638}, /* Arabic_zah */
	540	{0x05d9, 0x0639}, /* Arabic_ain */
	541	{0x05da, 0x063a}, /* Arabic_ghain */
	542	{0x05e0, 0x0640}, /* Arabic_tatweel */
	543	{0x05e1, 0x0641}, /* Arabic_feh */
	544	{0x05e2, 0x0642}, /* Arabic_qaf */
	545	{0x05e3, 0x0643}, /* Arabic_kaf */
	546	{0x05e4, 0x0644}, /* Arabic_lam */
	547	{0x05e5, 0x0645}, /* Arabic_meem */
	548	{0x05e6, 0x0646}, /* Arabic_noon */
	549	{0x05e7, 0x0647}, /* Arabic_ha */
	550	{0x05e8, 0x0648}, /* Arabic_waw */
	551	{0x05e9, 0x0649}, /* Arabic_alefmaksura */
	552	{0x05ea, 0x064a}, /* Arabic_yeh */
	553	{0x05eb, 0x064b}, /* Arabic_fathatan */
	554	{0x05ec, 0x064c}, /* Arabic_dammatan */
	555	{0x05ed, 0x064d}, /* Arabic_kasratan */
	556	{0x05ee, 0x064e}, /* Arabic_fatha */
	557	{0x05ef, 0x064f}, /* Arabic_damma */
	558	{0x05f0, 0x0650}, /* Arabic_kasra */
	559	{0x05f1, 0x0651}, /* Arabic_shadda */
	560	{0x05f2, 0x0652}, /* Arabic_sukun */
	561	{0x06a1, 0x0452}, /* Serbian_dje */
	562	{0x06a2, 0x0453}, /* Macedonia_gje */
	563	{0x06a3, 0x0451}, /* Cyrillic_io */
	564	{0x06a4, 0x0454}, /* Ukrainian_ie */
	565	{0x06a5, 0x0455}, /* Macedonia_dse */
	566	{0x06a6, 0x0456}, /* Ukrainian_i */
	567	{0x06a7, 0x0457}, /* Ukrainian_yi */
	568	{0x06a8, 0x0458}, /* Cyrillic_je */
	569	{0x06a9, 0x0459}, /* Cyrillic_lje */
	570	{0x06aa, 0x045a}, /* Cyrillic_nje */
	571	{0x06ab, 0x045b}, /* Serbian_tshe */
	572	{0x06ac, 0x045c}, /* Macedonia_kje */
	573	{0x06ae, 0x045e}, /* Byelorussian_shortu */
	574	{0x06af, 0x045f}, /* Cyrillic_dzhe */
	575	{0x06b0, 0x2116}, /* numerosign */
	576	{0x06b1, 0x0402}, /* Serbian_DJE */
	577	{0x06b2, 0x0403}, /* Macedonia_GJE */
	578	{0x06b3, 0x0401}, /* Cyrillic_IO */
	579	{0x06b4, 0x0404}, /* Ukrainian_IE */
	580	{0x06b5, 0x0405}, /* Macedonia_DSE */
	581	{0x06b6, 0x0406}, /* Ukrainian_I */
	582	{0x06b7, 0x0407}, /* Ukrainian_YI */
	583	{0x06b8, 0x0408}, /* Cyrillic_JE */
	584	{0x06b9, 0x0409}, /* Cyrillic_LJE */
	585	{0x06ba, 0x040a}, /* Cyrillic_NJE */
	586	{0x06bb, 0x040b}, /* Serbian_TSHE */
	587	{0x06bc, 0x040c}, /* Macedonia_KJE */
	588	{0x06be, 0x040e}, /* Byelorussian_SHORTU */
	589	{0x06bf, 0x040f}, /* Cyrillic_DZHE */
	590	{0x06c0, 0x044e}, /* Cyrillic_yu */
	591	{0x06c1, 0x0430}, /* Cyrillic_a */
	592	{0x06c2, 0x0431}, /* Cyrillic_be */
	593	{0x06c3, 0x0446}, /* Cyrillic_tse */
	594	{0x06c4, 0x0434}, /* Cyrillic_de */
	595	{0x06c5, 0x0435}, /* Cyrillic_ie */
	596	{0x06c6, 0x0444}, /* Cyrillic_ef */
	597	{0x06c7, 0x0433}, /* Cyrillic_ghe */
	598	{0x06c8, 0x0445}, /* Cyrillic_ha */
	599	{0x06c9, 0x0438}, /* Cyrillic_i */
	600	{0x06ca, 0x0439}, /* Cyrillic_shorti */
	601	{0x06cb, 0x043a}, /* Cyrillic_ka */
	602	{0x06cc, 0x043b}, /* Cyrillic_el */
	603	{0x06cd, 0x043c}, /* Cyrillic_em */
	604	{0x06ce, 0x043d}, /* Cyrillic_en */
	605	{0x06cf, 0x043e}, /* Cyrillic_o */
	606	{0x06d0, 0x043f}, /* Cyrillic_pe */
	607	{0x06d1, 0x044f}, /* Cyrillic_ya */
	608	{0x06d2, 0x0440}, /* Cyrillic_er */
	609	{0x06d3, 0x0441}, /* Cyrillic_es */
	610	{0x06d4, 0x0442}, /* Cyrillic_te */
	611	{0x06d5, 0x0443}, /* Cyrillic_u */
	612	{0x06d6, 0x0436}, /* Cyrillic_zhe */
	613	{0x06d7, 0x0432}, /* Cyrillic_ve */
	614	{0x06d8, 0x044c}, /* Cyrillic_softsign */
	615	{0x06d9, 0x044b}, /* Cyrillic_yeru */
	616	{0x06da, 0x0437}, /* Cyrillic_ze */
	617	{0x06db, 0x0448}, /* Cyrillic_sha */
	618	{0x06dc, 0x044d}, /* Cyrillic_e */
	619	{0x06dd, 0x0449}, /* Cyrillic_shcha */
	620	{0x06de, 0x0447}, /* Cyrillic_che */
	621	{0x06df, 0x044a}, /* Cyrillic_hardsign */
	622	{0x06e0, 0x042e}, /* Cyrillic_YU */
	623	{0x06e1, 0x0410}, /* Cyrillic_A */
	624	{0x06e2, 0x0411}, /* Cyrillic_BE */
	625	{0x06e3, 0x0426}, /* Cyrillic_TSE */
	626	{0x06e4, 0x0414}, /* Cyrillic_DE */
	627	{0x06e5, 0x0415}, /* Cyrillic_IE */
	628	{0x06e6, 0x0424}, /* Cyrillic_EF */
	629	{0x06e7, 0x0413}, /* Cyrillic_GHE */
	630	{0x06e8, 0x0425}, /* Cyrillic_HA */
	631	{0x06e9, 0x0418}, /* Cyrillic_I */
	632	{0x06ea, 0x0419}, /* Cyrillic_SHORTI */
	633	{0x06eb, 0x041a}, /* Cyrillic_KA */
	634	{0x06ec, 0x041b}, /* Cyrillic_EL */
	635	{0x06ed, 0x041c}, /* Cyrillic_EM */
	636	{0x06ee, 0x041d}, /* Cyrillic_EN */
	637	{0x06ef, 0x041e}, /* Cyrillic_O */
	638	{0x06f0, 0x041f}, /* Cyrillic_PE */
	639	{0x06f1, 0x042f}, /* Cyrillic_YA */
	640	{0x06f2, 0x0420}, /* Cyrillic_ER */
	641	{0x06f3, 0x0421}, /* Cyrillic_ES */
	642	{0x06f4, 0x0422}, /* Cyrillic_TE */
	643	{0x06f5, 0x0423}, /* Cyrillic_U */
	644	{0x06f6, 0x0416}, /* Cyrillic_ZHE */
	645	{0x06f7, 0x0412}, /* Cyrillic_VE */
	646	{0x06f8, 0x042c}, /* Cyrillic_SOFTSIGN */
	647	{0x06f9, 0x042b}, /* Cyrillic_YERU */
	648	{0x06fa, 0x0417}, /* Cyrillic_ZE */
	649	{0x06fb, 0x0428}, /* Cyrillic_SHA */
	650	{0x06fc, 0x042d}, /* Cyrillic_E */
	651	{0x06fd, 0x0429}, /* Cyrillic_SHCHA */
	652	{0x06fe, 0x0427}, /* Cyrillic_CHE */
	653	{0x06ff, 0x042a}, /* Cyrillic_HARDSIGN */
	654	{0x07a1, 0x0386}, /* Greek_ALPHAaccent */
	655	{0x07a2, 0x0388}, /* Greek_EPSILONaccent */
	656	{0x07a3, 0x0389}, /* Greek_ETAaccent */
	657	{0x07a4, 0x038a}, /* Greek_IOTAaccent */
	658	{0x07a5, 0x03aa}, /* Greek_IOTAdiaeresis */
	659	{0x07a7, 0x038c}, /* Greek_OMICRONaccent */
	660	{0x07a8, 0x038e}, /* Greek_UPSILONaccent */
	661	{0x07a9, 0x03ab}, /* Greek_UPSILONdieresis */
	662	{0x07ab, 0x038f}, /* Greek_OMEGAaccent */
	663	{0x07ae, 0x0385}, /* Greek_accentdieresis */
	664	{0x07af, 0x2015}, /* Greek_horizbar */
	665	{0x07b1, 0x03ac}, /* Greek_alphaaccent */
	666	{0x07b2, 0x03ad}, /* Greek_epsilonaccent */
	667	{0x07b3, 0x03ae}, /* Greek_etaaccent */
	668	{0x07b4, 0x03af}, /* Greek_iotaaccent */
	669	{0x07b5, 0x03ca}, /* Greek_iotadieresis */
	670	{0x07b6, 0x0390}, /* Greek_iotaaccentdieresis */
	671	{0x07b7, 0x03cc}, /* Greek_omicronaccent */
	672	{0x07b8, 0x03cd}, /* Greek_upsilonaccent */
	673	{0x07b9, 0x03cb}, /* Greek_upsilondieresis */
	674	{0x07ba, 0x03b0}, /* Greek_upsilonaccentdieresis */
	675	{0x07bb, 0x03ce}, /* Greek_omegaaccent */
	676	{0x07c1, 0x0391}, /* Greek_ALPHA */
	677	{0x07c2, 0x0392}, /* Greek_BETA */
	678	{0x07c3, 0x0393}, /* Greek_GAMMA */
	679	{0x07c4, 0x0394}, /* Greek_DELTA */
	680	{0x07c5, 0x0395}, /* Greek_EPSILON */
	681	{0x07c6, 0x0396}, /* Greek_ZETA */
	682	{0x07c7, 0x0397}, /* Greek_ETA */
	683	{0x07c8, 0x0398}, /* Greek_THETA */
	684	{0x07c9, 0x0399}, /* Greek_IOTA */
	685	{0x07ca, 0x039a}, /* Greek_KAPPA */
	686	{0x07cb, 0x039b}, /* Greek_LAMDA */
	687	{0x07cc, 0x039c}, /* Greek_MU */
	688	{0x07cd, 0x039d}, /* Greek_NU */
	689	{0x07ce, 0x039e}, /* Greek_XI */
	690	{0x07cf, 0x039f}, /* Greek_OMICRON */
	691	{0x07d0, 0x03a0}, /* Greek_PI */
	692	{0x07d1, 0x03a1}, /* Greek_RHO */
	693	{0x07d2, 0x03a3}, /* Greek_SIGMA */
	694	{0x07d4, 0x03a4}, /* Greek_TAU */
	695	{0x07d5, 0x03a5}, /* Greek_UPSILON */
	696	{0x07d6, 0x03a6}, /* Greek_PHI */
	697	{0x07d7, 0x03a7}, /* Greek_CHI */
	698	{0x07d8, 0x03a8}, /* Greek_PSI */
	699	{0x07d9, 0x03a9}, /* Greek_OMEGA */
	700	{0x07e1, 0x03b1}, /* Greek_alpha */
	701	{0x07e2, 0x03b2}, /* Greek_beta */
	702	{0x07e3, 0x03b3}, /* Greek_gamma */
	703	{0x07e4, 0x03b4}, /* Greek_delta */
	704	{0x07e5, 0x03b5}, /* Greek_epsilon */
	705	{0x07e6, 0x03b6}, /* Greek_zeta */
	706	{0x07e7, 0x03b7}, /* Greek_eta */
	707	{0x07e8, 0x03b8}, /* Greek_theta */
	708	{0x07e9, 0x03b9}, /* Greek_iota */
	709	{0x07ea, 0x03ba}, /* Greek_kappa */
	710	{0x07eb, 0x03bb}, /* Greek_lambda */
	711	{0x07ec, 0x03bc}, /* Greek_mu */
	712	{0x07ed, 0x03bd}, /* Greek_nu */
	713	{0x07ee, 0x03be}, /* Greek_xi */
	714	{0x07ef, 0x03bf}, /* Greek_omicron */
	715	{0x07f0, 0x03c0}, /* Greek_pi */
	716	{0x07f1, 0x03c1}, /* Greek_rho */
	717	{0x07f2, 0x03c3}, /* Greek_sigma */
	718	{0x07f3, 0x03c2}, /* Greek_finalsmallsigma */
	719	{0x07f4, 0x03c4}, /* Greek_tau */
	720	{0x07f5, 0x03c5}, /* Greek_upsilon */
	721	{0x07f6, 0x03c6}, /* Greek_phi */
	722	{0x07f7, 0x03c7}, /* Greek_chi */
	723	{0x07f8, 0x03c8}, /* Greek_psi */
	724	{0x07f9, 0x03c9}, /* Greek_omega */
	725	{0x08a1, 0x23b7}, /* leftradical */
	726	{0x08a4, 0x2320}, /* topintegral */
	727	{0x08a5, 0x2321}, /* botintegral */
	728	{0x08a7, 0x23a1}, /* topleftsqbracket */
	729	{0x08a8, 0x23a3}, /* botleftsqbracket */
	730	{0x08a9, 0x23a4}, /* toprightsqbracket */
	731	{0x08aa, 0x23a6}, /* botrightsqbracket */
	732	{0x08ab, 0x239b}, /* topleftparens */
	733	{0x08ac, 0x239d}, /* botleftparens */
	734	{0x08ad, 0x239e}, /* toprightparens */
	735	{0x08ae, 0x23a0}, /* botrightparens */
	736	{0x08af, 0x23a8}, /* leftmiddlecurlybrace */
	737	{0x08b0, 0x23ac}, /* rightmiddlecurlybrace */
	738	{0x08bc, 0x2264}, /* lessthanequal */
	739	{0x08bd, 0x2260}, /* notequal */
	740	{0x08be, 0x2265}, /* greaterthanequal */
	741	{0x08bf, 0x222b}, /* integral */
	742	{0x08c0, 0x2234}, /* therefore */
	743	{0x08c1, 0x221d}, /* variation */
	744	{0x08c2, 0x221e}, /* infinity */
	745	{0x08c5, 0x2207}, /* nabla */
	746	{0x08c8, 0x223c}, /* approximate */
	747	{0x08c9, 0x2243}, /* similarequal */
	748	{0x08cd, 0x21d4}, /* ifonlyif */
	749	{0x08ce, 0x21d2}, /* implies */
	750	{0x08cf, 0x2261}, /* identical */
	751	{0x08d6, 0x221a}, /* radical */
	752	{0x08da, 0x2282}, /* includedin */
	753	{0x08db, 0x2283}, /* includes */
	754	{0x08dc, 0x2229}, /* intersection */
	755	{0x08dd, 0x222a}, /* union */
	756	{0x08de, 0x2227}, /* logicaland */
	757	{0x08df, 0x2228}, /* logicalor */
	758	{0x08ef, 0x2202}, /* partialderivative */
	759	{0x08f6, 0x0192}, /* function */
	760	{0x08fb, 0x2190}, /* leftarrow */
	761	{0x08fc, 0x2191}, /* uparrow */
	762	{0x08fd, 0x2192}, /* rightarrow */
	763	{0x08fe, 0x2193}, /* downarrow */
	764	{0x09e0, 0x25c6}, /* soliddiamond */
	765	{0x09e1, 0x2592}, /* checkerboard */
	766	{0x09e2, 0x2409}, /* ht */
	767	{0x09e3, 0x240c}, /* ff */
	768	{0x09e4, 0x240d}, /* cr */
	769	{0x09e5, 0x240a}, /* lf */
	770	{0x09e8, 0x2424}, /* nl */
	771	{0x09e9, 0x240b}, /* vt */
	772	{0x09ea, 0x2518}, /* lowrightcorner */
	773	{0x09eb, 0x2510}, /* uprightcorner */
	774	{0x09ec, 0x250c}, /* upleftcorner */
	775	{0x09ed, 0x2514}, /* lowleftcorner */
	776	{0x09ee, 0x253c}, /* crossinglines */
	777	{0x09ef, 0x23ba}, /* horizlinescan1 */
	778	{0x09f0, 0x23bb}, /* horizlinescan3 */
	779	{0x09f1, 0x2500}, /* horizlinescan5 */
	780	{0x09f2, 0x23bc}, /* horizlinescan7 */
	781	{0x09f3, 0x23bd}, /* horizlinescan9 */
	782	{0x09f4, 0x251c}, /* leftt */
	783	{0x09f5, 0x2524}, /* rightt */
	784	{0x09f6, 0x2534}, /* bott */
	785	{0x09f7, 0x252c}, /* topt */
	786	{0x09f8, 0x2502}, /* vertbar */
	787	{0x0aa1, 0x2003}, /* emspace */
	788	{0x0aa2, 0x2002}, /* enspace */
	789	{0x0aa3, 0x2004}, /* em3space */
	790	{0x0aa4, 0x2005}, /* em4space */
	791	{0x0aa5, 0x2007}, /* digitspace */
	792	{0x0aa6, 0x2008}, /* punctspace */
	793	{0x0aa7, 0x2009}, /* thinspace */
	794	{0x0aa8, 0x200a}, /* hairspace */
	795	{0x0aa9, 0x2014}, /* emdash */
	796	{0x0aaa, 0x2013}, /* endash */
	797	{0x0aae, 0x2026}, /* ellipsis */
	798	{0x0aaf, 0x2025}, /* doubbaselinedot */
	799	{0x0ab0, 0x2153}, /* onethird */
	800	{0x0ab1, 0x2154}, /* twothirds */
	801	{0x0ab2, 0x2155}, /* onefifth */
	802	{0x0ab3, 0x2156}, /* twofifths */
	803	{0x0ab4, 0x2157}, /* threefifths */
	804	{0x0ab5, 0x2158}, /* fourfifths */
	805	{0x0ab6, 0x2159}, /* onesixth */
	806	{0x0ab7, 0x215a}, /* fivesixths */
	807	{0x0ab8, 0x2105}, /* careof */
	808	{0x0abb, 0x2012}, /* figdash */
	809	{0x0ac3, 0x215b}, /* oneeighth */
	810	{0x0ac4, 0x215c}, /* threeeighths */
	811	{0x0ac5, 0x215d}, /* fiveeighths */
	812	{0x0ac6, 0x215e}, /* seveneighths */
	813	{0x0ac9, 0x2122}, /* trademark */
	814	{0x0ad0, 0x2018}, /* leftsinglequotemark */
	815	{0x0ad1, 0x2019}, /* rightsinglequotemark */
	816	{0x0ad2, 0x201c}, /* leftdoublequotemark */
	817	{0x0ad3, 0x201d}, /* rightdoublequotemark */
	818	{0x0ad4, 0x211e}, /* prescription */
	819	{0x0ad6, 0x2032}, /* minutes */
	820	{0x0ad7, 0x2033}, /* seconds */
	821	{0x0ad9, 0x271d}, /* latincross */
	822	{0x0aec, 0x2663}, /* club */
	823	{0x0aed, 0x2666}, /* diamond */
	824	{0x0aee, 0x2665}, /* heart */
	825	{0x0af0, 0x2720}, /* maltesecross */
	826	{0x0af1, 0x2020}, /* dagger */
	827	{0x0af2, 0x2021}, /* doubledagger */
	828	{0x0af3, 0x2713}, /* checkmark */
	829	{0x0af4, 0x2717}, /* ballotcross */
	830	{0x0af5, 0x266f}, /* musicalsharp */
	831	{0x0af6, 0x266d}, /* musicalflat */
	832	{0x0af7, 0x2642}, /* malesymbol */
	833	{0x0af8, 0x2640}, /* femalesymbol */
	834	{0x0af9, 0x260e}, /* telephone */
	835	{0x0afa, 0x2315}, /* telephonerecorder */
	836	{0x0afb, 0x2117}, /* phonographcopyright */
	837	{0x0afc, 0x2038}, /* caret */
	838	{0x0afd, 0x201a}, /* singlelowquotemark */
	839	{0x0afe, 0x201e}, /* doublelowquotemark */
	840	{0x0bc2, 0x22a5}, /* downtack */
	841	{0x0bc4, 0x230a}, /* downstile */
	842	{0x0bca, 0x2218}, /* jot */
	843	{0x0bcc, 0x2395}, /* quad */
	844	{0x0bce, 0x22a4}, /* uptack */
	845	{0x0bcf, 0x25cb}, /* circle */
	846	{0x0bd3, 0x2308}, /* upstile */
	847	{0x0bdc, 0x22a2}, /* lefttack */
	848	{0x0bfc, 0x22a3}, /* righttack */
	849	{0x0cdf, 0x2017}, /* hebrew_doublelowline */
	850	{0x0ce0, 0x05d0}, /* hebrew_aleph */
	851	{0x0ce1, 0x05d1}, /* hebrew_bet */
	852	{0x0ce2, 0x05d2}, /* hebrew_gimel */
	853	{0x0ce3, 0x05d3}, /* hebrew_dalet */
	854	{0x0ce4, 0x05d4}, /* hebrew_he */
	855	{0x0ce5, 0x05d5}, /* hebrew_waw */
	856	{0x0ce6, 0x05d6}, /* hebrew_zain */
	857	{0x0ce7, 0x05d7}, /* hebrew_chet */
	858	{0x0ce8, 0x05d8}, /* hebrew_tet */
	859	{0x0ce9, 0x05d9}, /* hebrew_yod */
	860	{0x0cea, 0x05da}, /* hebrew_finalkaph */
	861	{0x0ceb, 0x05db}, /* hebrew_kaph */
	862	{0x0cec, 0x05dc}, /* hebrew_lamed */
	863	{0x0ced, 0x05dd}, /* hebrew_finalmem */
	864	{0x0cee, 0x05de}, /* hebrew_mem */
	865	{0x0cef, 0x05df}, /* hebrew_finalnun */
	866	{0x0cf0, 0x05e0}, /* hebrew_nun */
	867	{0x0cf1, 0x05e1}, /* hebrew_samech */
	868	{0x0cf2, 0x05e2}, /* hebrew_ayin */
	869	{0x0cf3, 0x05e3}, /* hebrew_finalpe */
	870	{0x0cf4, 0x05e4}, /* hebrew_pe */
	871	{0x0cf5, 0x05e5}, /* hebrew_finalzade */
	872	{0x0cf6, 0x05e6}, /* hebrew_zade */
	873	{0x0cf7, 0x05e7}, /* hebrew_qoph */
	874	{0x0cf8, 0x05e8}, /* hebrew_resh */
	875	{0x0cf9, 0x05e9}, /* hebrew_shin */
	876	{0x0cfa, 0x05ea}, /* hebrew_taw */
	877	{0x0da1, 0x0e01}, /* Thai_kokai */
	878	{0x0da2, 0x0e02}, /* Thai_khokhai */
	879	{0x0da3, 0x0e03}, /* Thai_khokhuat */
	880	{0x0da4, 0x0e04}, /* Thai_khokhwai */
	881	{0x0da5, 0x0e05}, /* Thai_khokhon */
	882	{0x0da6, 0x0e06}, /* Thai_khorakhang */
	883	{0x0da7, 0x0e07}, /* Thai_ngongu */
	884	{0x0da8, 0x0e08}, /* Thai_chochan */
	885	{0x0da9, 0x0e09}, /* Thai_choching */
	886	{0x0daa, 0x0e0a}, /* Thai_chochang */
	887	{0x0dab, 0x0e0b}, /* Thai_soso */
	888	{0x0dac, 0x0e0c}, /* Thai_chochoe */
	889	{0x0dad, 0x0e0d}, /* Thai_yoying */
	890	{0x0dae, 0x0e0e}, /* Thai_dochada */
	891	{0x0daf, 0x0e0f}, /* Thai_topatak */
	892	{0x0db0, 0x0e10}, /* Thai_thothan */
	893	{0x0db1, 0x0e11}, /* Thai_thonangmontho */
	894	{0x0db2, 0x0e12}, /* Thai_thophuthao */
	895	{0x0db3, 0x0e13}, /* Thai_nonen */
	896	{0x0db4, 0x0e14}, /* Thai_dodek */
	897	{0x0db5, 0x0e15}, /* Thai_totao */
	898	{0x0db6, 0x0e16}, /* Thai_thothung */
	899	{0x0db7, 0x0e17}, /* Thai_thothahan */
	900	{0x0db8, 0x0e18}, /* Thai_thothong */
	901	{0x0db9, 0x0e19}, /* Thai_nonu */
	902	{0x0dba, 0x0e1a}, /* Thai_bobaimai */
	903	{0x0dbb, 0x0e1b}, /* Thai_popla */
	904	{0x0dbc, 0x0e1c}, /* Thai_phophung */
	905	{0x0dbd, 0x0e1d}, /* Thai_fofa */
	906	{0x0dbe, 0x0e1e}, /* Thai_phophan */
	907	{0x0dbf, 0x0e1f}, /* Thai_fofan */
	908	{0x0dc0, 0x0e20}, /* Thai_phosamphao */
	909	{0x0dc1, 0x0e21}, /* Thai_moma */
	910	{0x0dc2, 0x0e22}, /* Thai_yoyak */
	911	{0x0dc3, 0x0e23}, /* Thai_rorua */
	912	{0x0dc4, 0x0e24}, /* Thai_ru */
	913	{0x0dc5, 0x0e25}, /* Thai_loling */
	914	{0x0dc6, 0x0e26}, /* Thai_lu */
	915	{0x0dc7, 0x0e27}, /* Thai_wowaen */
	916	{0x0dc8, 0x0e28}, /* Thai_sosala */
	917	{0x0dc9, 0x0e29}, /* Thai_sorusi */
	918	{0x0dca, 0x0e2a}, /* Thai_sosua */
	919	{0x0dcb, 0x0e2b}, /* Thai_hohip */
	920	{0x0dcc, 0x0e2c}, /* Thai_lochula */
	921	{0x0dcd, 0x0e2d}, /* Thai_oang */
	922	{0x0dce, 0x0e2e}, /* Thai_honokhuk */
	923	{0x0dcf, 0x0e2f}, /* Thai_paiyannoi */
	924	{0x0dd0, 0x0e30}, /* Thai_saraa */
	925	{0x0dd1, 0x0e31}, /* Thai_maihanakat */
	926	{0x0dd2, 0x0e32}, /* Thai_saraaa */
	927	{0x0dd3, 0x0e33}, /* Thai_saraam */
	928	{0x0dd4, 0x0e34}, /* Thai_sarai */
	929	{0x0dd5, 0x0e35}, /* Thai_saraii */
	930	{0x0dd6, 0x0e36}, /* Thai_saraue */
	931	{0x0dd7, 0x0e37}, /* Thai_sarauee */
	932	{0x0dd8, 0x0e38}, /* Thai_sarau */
	933	{0x0dd9, 0x0e39}, /* Thai_sarauu */
	934	{0x0dda, 0x0e3a}, /* Thai_phinthu */
	935	{0x0ddf, 0x0e3f}, /* Thai_baht */
	936	{0x0de0, 0x0e40}, /* Thai_sarae */
	937	{0x0de1, 0x0e41}, /* Thai_saraae */
	938	{0x0de2, 0x0e42}, /* Thai_sarao */
	939	{0x0de3, 0x0e43}, /* Thai_saraaimaimuan */
	940	{0x0de4, 0x0e44}, /* Thai_saraaimaimalai */
	941	{0x0de5, 0x0e45}, /* Thai_lakkhangyao */
	942	{0x0de6, 0x0e46}, /* Thai_maiyamok */
	943	{0x0de7, 0x0e47}, /* Thai_maitaikhu */
	944	{0x0de8, 0x0e48}, /* Thai_maiek */
	945	{0x0de9, 0x0e49}, /* Thai_maitho */
	946	{0x0dea, 0x0e4a}, /* Thai_maitri */
	947	{0x0deb, 0x0e4b}, /* Thai_maichattawa */
	948	{0x0dec, 0x0e4c}, /* Thai_thanthakhat */
	949	{0x0ded, 0x0e4d}, /* Thai_nikhahit */
	950	{0x0df0, 0x0e50}, /* Thai_leksun */
	951	{0x0df1, 0x0e51}, /* Thai_leknung */
	952	{0x0df2, 0x0e52}, /* Thai_leksong */
	953	{0x0df3, 0x0e53}, /* Thai_leksam */
	954	{0x0df4, 0x0e54}, /* Thai_leksi */
	955	{0x0df5, 0x0e55}, /* Thai_lekha */
	956	{0x0df6, 0x0e56}, /* Thai_lekhok */
	957	{0x0df7, 0x0e57}, /* Thai_lekchet */
	958	{0x0df8, 0x0e58}, /* Thai_lekpaet */
	959	{0x0df9, 0x0e59}, /* Thai_lekkao */
	960	{0x13bc, 0x0152}, /* OE */
	961	{0x13bd, 0x0153}, /* oe */
	962	{0x13be, 0x0178}, /* Ydiaeresis */
	963	{0x20a0, 0x20a0}, /* EcuSign */
	964	{0x20a1, 0x20a1}, /* ColonSign */
	965	{0x20a2, 0x20a2}, /* CruzeiroSign */
	966	{0x20a3, 0x20a3}, /* FFrancSign */
	967	{0x20a4, 0x20a4}, /* LiraSign */
	968	{0x20a5, 0x20a5}, /* MillSign */
	969	{0x20a6, 0x20a6}, /* NairaSign */
	970	{0x20a7, 0x20a7}, /* PesetaSign */
	971	{0x20a8, 0x20a8}, /* RupeeSign */
	972	{0x20a9, 0x20a9}, /* WonSign */
	973	{0x20aa, 0x20aa}, /* NewSheqelSign */
	974	{0x20ab, 0x20ab}, /* DongSign */
	975	{0x20ac, 0x20ac}, /* EuroSign */
	976	{0x06ad, 0x0491}, /* Ukrainian_ghe_with_upturn */
	977	{0x06bd, 0x0490}, /* Ukrainian_GHE_WITH_UPTURN */
	978	{0x14a2, 0x0587}, /* Armenian_ligature_ew */
	979	{0x14a3, 0x0589}, /* Armenian_verjaket */
	980	{0x14aa, 0x055d}, /* Armenian_but */
	981	{0x14ad, 0x058a}, /* Armenian_yentamna */
	982	{0x14af, 0x055c}, /* Armenian_amanak */
	983	{0x14b0, 0x055b}, /* Armenian_shesht */
	984	{0x14b1, 0x055e}, /* Armenian_paruyk */
	985	{0x14b2, 0x0531}, /* Armenian_AYB */
	986	{0x14b3, 0x0561}, /* Armenian_ayb */
	987	{0x14b4, 0x0532}, /* Armenian_BEN */
	988	{0x14b5, 0x0562}, /* Armenian_ben */
	989	{0x14b6, 0x0533}, /* Armenian_GIM */
	990	{0x14b7, 0x0563}, /* Armenian_gim */
	991	{0x14b8, 0x0534}, /* Armenian_DA */
	992	{0x14b9, 0x0564}, /* Armenian_da */
	993	{0x14ba, 0x0535}, /* Armenian_YECH */
	994	{0x14bb, 0x0565}, /* Armenian_yech */
	995	{0x14bc, 0x0536}, /* Armenian_ZA */
	996	{0x14bd, 0x0566}, /* Armenian_za */
	997	{0x14be, 0x0537}, /* Armenian_E */
	998	{0x14bf, 0x0567}, /* Armenian_e */
	999	{0x14c0, 0x0538}, /* Armenian_AT */
	1000	{0x14c1, 0x0568}, /* Armenian_at */
	1001	{0x14c2, 0x0539}, /* Armenian_TO */
	1002	{0x14c3, 0x0569}, /* Armenian_to */
	1003	{0x14c4, 0x053a}, /* Armenian_ZHE */
	1004	{0x14c5, 0x056a}, /* Armenian_zhe */
	1005	{0x14c6, 0x053b}, /* Armenian_INI */
	1006	{0x14c7, 0x056b}, /* Armenian_ini */
	1007	{0x14c8, 0x053c}, /* Armenian_LYUN */
	1008	{0x14c9, 0x056c}, /* Armenian_lyun */
	1009	{0x14ca, 0x053d}, /* Armenian_KHE */
	1010	{0x14cb, 0x056d}, /* Armenian_khe */
	1011	{0x14cc, 0x053e}, /* Armenian_TSA */
	1012	{0x14cd, 0x056e}, /* Armenian_tsa */
	1013	{0x14ce, 0x053f}, /* Armenian_KEN */
	1014	{0x14cf, 0x056f}, /* Armenian_ken */
	1015	{0x14d0, 0x0540}, /* Armenian_HO */
	1016	{0x14d1, 0x0570}, /* Armenian_ho */
	1017	{0x14d2, 0x0541}, /* Armenian_DZA */
	1018	{0x14d3, 0x0571}, /* Armenian_dza */
	1019	{0x14d4, 0x0542}, /* Armenian_GHAT */
	1020	{0x14d5, 0x0572}, /* Armenian_ghat */
	1021	{0x14d6, 0x0543}, /* Armenian_TCHE */
	1022	{0x14d7, 0x0573}, /* Armenian_tche */
	1023	{0x14d8, 0x0544}, /* Armenian_MEN */
	1024	{0x14d9, 0x0574}, /* Armenian_men */
	1025	{0x14da, 0x0545}, /* Armenian_HI */
	1026	{0x14db, 0x0575}, /* Armenian_hi */
	1027	{0x14dc, 0x0546}, /* Armenian_NU */
	1028	{0x14dd, 0x0576}, /* Armenian_nu */
	1029	{0x14de, 0x0547}, /* Armenian_SHA */
	1030	{0x14df, 0x0577}, /* Armenian_sha */
	1031	{0x14e0, 0x0548}, /* Armenian_VO */
	1032	{0x14e1, 0x0578}, /* Armenian_vo */
	1033	{0x14e2, 0x0549}, /* Armenian_CHA */
	1034	{0x14e3, 0x0579}, /* Armenian_cha */
	1035	{0x14e4, 0x054a}, /* Armenian_PE */
	1036	{0x14e5, 0x057a}, /* Armenian_pe */
	1037	{0x14e6, 0x054b}, /* Armenian_JE */
	1038	{0x14e7, 0x057b}, /* Armenian_je */
	1039	{0x14e8, 0x054c}, /* Armenian_RA */
	1040	{0x14e9, 0x057c}, /* Armenian_ra */
	1041	{0x14ea, 0x054d}, /* Armenian_SE */
	1042	{0x14eb, 0x057d}, /* Armenian_se */
	1043	{0x14ec, 0x054e}, /* Armenian_VEV */
	1044	{0x14ed, 0x057e}, /* Armenian_vev */
	1045	{0x14ee, 0x054f}, /* Armenian_TYUN */
	1046	{0x14ef, 0x057f}, /* Armenian_tyun */
	1047	{0x14f0, 0x0550}, /* Armenian_RE */
	1048	{0x14f1, 0x0580}, /* Armenian_re */
	1049	{0x14f2, 0x0551}, /* Armenian_TSO */
	1050	{0x14f3, 0x0581}, /* Armenian_tso */
	1051	{0x14f4, 0x0552}, /* Armenian_VYUN */
	1052	{0x14f5, 0x0582}, /* Armenian_vyun */
	1053	{0x14f6, 0x0553}, /* Armenian_PYUR */
	1054	{0x14f7, 0x0583}, /* Armenian_pyur */
	1055	{0x14f8, 0x0554}, /* Armenian_KE */
	1056	{0x14f9, 0x0584}, /* Armenian_ke */
	1057	{0x14fa, 0x0555}, /* Armenian_O */
	1058	{0x14fb, 0x0585}, /* Armenian_o */
	1059	{0x14fc, 0x0556}, /* Armenian_FE */
	1060	{0x14fd, 0x0586}, /* Armenian_fe */
	1061	{0x14fe, 0x055a}, /* Armenian_apostrophe */
	1062	{0x15d0, 0x10d0}, /* Georgian_an */
	1063	{0x15d1, 0x10d1}, /* Georgian_ban */
	1064	{0x15d2, 0x10d2}, /* Georgian_gan */
	1065	{0x15d3, 0x10d3}, /* Georgian_don */
	1066	{0x15d4, 0x10d4}, /* Georgian_en */
	1067	{0x15d5, 0x10d5}, /* Georgian_vin */
	1068	{0x15d6, 0x10d6}, /* Georgian_zen */
	1069	{0x15d7, 0x10d7}, /* Georgian_tan */
	1070	{0x15d8, 0x10d8}, /* Georgian_in */
	1071	{0x15d9, 0x10d9}, /* Georgian_kan */
	1072	{0x15da, 0x10da}, /* Georgian_las */
	1073	{0x15db, 0x10db}, /* Georgian_man */
	1074	{0x15dc, 0x10dc}, /* Georgian_nar */
	1075	{0x15dd, 0x10dd}, /* Georgian_on */
	1076	{0x15de, 0x10de}, /* Georgian_par */
	1077	{0x15df, 0x10df}, /* Georgian_zhar */
	1078	{0x15e0, 0x10e0}, /* Georgian_rae */
	1079	{0x15e1, 0x10e1}, /* Georgian_san */
	1080	{0x15e2, 0x10e2}, /* Georgian_tar */
	1081	{0x15e3, 0x10e3}, /* Georgian_un */
	1082	{0x15e4, 0x10e4}, /* Georgian_phar */
	1083	{0x15e5, 0x10e5}, /* Georgian_khar */
	1084	{0x15e6, 0x10e6}, /* Georgian_ghan */
	1085	{0x15e7, 0x10e7}, /* Georgian_qar */
	1086	{0x15e8, 0x10e8}, /* Georgian_shin */
	1087	{0x15e9, 0x10e9}, /* Georgian_chin */
	1088	{0x15ea, 0x10ea}, /* Georgian_can */
	1089	{0x15eb, 0x10eb}, /* Georgian_jil */
	1090	{0x15ec, 0x10ec}, /* Georgian_cil */
	1091	{0x15ed, 0x10ed}, /* Georgian_char */
	1092	{0x15ee, 0x10ee}, /* Georgian_xan */
	1093	{0x15ef, 0x10ef}, /* Georgian_jhan */
	1094	{0x15f0, 0x10f0}, /* Georgian_hae */
	1095	{0x15f1, 0x10f1}, /* Georgian_he */
	1096	{0x15f2, 0x10f2}, /* Georgian_hie */
	1097	{0x15f3, 0x10f3}, /* Georgian_we */
	1098	{0x15f4, 0x10f4}, /* Georgian_har */
	1099	{0x15f5, 0x10f5}, /* Georgian_hoe */
	1100	{0x15f6, 0x10f6}, /* Georgian_fi */
	1101	{0x12a1, 0x1e02}, /* Babovedot */
	1102	{0x12a2, 0x1e03}, /* babovedot */
	1103	{0x12a6, 0x1e0a}, /* Dabovedot */
	1104	{0x12a8, 0x1e80}, /* Wgrave */
	1105	{0x12aa, 0x1e82}, /* Wacute */
	1106	{0x12ab, 0x1e0b}, /* dabovedot */
	1107	{0x12ac, 0x1ef2}, /* Ygrave */
	1108	{0x12b0, 0x1e1e}, /* Fabovedot */
	1109	{0x12b1, 0x1e1f}, /* fabovedot */
	1110	{0x12b4, 0x1e40}, /* Mabovedot */
	1111	{0x12b5, 0x1e41}, /* mabovedot */
	1112	{0x12b7, 0x1e56}, /* Pabovedot */
	1113	{0x12b8, 0x1e81}, /* wgrave */
	1114	{0x12b9, 0x1e57}, /* pabovedot */
	1115	{0x12ba, 0x1e83}, /* wacute */
	1116	{0x12bb, 0x1e60}, /* Sabovedot */
	1117	{0x12bc, 0x1ef3}, /* ygrave */
	1118	{0x12bd, 0x1e84}, /* Wdiaeresis */
	1119	{0x12be, 0x1e85}, /* wdiaeresis */
	1120	{0x12bf, 0x1e61}, /* sabovedot */
	1121	{0x12d0, 0x0174}, /* Wcircumflex */
	1122	{0x12d7, 0x1e6a}, /* Tabovedot */
	1123	{0x12de, 0x0176}, /* Ycircumflex */
	1124	{0x12f0, 0x0175}, /* wcircumflex */
	1125	{0x12f7, 0x1e6b}, /* tabovedot */
	1126	{0x12fe, 0x0177}, /* ycircumflex */
	1127	{0x0590, 0x06f0}, /* Farsi_0 */
	1128	{0x0591, 0x06f1}, /* Farsi_1 */
	1129	{0x0592, 0x06f2}, /* Farsi_2 */
	1130	{0x0593, 0x06f3}, /* Farsi_3 */
	1131	{0x0594, 0x06f4}, /* Farsi_4 */
	1132	{0x0595, 0x06f5}, /* Farsi_5 */
	1133	{0x0596, 0x06f6}, /* Farsi_6 */
	1134	{0x0597, 0x06f7}, /* Farsi_7 */
	1135	{0x0598, 0x06f8}, /* Farsi_8 */
	1136	{0x0599, 0x06f9}, /* Farsi_9 */
	1137	{0x05a5, 0x066a}, /* Arabic_percent */
	1138	{0x05a6, 0x0670}, /* Arabic_superscript_alef */
	1139	{0x05a7, 0x0679}, /* Arabic_tteh */
	1140	{0x05a8, 0x067e}, /* Arabic_peh */
	1141	{0x05a9, 0x0686}, /* Arabic_tcheh */
	1142	{0x05aa, 0x0688}, /* Arabic_ddal */
	1143	{0x05ab, 0x0691}, /* Arabic_rreh */
	1144	{0x05ae, 0x06d4}, /* Arabic_fullstop */
	1145	{0x05b0, 0x0660}, /* Arabic_0 */
	1146	{0x05b1, 0x0661}, /* Arabic_1 */
	1147	{0x05b2, 0x0662}, /* Arabic_2 */
	1148	{0x05b3, 0x0663}, /* Arabic_3 */
	1149	{0x05b4, 0x0664}, /* Arabic_4 */
	1150	{0x05b5, 0x0665}, /* Arabic_5 */
	1151	{0x05b6, 0x0666}, /* Arabic_6 */
	1152	{0x05b7, 0x0667}, /* Arabic_7 */
	1153	{0x05b8, 0x0668}, /* Arabic_8 */
	1154	{0x05b9, 0x0669}, /* Arabic_9 */
	1155	{0x05f3, 0x0653}, /* Arabic_madda_above */
	1156	{0x05f4, 0x0654}, /* Arabic_hamza_above */
	1157	{0x05f5, 0x0655}, /* Arabic_hamza_below */
	1158	{0x05f6, 0x0698}, /* Arabic_jeh */
	1159	{0x05f7, 0x06a4}, /* Arabic_veh */
	1160	{0x05f8, 0x06a9}, /* Arabic_keheh */
	1161	{0x05f9, 0x06af}, /* Arabic_gaf */
	1162	{0x05fa, 0x06ba}, /* Arabic_noon_ghunna */
	1163	{0x05fb, 0x06be}, /* Arabic_heh_doachashmee */
	1164	{0x05fc, 0x06cc}, /* Farsi_yeh */
	1165	{0x05fd, 0x06d2}, /* Arabic_yeh_baree */
	1166	{0x05fe, 0x06c1}, /* Arabic_heh_goal */
	1167	{0x0680, 0x0492}, /* Cyrillic_GHE_bar */
	1168	{0x0681, 0x0496}, /* Cyrillic_ZHE_descender */
	1169	{0x0682, 0x049a}, /* Cyrillic_KA_descender */
	1170	{0x0683, 0x049c}, /* Cyrillic_KA_vertstroke */
	1171	{0x0684, 0x04a2}, /* Cyrillic_EN_descender */
	1172	{0x0685, 0x04ae}, /* Cyrillic_U_straight */
	1173	{0x0686, 0x04b0}, /* Cyrillic_U_straight_bar */
	1174	{0x0687, 0x04b2}, /* Cyrillic_HA_descender */
	1175	{0x0688, 0x04b6}, /* Cyrillic_CHE_descender */
	1176	{0x0689, 0x04b8}, /* Cyrillic_CHE_vertstroke */
	1177	{0x068a, 0x04ba}, /* Cyrillic_SHHA */
	1178	{0x068c, 0x04d8}, /* Cyrillic_SCHWA */
	1179	{0x068d, 0x04e2}, /* Cyrillic_I_macron */
	1180	{0x068e, 0x04e8}, /* Cyrillic_O_bar */
	1181	{0x068f, 0x04ee}, /* Cyrillic_U_macron */
	1182	{0x0690, 0x0493}, /* Cyrillic_ghe_bar */
	1183	{0x0691, 0x0497}, /* Cyrillic_zhe_descender */
	1184	{0x0692, 0x049b}, /* Cyrillic_ka_descender */
	1185	{0x0693, 0x049d}, /* Cyrillic_ka_vertstroke */
	1186	{0x0694, 0x04a3}, /* Cyrillic_en_descender */
	1187	{0x0695, 0x04af}, /* Cyrillic_u_straight */
	1188	{0x0696, 0x04b1}, /* Cyrillic_u_straight_bar */
	1189	{0x0697, 0x04b3}, /* Cyrillic_ha_descender */
	1190	{0x0698, 0x04b7}, /* Cyrillic_che_descender */
	1191	{0x0699, 0x04b9}, /* Cyrillic_che_vertstroke */
	1192	{0x069a, 0x04bb}, /* Cyrillic_shha */
	1193	{0x069c, 0x04d9}, /* Cyrillic_schwa */
	1194	{0x069d, 0x04e3}, /* Cyrillic_i_macron */
	1195	{0x069e, 0x04e9}, /* Cyrillic_o_bar */
	1196	{0x069f, 0x04ef}, /* Cyrillic_u_macron */
	1197	{0x16a3, 0x1e8a}, /* Xabovedot */
	1198	{0x16a6, 0x012c}, /* Ibreve */
	1199	{0x16a9, 0x01b5}, /* Zstroke */
	1200	{0x16aa, 0x01e6}, /* Gcaron */
	1201	{0x16af, 0x019f}, /* Obarred */
	1202	{0x16b3, 0x1e8b}, /* xabovedot */
	1203	{0x16b6, 0x012d}, /* ibreve */
	1204	{0x16b9, 0x01b6}, /* zstroke */
	1205	{0x16ba, 0x01e7}, /* gcaron */
	1206	{0x16bd, 0x01d2}, /* ocaron */
	1207	{0x16bf, 0x0275}, /* obarred */
	1208	{0x16c6, 0x018f}, /* SCHWA */
	1209	{0x16f6, 0x0259}, /* schwa */
	1210	{0x16d1, 0x1e36}, /* Lbelowdot */
	1211	{0x16e1, 0x1e37}, /* lbelowdot */
	1212	{0x1ea0, 0x1ea0}, /* Abelowdot */
	1213	{0x1ea1, 0x1ea1}, /* abelowdot */
	1214	{0x1ea2, 0x1ea2}, /* Ahook */
	1215	{0x1ea3, 0x1ea3}, /* ahook */
	1216	{0x1ea4, 0x1ea4}, /* Acircumflexacute */
	1217	{0x1ea5, 0x1ea5}, /* acircumflexacute */
	1218	{0x1ea6, 0x1ea6}, /* Acircumflexgrave */
	1219	{0x1ea7, 0x1ea7}, /* acircumflexgrave */
	1220	{0x1ea8, 0x1ea8}, /* Acircumflexhook */
	1221	{0x1ea9, 0x1ea9}, /* acircumflexhook */
	1222	{0x1eaa, 0x1eaa}, /* Acircumflextilde */
	1223	{0x1eab, 0x1eab}, /* acircumflextilde */
	1224	{0x1eac, 0x1eac}, /* Acircumflexbelowdot */
	1225	{0x1ead, 0x1ead}, /* acircumflexbelowdot */
	1226	{0x1eae, 0x1eae}, /* Abreveacute */
	1227	{0x1eaf, 0x1eaf}, /* abreveacute */
	1228	{0x1eb0, 0x1eb0}, /* Abrevegrave */
	1229	{0x1eb1, 0x1eb1}, /* abrevegrave */
	1230	{0x1eb2, 0x1eb2}, /* Abrevehook */
	1231	{0x1eb3, 0x1eb3}, /* abrevehook */
	1232	{0x1eb4, 0x1eb4}, /* Abrevetilde */
	1233	{0x1eb5, 0x1eb5}, /* abrevetilde */
	1234	{0x1eb6, 0x1eb6}, /* Abrevebelowdot */
	1235	{0x1eb7, 0x1eb7}, /* abrevebelowdot */
	1236	{0x1eb8, 0x1eb8}, /* Ebelowdot */
	1237	{0x1eb9, 0x1eb9}, /* ebelowdot */
	1238	{0x1eba, 0x1eba}, /* Ehook */
	1239	{0x1ebb, 0x1ebb}, /* ehook */
	1240	{0x1ebc, 0x1ebc}, /* Etilde */
	1241	{0x1ebd, 0x1ebd}, /* etilde */
	1242	{0x1ebe, 0x1ebe}, /* Ecircumflexacute */
	1243	{0x1ebf, 0x1ebf}, /* ecircumflexacute */
	1244	{0x1ec0, 0x1ec0}, /* Ecircumflexgrave */
	1245	{0x1ec1, 0x1ec1}, /* ecircumflexgrave */
	1246	{0x1ec2, 0x1ec2}, /* Ecircumflexhook */
	1247	{0x1ec3, 0x1ec3}, /* ecircumflexhook */
	1248	{0x1ec4, 0x1ec4}, /* Ecircumflextilde */
	1249	{0x1ec5, 0x1ec5}, /* ecircumflextilde */
	1250	{0x1ec6, 0x1ec6}, /* Ecircumflexbelowdot */
	1251	{0x1ec7, 0x1ec7}, /* ecircumflexbelowdot */
	1252	{0x1ec8, 0x1ec8}, /* Ihook */
	1253	{0x1ec9, 0x1ec9}, /* ihook */
	1254	{0x1eca, 0x1eca}, /* Ibelowdot */
	1255	{0x1ecb, 0x1ecb}, /* ibelowdot */
	1256	{0x1ecc, 0x1ecc}, /* Obelowdot */
	1257	{0x1ecd, 0x1ecd}, /* obelowdot */
	1258	{0x1ece, 0x1ece}, /* Ohook */
	1259	{0x1ecf, 0x1ecf}, /* ohook */
	1260	{0x1ed0, 0x1ed0}, /* Ocircumflexacute */
	1261	{0x1ed1, 0x1ed1}, /* ocircumflexacute */
	1262	{0x1ed2, 0x1ed2}, /* Ocircumflexgrave */
	1263	{0x1ed3, 0x1ed3}, /* ocircumflexgrave */
	1264	{0x1ed4, 0x1ed4}, /* Ocircumflexhook */
	1265	{0x1ed5, 0x1ed5}, /* ocircumflexhook */
	1266	{0x1ed6, 0x1ed6}, /* Ocircumflextilde */
	1267	{0x1ed7, 0x1ed7}, /* ocircumflextilde */
	1268	{0x1ed8, 0x1ed8}, /* Ocircumflexbelowdot */
	1269	{0x1ed9, 0x1ed9}, /* ocircumflexbelowdot */
	1270	{0x1eda, 0x1eda}, /* Ohornacute */
	1271	{0x1edb, 0x1edb}, /* ohornacute */
	1272	{0x1edc, 0x1edc}, /* Ohorngrave */
	1273	{0x1edd, 0x1edd}, /* ohorngrave */
	1274	{0x1ede, 0x1ede}, /* Ohornhook */
	1275	{0x1edf, 0x1edf}, /* ohornhook */
	1276	{0x1ee0, 0x1ee0}, /* Ohorntilde */
	1277	{0x1ee1, 0x1ee1}, /* ohorntilde */
	1278	{0x1ee2, 0x1ee2}, /* Ohornbelowdot */
	1279	{0x1ee3, 0x1ee3}, /* ohornbelowdot */
	1280	{0x1ee4, 0x1ee4}, /* Ubelowdot */
	1281	{0x1ee5, 0x1ee5}, /* ubelowdot */
	1282	{0x1ee6, 0x1ee6}, /* Uhook */
	1283	{0x1ee7, 0x1ee7}, /* uhook */
	1284	{0x1ee8, 0x1ee8}, /* Uhornacute */
	1285	{0x1ee9, 0x1ee9}, /* uhornacute */
	1286	{0x1eea, 0x1eea}, /* Uhorngrave */
	1287	{0x1eeb, 0x1eeb}, /* uhorngrave */
	1288	{0x1eec, 0x1eec}, /* Uhornhook */
	1289	{0x1eed, 0x1eed}, /* uhornhook */
	1290	{0x1eee, 0x1eee}, /* Uhorntilde */
	1291	{0x1eef, 0x1eef}, /* uhorntilde */
	1292	{0x1ef0, 0x1ef0}, /* Uhornbelowdot */
	1293	{0x1ef1, 0x1ef1}, /* uhornbelowdot */
	1294	{0x1ef4, 0x1ef4}, /* Ybelowdot */
	1295	{0x1ef5, 0x1ef5}, /* ybelowdot */
	1296	{0x1ef6, 0x1ef6}, /* Yhook */
	1297	{0x1ef7, 0x1ef7}, /* yhook */
	1298	{0x1ef8, 0x1ef8}, /* Ytilde */
	1299	{0x1ef9, 0x1ef9}, /* ytilde */
	1300	{0x1efa, 0x01a0}, /* Ohorn */
	1301	{0x1efb, 0x01a1}, /* ohorn */
	1302	{0x1efc, 0x01af}, /* Uhorn */
	1303	{0x1efd, 0x01b0}, /* uhorn */
	1304	{0, 0}
	1305	};
	1306
	1307	#endif

+189

-107

macosx/tkMacOSXMenu.c less more

35	35	#define SPECIALMENU(n, f) {.name = "." #n, .len = sl(#n) + 1, \
36	36	.flag = ENTRY_##f##_MENU }
37	37	static const struct {
38		const char *name; const size_t len; const int flag;
	38	const char *name; size_t len; int flag;
39	39	} specialMenus[] = {
40	40	SPECIALMENU(help, HELP),
41	41	SPECIALMENU(apple, APPLE),
42	42	SPECIALMENU(window, WINDOWS),
43		{NULL}
	43	{NULL, 0, 0}
44	44	};
45	45	#undef SPECIALMENU
46	46
47	47	#define MODIFIER(n, f) {.name = #n, .len = sl(#n), .mask = f }
48	48	static const struct {
49		const char *name; const size_t len; const NSUInteger mask;
50		} modifiers[] = {
	49	const char *name; size_t len; NSUInteger mask;
	50	} allModifiers[] = {
51	51	MODIFIER(Control, NSControlKeyMask),
52	52	MODIFIER(Ctrl, NSControlKeyMask),
53	53	MODIFIER(Option, NSAlternateKeyMask),

57	57	MODIFIER(Command, NSCommandKeyMask),
58	58	MODIFIER(Cmd, NSCommandKeyMask),
59	59	MODIFIER(Meta, NSCommandKeyMask),
60		{NULL}
	60	{NULL, 0, 0}
61	61	};
62	62	#undef MODIFIER
63	63
64	64	#define ACCEL(n, c) {.name = #n, .len = sl(#n), .ch = c }
65	65	static const struct {
66		const char *name; const size_t len; const UniChar ch;
	66	const char *name; size_t len; UniChar ch;
67	67	} specialAccelerators[] = {
68	68	ACCEL(PageUp, NSPageUpFunctionKey),
69	69	ACCEL(PageDown, NSPageDownFunctionKey),

85	85	ACCEL(Help, NSHelpFunctionKey),
86	86	ACCEL(Power, 0x233d),
87	87	ACCEL(Eject, 0xf804),
88		{NULL}
	88	{NULL, 0, 0}
89	89	};
90	90	#undef ACCEL
91	91	#undef sl

94	94	* the flag that Tk is not to draw any
95	95	* menus. */
96	96	static int inPostMenu = 0;
97		static unsigned long defaultBg = 0, defaultFg = 0;
98	97	static SInt32 menuMarkColumnWidth = 0, menuIconTrailingEdgeMargin = 0;
99	98	static SInt32 menuTextLeadingEdgeMargin = 0, menuTextTrailingEdgeMargin = 0;
100	99	static SInt16 menuItemExtraHeight = 0, menuItemExtraWidth = 0;

106	105	static void MenuSelectEvent(TkMenu *menuPtr);
107	106	static void RecursivelyClearActiveMenu(TkMenu *menuPtr);
108	107	static int ModifierCharWidth(Tk_Font tkfont);
	108
	109	#pragma mark TkBackgroundLoop
	110
	111	/*
	112	* The function TkMacOSXEventsCheckProc (in tkMacOSXNotify.c) is the "check
	113	* proc" for the macOS event source. Its job is to remove NSEvents from the
	114	* default event queue of the NSApplication. It does this by calling the
	115	* method [NSApp nextEventMatchingMask: untilDate: inMode: dequeue:]. As a
	116	* rule, when the untilDate is set to the distant past this method returns
	117	* immediately. An exception to that rule is when the next event is the button
	118	* press on a menu button. In that case, the method starts running a nested
	119	* event loop in the mode NSEventTrackingRunLoopMode which does not return
	120	* until the menu has been dismissed. In Tk 8.6.10 and earlier, this meant
	121	* that the Tk event loop would block in its call to the check proc as long as
	122	* the menu was posted. For example, opening a menu during the Rube Goldberg
	123	* demo would cause the animation to stop. This was also the case for
	124	* menubuttons.
	125	*
	126	* The TKBackground object below works around this problem, and allows a Tk
	127	* event loop to run while a menu is open. It is a subclass of NSThread which
	128	* inserts requests to call [NSApp _runBackgroundLoop] onto the queue
	129	* associated with the NSEventTrackingRunLoopMode. One of these threads gets
	130	* started in the callback [NSApp menuBeginTracking] and cancelled in [NSApp
	131	* menuEndTracking].
	132	*/
	133
	134	@interface TKBackgroundLoop: NSThread
	135	@end
	136
	137	@implementation TKBackgroundLoop
	138	- (void) main
	139	{
	140	NSAutoreleasePool *pool = [NSAutoreleasePool new];
	141	NSArray *modeArray = [NSArray arrayWithObjects: NSEventTrackingRunLoopMode,
	142	nil];
	143	while(1) {
	144
	145	/*
	146	* Queue a request to process Tk events during event tracking.
	147	*/
	148
	149	[NSApp performSelectorOnMainThread:@selector(_runBackgroundLoop)
	150	withObject:nil
	151	waitUntilDone:true
	152	modes:modeArray];
	153	if ([self isCancelled]) {
	154	[NSThread exit];
	155	}
	156
	157	/*
	158	* Allow the tracked events to be processed too.
	159	*/
	160
	161	[NSThread sleepForTimeInterval:0.001];
	162	}
	163	[pool drain];
	164	}
	165	@end
	166
	167	TKBackgroundLoop *backgroundLoop = nil;
	168
109	169
110	170	#pragma mark TKMenu
111	171

258	318	if (menuPtr && mePtr) {
259	319	Tcl_Interp *interp = menuPtr->interp;
260	320
261		/*
262		* Add time for errors to fire if necessary. This is sub-optimal
263		* but avoids issues with Tcl/Cocoa event loop integration.
264		*/
265
266		//Tcl_Sleep(100);
267	321	Tcl_Preserve(interp);
268	322	Tcl_Preserve(menuPtr);
269	323

286	340	- (BOOL) menuHasKeyEquivalent: (NSMenu ) menu forEvent: (NSEvent ) event
287	341	target: (id ) target action: (SEL ) action
288	342	{
	343	(void)menu;
	344
289	345	/*
290	346	* Use lowercaseString when comparing keyEquivalents since the notion of
291	347	* a shifted upper case letter does not make much sense.

342	398
343	399	- (void) menuWillOpen: (NSMenu *) menu
344	400	{
	401	(void)menu;
	402
345	403	if (_tkMenu) {
346	404	//RecursivelyClearActiveMenu(_tkMenu);
347	405	GenerateMenuSelectEvent((TKMenu *)[self supermenu],

351	409
352	410	- (void) menuDidClose: (NSMenu *) menu
353	411	{
	412	(void)menu;
	413
354	414	if (_tkMenu) {
355	415	RecursivelyClearActiveMenu(_tkMenu);
356	416	}

358	418
359	419	- (void) menu: (NSMenu ) menu willHighlightItem: (NSMenuItem ) item
360	420	{
	421	(void)menu;
	422
361	423	if (_tkMenu) {
362	424	GenerateMenuSelectEvent(self, item);
363	425	}

366	428	- (void) menuNeedsUpdate: (NSMenu *) menu
367	429	{
368	430	TkMenu menuPtr = (TkMenu ) _tkMenu;
	431	(void)menu;
369	432
370	433	if (menuPtr) {
371	434	Tcl_Interp *interp = menuPtr->interp;

391	454
392	455	- (void) menuBeginTracking: (NSNotification *) notification
393	456	{
	457	(void)notification;
394	458	#ifdef TK_MAC_DEBUG_NOTIFICATIONS
395	459	TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification);
396	460	#endif
	461	if (backgroundLoop) {
	462	[backgroundLoop cancel];
	463	[backgroundLoop release];
	464	}
	465	backgroundLoop = [[TKBackgroundLoop alloc] init];
	466	[backgroundLoop start];
397	467	//TkMacOSXClearMenubarActive();
398	468	//TkMacOSXPreprocessMenu();
399	469	}
400	470
401	471	- (void) menuEndTracking: (NSNotification *) notification
402	472	{
	473	(void)notification;
403	474	#ifdef TK_MAC_DEBUG_NOTIFICATIONS
404	475	TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification);
405	476	#endif
	477	if (backgroundLoop) {
	478	[backgroundLoop cancel];
	479	[backgroundLoop release];
	480	backgroundLoop = nil;
	481	}
406	482	if (!inPostMenu) {
407	483	TkMacOSXClearMenubarActive();
408	484	}

609	685	NSString *keyEquivalent = @"";
610	686	NSUInteger modifierMask = NSCommandKeyMask;
611	687	NSMenu *submenu = nil;
612		NSDictionary *attributes;
613	688	int imageWidth, imageHeight;
614	689	GC gc = (mePtr->textGC ? mePtr->textGC : mePtr->menuPtr->textGC);
615	690	Tcl_Obj *fontPtr = (mePtr->fontPtr ? mePtr->fontPtr :

617	692
618	693	if (mePtr->image) {
619	694	Tk_SizeOfImage(mePtr->image, &imageWidth, &imageHeight);
620		image = TkMacOSXGetNSImageWithTkImage(mePtr->menuPtr->display,
	695	image = TkMacOSXGetNSImageFromTkImage(mePtr->menuPtr->display,
621	696	mePtr->image, imageWidth, imageHeight);
622	697	} else if (mePtr->bitmapPtr != None) {
623	698	Pixmap bitmap = Tk_GetBitmapFromObj(mePtr->menuPtr->tkwin,

625	700
626	701	Tk_SizeOfBitmap(mePtr->menuPtr->display, bitmap, &imageWidth,
627	702	&imageHeight);
628		image = TkMacOSXGetNSImageWithBitmap(mePtr->menuPtr->display, bitmap,
	703	image = TkMacOSXGetNSImageFromBitmap(mePtr->menuPtr->display, bitmap,
629	704	gc, imageWidth, imageHeight);
630		if (gc->foreground == defaultFg) {
631		// Use a semantic foreground color by default
632		[image setTemplate:YES];
633		}
	705	[image setTemplate:YES];
634	706	}
635	707	[menuItem setImage:image];
636	708	if ((!image \|\| mePtr->compound != COMPOUND_NONE) && mePtr->labelPtr &&

644	716	}
645	717	}
646	718	[menuItem setTitle:title];
647		if (strcmp(Tcl_GetString(fontPtr), "menu") \|\| gc->foreground != defaultFg
648		\|\| gc->background != defaultBg) {
649		attributes = TkMacOSXNSFontAttributesForFont(Tk_GetFontFromObj(
650		mePtr->menuPtr->tkwin, fontPtr));
651		if (gc->foreground != defaultFg \|\| gc->background != defaultBg) {
652		NSColor *color = TkMacOSXGetNSColor(gc,
653		gc->foreground!=defaultFg? gc->foreground:gc->background);
654
655		attributes = [[attributes mutableCopy] autorelease];
656		[(NSMutableDictionary *) attributes setObject:color
657		forKey:NSForegroundColorAttributeName];
658		}
659		if (attributes) {
660		attributedTitle = [[[NSAttributedString alloc]
661		initWithString:title attributes:attributes] autorelease];
662		}
663		}
	719
	720	#if 0
	721
	722	/*
	723	* The -background and -foreground options are now ignored in Aqua.
	724	* See ticket [635167af14].
	725	*/
	726
	727	NSDictionary fontAttributes = TkMacOSXNSFontAttributesForFont(
	728	Tk_GetFontFromObj(mePtr->menuPtr->tkwin, fontPtr));
	729	NSMutableDictionary *attributes = [fontAttributes mutableCopy];
	730	static unsigned long defaultBg = 0, defaultFg = 0;
	731	if (defaultBg == 0) {
	732	tkColor *tkColPtr = TkpGetColor(NULL, DEF_MENU_BG_COLOR);
	733	defaultBg = tkColPtr->color.pixel;
	734	ckfree(tkColPtr);
	735	}
	736	if (defaultFg == 0) {
	737	tkColor *tkColPtr = TkpGetColor(NULL, DEF_MENU_FG);
	738	defaultFg = tkColPtr->color.pixel;
	739	ckfree(tkColPtr);
	740	}
	741	if (gc->foreground != defaultFg) {
	742	NSColor *fgcolor = TkMacOSXGetNSColor(gc, gc->foreground);
	743	[attributes setObject:fgcolor
	744	forKey:NSForegroundColorAttributeName];
	745	}
	746	if (gc->background != defaultBg) {
	747	NSColor *bgcolor = TkMacOSXGetNSColor(gc, gc->background);
	748	[attributes setObject:bgcolor
	749	forKey:NSBackgroundColorAttributeName];
	750	}
	751
	752	#else
	753
	754	NSDictionary *attributes = TkMacOSXNSFontAttributesForFont(
	755	Tk_GetFontFromObj(mePtr->menuPtr->tkwin, fontPtr));
	756
	757	#endif
	758
	759	attributedTitle = [[NSAttributedString alloc] initWithString:title
	760	attributes:attributes];
664	761	[menuItem setAttributedTitle:attributedTitle];
665		[menuItem setEnabled:!(mePtr->state == ENTRY_DISABLED)];
	762	[menuItem setEnabled:(mePtr->state != ENTRY_DISABLED)];
666	763	[menuItem setState:((mePtr->type == CHECK_BUTTON_ENTRY \|\|
667	764	mePtr->type == RADIO_BUTTON_ENTRY) && mePtr->indicatorOn &&
668	765	(mePtr->entryFlags & ENTRY_SELECTED) ? NSOnState : NSOffState)];

695	792	if ([menuItem isEnabled]) {
696	793
697	794	/*
698		* This menuItem might have been previously disabled (XXX:
699		* track this), which would have disabled entries; we must
700		* re-enable the entries here.
	795	* This menuItem might have been previously disabled which
	796	* would have disabled all of its entries; we must re-enable the
	797	* entries here. It is important to iterate though the Tk
	798	* entries, not the NSMenuItems, since some NSMenuItems may
	799	* have been added by the system. See [7185d26cf4].
701	800	*/
702	801
703		int i = 0;
704		NSArray *itemArray = [submenu itemArray];
705
706		for (NSMenuItem *item in itemArray) {
	802	for (int i = 0; i < menuRefPtr->menuPtr->numEntries; i++) {
707	803	TkMenuEntry *submePtr = menuRefPtr->menuPtr->entries[i];
708
709		/*
710		* Work around an apparent bug where itemArray can have
711		* more items than the menu's entries[] array.
712		*/
713
714		if (i >= (int) menuRefPtr->menuPtr->numEntries) {
715		break;
716		}
717		[item setEnabled: !(submePtr->state == ENTRY_DISABLED)];
718		i++;
	804	NSMenuItem item = (NSMenuItem ) submePtr->platformEntryData;
	805	[item setEnabled:(submePtr->state != ENTRY_DISABLED)];
719	806	}
720	807	}
721	808	}

784	871
785	872	int
786	873	TkpPostMenu(
787		Tcl_Interp interp, / The interpreter this menu lives in */
	874	TCL_UNUSED(Tcl_Interp ), / The interpreter this menu lives in */
788	875	TkMenu menuPtr, / The menu we are posting */
789	876	int x, int y, /* The screen coordinates where the top left
790	877	* corner of the menu, or of the specified

808	895	* rather than the appearance of the root window.
809	896	*/
810	897	realWinPtr = (TkWindow*) realWin;
811		realWinView = TkMacOSXDrawableView(realWinPtr->privatePtr);
	898	realWinView = TkMacOSXGetNSViewForDrawable(realWinPtr->privatePtr);
812	899	if (realWinView != nil) {
813	900	break;
814	901	}

881	968
882	969	int
883	970	TkpPostTearoffMenu(
884		Tcl_Interp interp, / The interpreter this menu lives in */
	971	TCL_UNUSED(Tcl_Interp ), / The interpreter this menu lives in */
885	972	TkMenu menuPtr, / The menu we are posting */
886	973	int x, int y, int index) /* The screen coordinates where the top left
887	974	* corner of the menu, or of the specified

1092	1179	cascadeEntryPtr = cascadeEntryPtr->nextCascadePtr) {
1093	1180	if (cascadeEntryPtr->menuPtr->menuType == MENUBAR
1094	1181	&& cascadeEntryPtr->menuPtr->masterMenuPtr->tkwin) {
1095		TkMenu *masterMenuPtr = cascadeEntryPtr->menuPtr->masterMenuPtr;
	1182	TkMenu *mainMenuPtr = cascadeEntryPtr->menuPtr->masterMenuPtr;
1096	1183	int i = 0;
1097	1184	Tcl_DString ds;
1098	1185
1099	1186	Tcl_DStringInit(&ds);
1100		Tcl_DStringAppend(&ds, Tk_PathName(masterMenuPtr->tkwin), -1);
	1187	Tcl_DStringAppend(&ds, Tk_PathName(mainMenuPtr->tkwin), -1);
1101	1188	while (specialMenus[i].name) {
1102	1189	Tcl_DStringAppend(&ds, specialMenus[i].name,
1103	1190	specialMenus[i].len);

1144	1231	*maskPtr = 0;
1145	1232	while (1) {
1146	1233	i = 0;
1147		while (modifiers[i].name) {
1148		int l = modifiers[i].len;
1149
1150		if (!strncasecmp(accel, modifiers[i].name, l) &&
	1234	while (allModifiers[i].name) {
	1235	int l = allModifiers[i].len;
	1236
	1237	if (!strncasecmp(accel, allModifiers[i].name, l) &&
1151	1238	(accel[l] == '-' \|\| accel[l] == '+')) {
1152		*maskPtr \|= modifiers[i].mask;
	1239	*maskPtr \|= allModifiers[i].mask;
1153	1240	accel += l+1;
1154	1241	break;
1155	1242	}
1156	1243	i++;
1157	1244	}
1158		if (!modifiers[i].name \|\| !*accel) {
	1245	if (!allModifiers[i].name \|\| !*accel) {
1159	1246	break;
1160	1247	}
1161	1248	}

1379	1466	}
1380	1467	} else {
1381	1468	NSUInteger modifMask = [menuItem keyEquivalentModifierMask];
1382		int i = 0;
1383
1384		while (modifiers[i].name) {
1385		if (modifMask & modifiers[i].mask) {
1386		modifMask &= ~modifiers[i].mask;
	1469	int j = 0;
	1470
	1471	while (allModifiers[j].name) {
	1472	if (modifMask & allModifiers[j].mask) {
	1473	modifMask &= ~allModifiers[j].mask;
1387	1474	modifierWidth += modifierCharWidth;
1388	1475	}
1389		i++;
	1476	j++;
1390	1477	}
1391	1478	accelWidth = [[menuItem keyEquivalent] sizeWithAttributes:
1392	1479	TkMacOSXNSFontAttributesForFont(tkfont)].width;

1612	1699	void
1613	1700	TkpMenuInit(void)
1614	1701	{
1615		TkColor *tkColPtr;
1616
1617	1702	NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
1618	1703
1619	1704	#define observe(n, s) \

1623	1708	#undef observe
1624	1709
1625	1710	[NSMenuItem setUsesUserKeyEquivalents:NO];
1626		tkColPtr = TkpGetColor(NULL, DEF_MENU_BG_COLOR);
1627		defaultBg = tkColPtr->color.pixel;
1628		ckfree(tkColPtr);
1629		tkColPtr = TkpGetColor(NULL, DEF_MENU_FG);
1630		defaultFg = tkColPtr->color.pixel;
1631		ckfree(tkColPtr);
1632
1633	1711	ChkErr(GetThemeMetric, kThemeMetricMenuMarkColumnWidth,
1634	1712	&menuMarkColumnWidth);
1635	1713	ChkErr(GetThemeMetric, kThemeMetricMenuTextLeadingEdgeMargin,

1690	1768
1691	1769	void
1692	1770	TkpMenuNotifyToplevelCreate(
1693		Tcl_Interp interp, / The interp the menu lives in. */
1694		const char menuName) / The name of the menu to reconfigure. */
	1771	TCL_UNUSED(Tcl_Interp ), / The interp the menu lives in. */
	1772	TCL_UNUSED(const char )) / The name of the menu to reconfigure. */
1695	1773	{
1696	1774	/*
1697	1775	* Nothing to do.

1719	1797
1720	1798	void
1721	1799	TkpInitializeMenuBindings(
1722		Tcl_Interp interp, / The interpreter to set. */
1723		Tk_BindingTable bindingTable)
	1800	TCL_UNUSED(Tcl_Interp ), / The interpreter to set. */
	1801	TCL_UNUSED(Tk_BindingTable))
1724	1802	/* The table to add to. */
1725	1803	{
1726	1804	/*

1760	1838	* TkpDrawMenuEntry --
1761	1839	*
1762	1840	* Draws the given menu entry at the given coordinates with the given
1763		* attributes.
1764		*
1765		* Results:
1766		* None.
1767		*
1768		* Side effects:
1769		* X Server commands are executed to display the menu entry.
	1841	* attributes. This is a no-op on macOS since the menus are drawn by
	1842	* the Apple window manager, which also handles all events related to
	1843	* selecting menu items. This function is only called for tearoff
	1844	* menus, which are not supported on macOS but do get drawn as nearly
	1845	* invisible 1 pixel wide windows on macOS
	1846	*
	1847	* Results:
	1848	* None.
	1849	*
	1850	* Side effects:
	1851	* None
1770	1852	*
1771	1853	*----------------------------------------------------------------------
1772	1854	*/
1773	1855
1774	1856	void
1775	1857	TkpDrawMenuEntry(
1776		TkMenuEntry mePtr, / The entry to draw */
1777		Drawable d, /* What to draw into */
1778		Tk_Font tkfont, /* Precalculated font for menu */
1779		const Tk_FontMetrics *menuMetricsPtr,
	1858	TCL_UNUSED(TkMenuEntry ), / The entry to draw */
	1859	TCL_UNUSED(Drawable), /* What to draw into */
	1860	TCL_UNUSED(Tk_Font), /* Precalculated font for menu */
	1861	TCL_UNUSED(const Tk_FontMetrics *),
1780	1862	/* Precalculated metrics for menu */
1781		int x, /* X-coordinate of topleft of entry */
1782		int y, /* Y-coordinate of topleft of entry */
1783		int width, /* Width of the entry rectangle */
1784		int height, /* Height of the current rectangle */
1785		int strictMotif, /* Boolean flag */
1786		int drawArrow) /* Whether or not to draw the cascade arrow
	1863	TCL_UNUSED(int), /* X-coordinate of topleft of entry */
	1864	TCL_UNUSED(int), /* Y-coordinate of topleft of entry */
	1865	TCL_UNUSED(int), /* Width of the entry rectangle */
	1866	TCL_UNUSED(int), /* Height of the current rectangle */
	1867	TCL_UNUSED(int), /* Boolean flag */
	1868	TCL_UNUSED(int)) /* Whether or not to draw the cascade arrow
1787	1869	* for cascade items. */
1788	1870	{
1789	1871	}

1832	1914
1833	1915	int
1834	1916	TkMacOSXUseMenuID(
1835		short macID) /* The id to take out of the table */
	1917	TCL_UNUSED(short)) /* The id to take out of the table */
1836	1918	{
1837	1919	return TCL_OK;
1838	1920	}

1855	1937
1856	1938	int
1857	1939	TkMacOSXDispatchMenuEvent(
1858		int menuID, /* The menu id of the menu we are invoking */
1859		int index) /* The one-based index of the item that was
	1940	TCL_UNUSED(int), /* The menu id of the menu we are invoking */
	1941	TCL_UNUSED(int)) /* The one-based index of the item that was
1860	1942	* selected. */
1861	1943	{
1862	1944	return TCL_ERROR;

+17

-23

macosx/tkMacOSXMenubutton.c less more

75	75	Tk_ClassProcs tkpMenubuttonClass = {
76	76	sizeof(Tk_ClassProcs), /* size */
77	77	TkMenuButtonWorldChanged, /* worldChangedProc */
	78	NULL,
	79	NULL
78	80	};
79	81
80	82	/*

132	134	TkpCreateMenuButton(
133	135	Tk_Window tkwin)
134	136	{
135		MacMenuButton mbPtr = (MacMenuButton ) ckalloc(sizeof(MacMenuButton));
	137	MacMenuButton mbPtr = (MacMenuButton )ckalloc(sizeof(MacMenuButton));
136	138
137	139	Tk_CreateEventHandler(tkwin, ActivateMask, MenuButtonEventProc, mbPtr);
138	140	mbPtr->flags = FIRST_DRAW;

178	180	TkMacOSXComputeMenuButtonDrawParams(butPtr, dpPtr);
179	181
180	182	/*
181		* Set up clipping region. Make sure the we are using the port for this
182		* button, or we will set the wrong window's clip.
183		*/
184
185		TkMacOSXSetUpClippingRgn(pixmap);
186
187		/*
188	183	* Draw the native portion of the buttons.
189	184	*/
190	185

221	216
222	217	void
223	218	TkpDestroyMenuButton(
224		TkMenuButton *mbPtr)
	219	TCL_UNUSED(TkMenuButton *))
225	220	{
226	221	}
227	222

245	240
246	241	void
247	242	TkpComputeMenuButtonGeometry(butPtr)
248		register TkMenuButton butPtr; / Widget record for menu button. */
	243	TkMenuButton butPtr; / Widget record for menu button. */
249	244	{
250	245	int width, height, avgWidth, haveImage = 0, haveText = 0;
251	246	int txtWidth, txtHeight;

361	356	*
362	357	* DrawMenuButtonImageAndText --
363	358	*
364		* Draws the image and text associated witha button or label.
	359	* Draws the image and text associated with a button or label.
365	360	*
366	361	* Results:
367	362	* None.

392	387	DrawParams *dpPtr = &mbPtr->drawParams;
393	388	pixmap = (Pixmap) Tk_WindowId(tkwin);
394	389
395		if (butPtr->image != None) {
	390	if (butPtr->image != NULL) {
396	391	Tk_SizeOfImage(butPtr->image, &width, &height);
397	392	haveImage = 1;
398	393	} else if (butPtr->bitmap != None) {

543	538	static void
544	539	TkMacOSXDrawMenuButton(
545	540	MacMenuButton mbPtr, / Mac menubutton. */
546		GC gc, /* The GC we are drawing into - needed for the bevel
547		* button */
	541	TCL_UNUSED(GC), /* The GC we are drawing into - not used */
548	542	Pixmap pixmap) /* The pixmap we are drawing into - needed for the
549	543	* bevel button */
550	544	{

565	559	static HIThemeButtonDrawInfo hiinfo;
566	560
567	561	MenuButtonBackgroundDrawCB(mbPtr, 32, true);
568		if (!TkMacOSXSetupDrawingContext(pixmap, dpPtr->gc, 1, &dc)) {
	562	if (!TkMacOSXSetupDrawingContext(pixmap, dpPtr->gc, &dc)) {
569	563	return;
570	564	}
571	565

596	590	MenuButtonContentDrawCB(mbPtr->btnkind, &mbPtr->drawinfo,
597	591	mbPtr, 32, true);
598	592	} else {
599		if (!TkMacOSXSetupDrawingContext(pixmap, dpPtr->gc, 1, &dc)) {
	593	if (!TkMacOSXSetupDrawingContext(pixmap, dpPtr->gc, &dc)) {
600	594	return;
601	595	}
602	596	TkMacOSXRestoreDrawingContext(&dc);

624	618	static void
625	619	MenuButtonBackgroundDrawCB (
626	620	MacMenuButton *ptr,
627		SInt16 depth,
628		Boolean isColorDev)
	621	TCL_UNUSED(SInt16),
	622	TCL_UNUSED(Boolean))
629	623	{
630	624	TkMenuButton* butPtr = (TkMenuButton *) ptr;
631	625	Tk_Window tkwin = butPtr->tkwin;

657	651
658	652	static void
659	653	MenuButtonContentDrawCB (
660		ThemeButtonKind kind,
661		const HIThemeButtonDrawInfo *drawinfo,
	654	TCL_UNUSED(ThemeButtonKind),
	655	TCL_UNUSED(const HIThemeButtonDrawInfo *),
662	656	MacMenuButton *ptr,
663		SInt16 depth,
664		Boolean isColorDev)
	657	TCL_UNUSED(SInt16),
	658	TCL_UNUSED(Boolean))
665	659	{
666	660	TkMenuButton butPtr = (TkMenuButton ) ptr;
667	661	Tk_Window tkwin = butPtr->tkwin;

708	702	mbPtr->flags &= ~ACTIVE;
709	703	}
710	704	if ((buttonPtr->flags & REDRAW_PENDING) == 0) {
711		Tcl_DoWhenIdle(TkpDisplayMenuButton, (ClientData) buttonPtr);
	705	Tcl_DoWhenIdle(TkpDisplayMenuButton, buttonPtr);
712	706	buttonPtr->flags \|= REDRAW_PENDING;
713	707	}
714	708	}

+3

-3

macosx/tkMacOSXMenus.c less more

111	111	* On OS X 10.12 we get duplicate tab control items if we create them here.
112	112	*/
113	113
114		if ([NSApp macMinorVersion] > 12) {
	114	if ([NSApp macOSVersion] > 101200) {
115	115	_defaultWindowsMenuItems = [_defaultWindowsMenuItems
116	116	arrayByAddingObjectsFromArray:
117	117	[NSArray arrayWithObjects:

200	200	{
201	201	if (!_eventInterp \|\| !Tcl_FindCommand(_eventInterp, "tkAboutDialog",
202	202	NULL, 0) \|\| (GetCurrentEventKeyModifiers() & optionKey)) {
203		TkAboutDlg();
	203	[super orderFrontStandardAboutPanel:nil];
204	204	} else {
205	205	int code = Tcl_EvalEx(_eventInterp, "tkAboutDialog", -1,
206	206	TCL_EVAL_GLOBAL);

414	414	if (!winPtr) {
415	415	return;
416	416	}
417		tkwin = (Tk_Window) winPtr->dispPtr->focusPtr;
	417	tkwin = (Tk_Window)winPtr->dispPtr->focusPtr;
418	418	if (!tkwin) {
419	419	return;
420	420	}

+205

-211

macosx/tkMacOSXMouseEvent.c less more

23	23	Point global;
24	24	Point local;
25	25	} MouseEventData;
	26
26	27	static Tk_Window captureWinPtr = NULL; /* Current capture window; may be
27	28	* NULL. */
28	29

41	42	* window attribute pointing to the active window. As of 10.8 this behavior
42	43	* had changed. The new behavior was that if the mouse were ever moved outside
43	44	* of a window, all subsequent NSMouseMoved NSEvents would have a Nil window
44		* attribute. To work around this the TKApplication remembers the last non-Nil
45		* window that it received in a mouse event. If it receives an NSEvent with a
46		* Nil window attribute then the saved window is used.
	45	* attribute until the mouse returned to the window. In 11.1 it changed again.
	46	* The window attribute can be non-nil, but referencing a window which does not
	47	* belong to the application.
47	48	*/
48	49
49	50	@implementation TKApplication(TKMouseEvent)

51	52	{
52	53	NSWindow *eventWindow = [theEvent window];
53	54	NSEventType eventType = [theEvent type];
	55	NSRect viewFrame = [[eventWindow contentView] frame];
	56	NSPoint location = [theEvent locationInWindow];
54	57	TkWindow winPtr = NULL, grabWinPtr;
55		Tk_Window tkwin;
	58	Tk_Window tkwin = None, capture, target;
56	59	NSPoint local, global;
57		#if 0
58		NSTrackingArea *trackingArea = nil;
59		NSInteger eventNumber, clickCount, buttonNumber;
60		#endif
61		[NSEvent stopPeriodicEvents];
	60	NSInteger button;
	61	Bool inTitleBar = NO;
	62	int win_x, win_y;
	63	unsigned int buttonState = 0;
	64	static int validPresses = 0, ignoredPresses = 0;
62	65
63	66	#ifdef TK_MAC_DEBUG_EVENTS
64	67	TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, theEvent);
65	68	#endif
	69
	70	/*
	71	* If this event is not for a Tk toplevel, it should just be passed up the
	72	* responder chain. However, there is an exception for synthesized events,
	73	* which are used in testing. Those events are recognized by having their
	74	* both the windowNumber and the eventNumber set to -1.
	75	*/
	76
	77	if (eventWindow && ![eventWindow isMemberOfClass:[TKWindow class]]) {
	78	if ([theEvent windowNumber] != -1 \|\| [theEvent eventNumber] != -1)
	79	return theEvent;
	80	}
	81
	82	/*
	83	* Check if the event is located in the titlebar.
	84	*/
	85
	86	if (eventWindow) {
	87	inTitleBar = viewFrame.size.height < location.y;
	88	}
	89
	90	button = [theEvent buttonNumber] + Button1;
66	91	switch (eventType) {
67		case NSMouseEntered:
68		case NSMouseExited:
69		case NSCursorUpdate:
70		case NSLeftMouseDown:
71		case NSLeftMouseUp:
72		case NSRightMouseDown:
73	92	case NSRightMouseUp:
74		case NSOtherMouseDown:
75	93	case NSOtherMouseUp:
	94	buttonState &= ~TkGetButtonMask(button);
	95	break;
76	96	case NSLeftMouseDragged:
77	97	case NSRightMouseDragged:
78	98	case NSOtherMouseDragged:
	99	case NSRightMouseDown:
	100	case NSOtherMouseDown:
	101	buttonState \|= TkGetButtonMask(button);
	102	break;
	103	case NSMouseEntered:
	104	if ([eventWindow respondsToSelector:@selector(mouseInResizeArea)] &&
	105	!inTitleBar) {
	106	[(TKWindow *)eventWindow setMouseInResizeArea:YES];
	107	}
	108	break;
	109	case NSMouseExited:
	110	if ([eventWindow respondsToSelector:@selector(mouseInResizeArea)]) {
	111	[(TKWindow *)eventWindow setMouseInResizeArea:NO];
	112	break;
	113	}
	114	case NSLeftMouseUp:
	115	case NSLeftMouseDown:
79	116	case NSMouseMoved:
	117	case NSScrollWheel:
	118	#if 0
	119	case NSCursorUpdate:
80	120	case NSTabletPoint:
81	121	case NSTabletProximity:
82		case NSScrollWheel:
	122	#endif
83	123	break;
84		default: /* Unrecognized mouse event. */
	124	default: /* This type of event is ignored. */
85	125	return theEvent;
86	126	}
87	127
88	128	/*
89		* Compute the mouse position in Tk screen coordinates (global) and in the
90		* Tk coordinates of its containing Tk Window (local). If a grab is in effect,
91		* the local coordinates should be relative to the grab window.
92		*/
93
94		if (eventWindow) {
95		local = [theEvent locationInWindow];
96		global = [eventWindow tkConvertPointToScreen: local];
97		tkwin = TkMacOSXGetCapture();
98		if (tkwin) {
99		winPtr = (TkWindow *) tkwin;
100		eventWindow = TkMacOSXDrawableWindow(winPtr->window);
101		if (eventWindow) {
102		local = [eventWindow tkConvertPointFromScreen: global];
103		} else {
104		return theEvent;
105		}
106		}
107		local.y = [eventWindow frame].size.height - local.y;
108		global.y = TkMacOSXZeroScreenHeight() - global.y;
109		} else {
110
111		/*
112		* If the event has no NSWindow, the location is in screen coordinates.
113		*/
114
115		global = [theEvent locationInWindow];
116		tkwin = TkMacOSXGetCapture();
117		if (tkwin) {
118		winPtr = (TkWindow *) tkwin;
119		eventWindow = TkMacOSXDrawableWindow(winPtr->window);
120		} else {
121		eventWindow = [NSApp mainWindow];
122		}
	129	* Update the button state. We ignore left button presses that start a
	130	* resize or occur in the title bar. See tickets [d72abe6b54] and
	131	* [39cbacb9e8].
	132	*/
	133
	134	if (eventType == NSLeftMouseDown) {
	135	if ([eventWindow respondsToSelector:@selector(mouseInResizeArea)] &&
	136	[(TKWindow *) eventWindow mouseInResizeArea]) {
	137
	138	/*
	139	* When the left button is pressed in the resize area, we receive
	140	* NSMouseDown, but when it is released we do not receive
	141	* NSMouseUp. So ignore the event and clear the button state but
	142	* do not change the ignoredPresses count.
	143	*/
	144
	145	buttonState &= ~TkGetButtonMask(Button1);
	146	return theEvent;
	147	}
	148	if (inTitleBar) {
	149	ignoredPresses++;
	150	return theEvent;
	151	}
	152	validPresses++;
	153	buttonState \|= TkGetButtonMask(Button1);
	154	}
	155	if (eventType == NSLeftMouseUp) {
	156	if (ignoredPresses > 0) {
	157	ignoredPresses--;
	158	} else if (validPresses > 0) {
	159	validPresses--;
	160	}
	161	if (validPresses == 0) {
	162	buttonState &= ~TkGetButtonMask(Button1);
	163	}
	164	}
	165
	166	/*
	167	* Find an appropriate NSWindow to attach to this event, and its
	168	* associated Tk window.
	169	*/
	170
	171	capture = TkMacOSXGetCapture();
	172	if (capture) {
	173	winPtr = (TkWindow *) capture;
	174	eventWindow = TkMacOSXGetNSWindowForDrawable(winPtr->window);
123	175	if (!eventWindow) {
124	176	return theEvent;
125	177	}
126		local = [eventWindow tkConvertPointFromScreen: global];
127		local.y = [eventWindow frame].size.height - local.y;
128		global.y = TkMacOSXZeroScreenHeight() - global.y;
129		}
130
131		/*
132		* If we still don't have a window, try using the toplevel that
133		* manages the NSWindow.
134		*/
135
136		if (!tkwin) {
137		winPtr = TkMacOSXGetTkWindow(eventWindow);
138		tkwin = (Tk_Window) winPtr;
139		}
140		if (!tkwin) {
	178	} else {
	179	if (eventWindow) {
	180	winPtr = TkMacOSXGetTkWindow(eventWindow);
	181	}
	182	if (!winPtr) {
	183	eventWindow = [NSApp mainWindow];
	184	winPtr = TkMacOSXGetTkWindow(eventWindow);
	185	}
	186	}
	187	if (!winPtr) {
141	188
142	189	/*
143		* We can't find a window for this event. We have to ignore it.
	190	* We couldn't find a Tk window for this event. We have to ignore it.
144	191	*/
145	192
146	193	#ifdef TK_MAC_DEBUG_EVENTS
147		TkMacOSXDbgMsg("tkwin == NULL");
	194	TkMacOSXDbgMsg("Event received with no Tk window.");
148	195	#endif
149	196	return theEvent;
150	197	}
151
152		/*
153		* Ignore the event if a local grab is in effect and the Tk event window is
154		* not in the grabber's subtree.
155		*/
156
157		grabWinPtr = winPtr->dispPtr->grabWinPtr;
158		if (grabWinPtr && /* There is a grab in effect ... */
159		!winPtr->dispPtr->grabFlags && /* and it is a local grab ... */
160		grabWinPtr->mainPtr == winPtr->mainPtr){ /* in the same application. */
161		Tk_Window tkwin2, tkEventWindow = Tk_CoordsToWindow(global.x, global.y, tkwin);
162		if (!tkEventWindow) {
163		return theEvent;
164		}
165		for (tkwin2 = tkEventWindow;
166		!Tk_IsTopLevel(tkwin2);
167		tkwin2 = Tk_Parent(tkwin2)) {
168		if (tkwin2 == (Tk_Window) grabWinPtr) {
169		break;
170		}
171		}
172		if (tkwin2 != (Tk_Window) grabWinPtr) {
173		return theEvent;
174		}
175		}
176
177		/*
178		* Convert local from NSWindow flipped coordinates to the toplevel's
179		* coordinates.
180		*/
181
	198	tkwin = (Tk_Window) winPtr;
	199
	200	/*
	201	* Compute the mouse position in local (window) and global (screen)
	202	* coordinates. These are Tk coordinates, meaning that the local origin is
	203	* at the top left corner of the containing toplevel and the global origin
	204	* is at top left corner of the primary screen.
	205	*/
	206
	207	global = [NSEvent mouseLocation];
	208	local = [eventWindow tkConvertPointFromScreen: global];
	209	global.x = floor(global.x);
	210	global.y = floor(TkMacOSXZeroScreenHeight() - global.y);
	211	local.x = floor(local.x);
	212	local.y = floor([eventWindow frame].size.height - local.y);
182	213	if (Tk_IsEmbedded(winPtr)) {
183	214	TkWindow *contPtr = TkpGetOtherWindow(winPtr);
184	215	if (Tk_IsTopLevel(contPtr)) {

195	226	}
196	227
197	228	/*
198		* Use the toplevel coordinates to find the containing Tk window. Then
199		* convert local into the coordinates of that window. (The converted
200		* local coordinates are only needed for scrollwheel events.)
201		*/
202
203		int win_x, win_y;
204		tkwin = Tk_TopCoordsToWindow(tkwin, local.x, local.y, &win_x, &win_y);
205		local.x = win_x;
206		local.y = win_y;
	229	* Use the local coordinates to find the Tk window which should receive
	230	* this event. Also convert local into the coordinates of that window.
	231	* (The converted local coordinates are only needed for scrollwheel
	232	* events.)
	233	*/
	234
	235	target = Tk_TopCoordsToWindow(tkwin, local.x, local.y, &win_x, &win_y);
	236
	237	/*
	238	* Ignore the event if a local grab is in effect and the Tk window is
	239	* not in the grabber's subtree.
	240	*/
	241
	242	grabWinPtr = winPtr->dispPtr->grabWinPtr;
	243	if (grabWinPtr && /* There is a grab in effect ... */
	244	!winPtr->dispPtr->grabFlags && /* and it is a local grab ... */
	245	grabWinPtr->mainPtr == winPtr->mainPtr){ /* in the same application. */
	246	Tk_Window tkwin2;
	247	if (!target) {
	248	return theEvent;
	249	}
	250	for (tkwin2 = target;
	251	!Tk_IsTopLevel(tkwin2);
	252	tkwin2 = Tk_Parent(tkwin2)) {
	253	if (tkwin2 == (Tk_Window)grabWinPtr) {
	254	break;
	255	}
	256	}
	257	if (tkwin2 != (Tk_Window)grabWinPtr) {
	258	return theEvent;
	259	}
	260	}
207	261
208	262	/*
209	263	* Generate an XEvent for this mouse event.
210	264	*/
211	265
212		unsigned int state = 0;
213		int button = [theEvent buttonNumber] + Button1;
214		EventRef eventRef = (EventRef)[theEvent eventRef];
215		UInt32 buttons;
216		OSStatus err = GetEventParameter(eventRef, kEventParamMouseChord,
217		typeUInt32, NULL, sizeof(UInt32), NULL, &buttons);
218
219		if (err == noErr) {
220		state \|= (buttons & 0x1F) * Button1Mask;
221		} else if (button <= Button5) {
222		switch (eventType) {
223		case NSLeftMouseDown:
224		case NSRightMouseDown:
225		case NSLeftMouseDragged:
226		case NSRightMouseDragged:
227		case NSOtherMouseDown:
228		state \|= TkGetButtonMask(button);
229		break;
230		default:
231		break;
232		}
233		}
234
	266	unsigned int state = buttonState;
235	267	NSUInteger modifiers = [theEvent modifierFlags];
236	268
237	269	if (modifiers & NSAlphaShiftKeyMask) {

259	291	if (eventType != NSScrollWheel) {
260	292
261	293	/*
262		* For normal mouse events, Tk_UpdatePointer will send the XEvent.
	294	* For normal mouse events, Tk_UpdatePointer will send the appropriate
	295	* XEvents using its cached state information. Unfortunately, it will
	296	* also recompute the local coordinates.
263	297	*/
264	298
265	299	#ifdef TK_MAC_DEBUG_EVENTS
266		TKLog(@"UpdatePointer %p x %f.0 y %f.0 %d",
267		tkwin, global.x, global.y, state);
	300	TKLog(@"UpdatePointer %p x %.1f y %.1f %d",
	301	target, global.x, global.y, state);
268	302	#endif
269		Tk_UpdatePointer(tkwin, global.x, global.y, state);
	303
	304	Tk_UpdatePointer(target, global.x, global.y, state);
270	305	} else {
	306	CGFloat delta;
	307	int coarseDelta;
	308	XEvent xEvent;
271	309
272	310	/*
273	311	* For scroll wheel events we need to send the XEvent here.
274	312	*/
275	313
276		CGFloat delta;
277		int coarseDelta;
278		XEvent xEvent;
279
280	314	xEvent.type = MouseWheelEvent;
281		xEvent.xbutton.x = local.x;
282		xEvent.xbutton.y = local.y;
	315	xEvent.xbutton.x = win_x;
	316	xEvent.xbutton.y = win_y;
283	317	xEvent.xbutton.x_root = global.x;
284	318	xEvent.xbutton.y_root = global.y;
285	319	xEvent.xany.send_event = false;
286		xEvent.xany.display = Tk_Display(tkwin);
287		xEvent.xany.window = Tk_WindowId(tkwin);
	320	xEvent.xany.display = Tk_Display(target);
	321	xEvent.xany.window = Tk_WindowId(target);
288	322
289	323	delta = [theEvent deltaY];
290	324	if (delta != 0.0) {

310	344	@end
311	345
312	346	#pragma mark -
313
314		/*
315		*----------------------------------------------------------------------
316		*
317		* TkMacOSXKeyModifiers --
318		*
319		* Returns the current state of the modifier keys.
320		*
321		* Results:
322		* An OS Modifier state.
323		*
324		* Side effects:
325		* None.
326		*
327		*----------------------------------------------------------------------
328		*/
329
330		EventModifiers
331		TkMacOSXModifierState(void)
332		{
333		UInt32 keyModifiers;
334		int isFrontProcess = (GetCurrentEvent() && Tk_MacOSXIsAppInFront());
335
336		keyModifiers = isFrontProcess ? GetCurrentEventKeyModifiers() :
337		GetCurrentKeyModifiers();
338
339		return (EventModifiers) (keyModifiers & USHRT_MAX);
340		}
341	347
342	348	/*
343	349	*----------------------------------------------------------------------

463	469	NSPoint global = [NSEvent mouseLocation];
464	470
465	471	if (getLocal) {
466		MacDrawable macWin = (MacDrawable ) w;
467		NSWindow *win = TkMacOSXDrawableWindow(w);
	472	MacDrawable macWin = (MacDrawable )w;
	473	NSWindow *win = TkMacOSXGetNSWindowForDrawable(w);
468	474
469	475	if (win) {
470	476	NSPoint local;

502	508	* True if event(s) are generated - false otherwise.
503	509	*
504	510	* Side effects:
505		* Additional events may be place on the Tk event queue. Grab state may
	511	* Additional events may be placed on the Tk event queue. Grab state may
506	512	* also change.
507	513	*
508	514	*----------------------------------------------------------------------

540	546	* True if event(s) are generated, false otherwise.
541	547	*
542	548	* Side effects:
543		* Additional events may be place on the Tk event queue. Grab state may
	549	* Additional events may be placed on the Tk event queue. Grab state may
544	550	* also change.
545	551	*
546	552	*----------------------------------------------------------------------

553	559	Window window, /* X Window containing button event. */
554	560	unsigned int state) /* Button Key state suitable for X event. */
555	561	{
556		MacDrawable macWin = (MacDrawable ) window;
557		NSWindow *win = TkMacOSXDrawableWindow(window);
	562	MacDrawable macWin = (MacDrawable )window;
	563	NSWindow *win = TkMacOSXGetNSWindowForDrawable(window);
558	564	MouseEventData med;
559	565
560	566	bzero(&med, sizeof(MouseEventData));

592	598	* True if event(s) are generated - false otherwise.
593	599	*
594	600	* Side effects:
595		* Additional events may be place on the Tk event queue. Grab state may
	601	* Additional events may be placed on the Tk event queue. Grab state may
596	602	* also change.
597	603	*
598	604	*----------------------------------------------------------------------

635	641	return true;
636	642	}
637	643
	644	/*
	645	*----------------------------------------------------------------------
	646	*
	647	* TkpWarpPointer --
	648	*
	649	* Move the mouse cursor to the screen location specified by the warpX and
	650	* warpY fields of a TkDisplay.
	651	*
	652	* Results:
	653	* None
	654	*
	655	* Side effects:
	656	* The mouse cursor is moved.
	657	*
	658	*----------------------------------------------------------------------
	659	*/
	660
638	661	void
639	662	TkpWarpPointer(
640	663	TkDisplay *dispPtr)
641	664	{
642	665	CGPoint pt;
643		NSPoint loc;
644		int wNum;
645	666
646	667	if (dispPtr->warpWindow) {
647	668	int x, y;
648		TkWindow winPtr = (TkWindow ) dispPtr->warpWindow;
649		TkWindow *topPtr = winPtr->privatePtr->toplevel->winPtr;
650		NSWindow *w = TkMacOSXDrawableWindow(winPtr->window);
651		wNum = [w windowNumber];
652	669	Tk_GetRootCoords(dispPtr->warpWindow, &x, &y);
653	670	pt.x = x + dispPtr->warpX;
654	671	pt.y = y + dispPtr->warpY;
655		loc.x = dispPtr->warpX;
656		loc.y = Tk_Height(topPtr) - dispPtr->warpY;
657	672	} else {
658		wNum = 0;
659		pt.x = loc.x = dispPtr->warpX;
	673	pt.x = dispPtr->warpX;
660	674	pt.y = dispPtr->warpY;
661		loc.y = TkMacOSXZeroScreenHeight() - pt.y;
662		}
663
664		/*
665		* Generate an NSEvent of type NSMouseMoved.
666		*
667		* It is not clear why this is necessary. For example, calling
668		* event generate $w <Motion> -warp 1 -x $X -y $Y
669		* will cause two <Motion> events to be added to the Tcl queue.
670		*/
	675	}
671	676
672	677	CGWarpMouseCursorPosition(pt);
673		NSEvent *warpEvent = [NSEvent mouseEventWithType:NSMouseMoved
674		location:loc
675		modifierFlags:0
676		timestamp:GetCurrentEventTime()
677		windowNumber:wNum
678		context:nil
679		eventNumber:0
680		clickCount:1
681		pressure:0.0];
682		[NSApp postEvent:warpEvent atStart:NO];
683	678	}
684	679
685	680	/*

707	702	while (winPtr && !Tk_IsTopLevel(winPtr)) {
708	703	winPtr = winPtr->parentPtr;
709	704	}
710		[NSEvent stopPeriodicEvents];
711		captureWinPtr = (Tk_Window) winPtr;
	705	captureWinPtr = (Tk_Window)winPtr;
712	706	}
713	707
714	708	/*

+193

-30

macosx/tkMacOSXNotify.c less more

140	140	*/
141	141	- (void) sendEvent: (NSEvent *) theEvent
142	142	{
	143
	144	/*
	145	* Workaround for an Apple bug. When an accented character is selected
	146	* from an NSTextInputClient popup character viewer with the mouse, Apple
	147	* sends an event of type NSAppKitDefined and subtype 21. If that event is
	148	* sent up the responder chain it causes Apple to print a warning to the
	149	* console log and, extremely obnoxiously, also to stderr, which says
	150	* "Window move completed without beginning." Apparently they are sending
	151	* the "move completed" event without having sent the "move began" event of
	152	* subtype 20, and then announcing their error on our stderr. Also, of
	153	* course, no movement is occurring. The popup is not movable and is just
	154	* being closed. The bug has been reported to Apple. If they ever fix it,
	155	* this block should be removed.
	156	*/
	157
	158	# if MAC_OS_X_VERSION_MAX_ALLOWED >= 101500
	159	if ([theEvent type] == NSAppKitDefined) {
	160	static Bool aWindowIsMoving = NO;
	161	switch([theEvent subtype]) {
	162	case 20:
	163	aWindowIsMoving = YES;
	164	break;
	165	case 21:
	166	if (aWindowIsMoving) {
	167	aWindowIsMoving = NO;
	168	break;
	169	} else {
	170	// printf("Bug!!!!\n");
	171	return;
	172	}
	173	default:
	174	break;
	175	}
	176	}
	177	#endif
	178
143	179	[super sendEvent:theEvent];
144	180	[NSApp tkCheckPasteboard];
	181
145	182	#ifdef TK_MAC_DEBUG_EVENTS
146	183	fprintf(stderr, "Sending event of type %d\n", (int)[theEvent type]);
147	184	DebugPrintQueue();
148	185	#endif
	186
	187	}
	188
	189	- (void) _runBackgroundLoop
	190	{
	191	while(Tcl_DoOneEvent(TCL_IDLE_EVENTS\|TCL_TIMER_EVENTS\|TCL_DONT_WAIT)){
	192	TkMacOSXDrawAllViews(NULL);
	193	}
149	194	}
150	195	@end
151	196

165	210	*----------------------------------------------------------------------
166	211	*/
167	212
168		NSString *
	213	static NSString *
169	214	GetRunLoopMode(NSModalSession modalSession)
170	215	{
171	216	NSString *runLoopMode = nil;
172	217
173	218	if (modalSession) {
174	219	runLoopMode = NSModalPanelRunLoopMode;
175		} else if (TkMacOSXGetCapture()) {
176		runLoopMode = NSEventTrackingRunLoopMode;
177	220	}
178	221	if (!runLoopMode) {
179	222	runLoopMode = [[NSRunLoop currentRunLoop] currentMode];

225	268	Tcl_CreateEventSource(TkMacOSXEventsSetupProc,
226	269	TkMacOSXEventsCheckProc, NULL);
227	270	TkCreateExitHandler(TkMacOSXNotifyExitHandler, NULL);
228		Tcl_SetServiceMode(TCL_SERVICE_ALL);
229	271	TclMacOSXNotifierAddRunLoopMode(NSEventTrackingRunLoopMode);
230	272	TclMacOSXNotifierAddRunLoopMode(NSModalPanelRunLoopMode);
231	273	}

263	305	/*
264	306	*----------------------------------------------------------------------
265	307	*
	308	* TkMacOSXDrawAllViews --
	309	*
	310	* This static function is meant to be run as an idle task. It attempts
	311	* to redraw all views which have the tkNeedsDisplay property set to YES.
	312	* This relies on a feature of [NSApp nextEventMatchingMask: ...] which
	313	* is undocumented, namely that it sometimes blocks and calls drawRect
	314	* for all views that need display before it returns. We call it with
	315	* deQueue=NO so that it will not change anything on the AppKit event
	316	* queue, because we only want the side effect that it runs drawRect. The
	317	* only time when any NSViews have the needsDisplay property set to YES
	318	* is during execution of this function.
	319	*
	320	* The reason for running this function as an idle task is to try to
	321	* arrange that all widgets will be fully configured before they are
	322	* drawn. Any idle tasks that might reconfigure them should be higher on
	323	* the idle queue, so they should be run before the display procs are run
	324	* by drawRect.
	325	*
	326	* If this function is called directly with non-NULL clientData parameter
	327	* then the int which it references will be set to the number of windows
	328	* that need display, but the needsDisplay property of those windows will
	329	* not be changed.
	330	*
	331	* Results:
	332	* None.
	333	*
	334	* Side effects:
	335	* Parts of windows may get redrawn.
	336	*
	337	*----------------------------------------------------------------------
	338	*/
	339
	340	void
	341	TkMacOSXDrawAllViews(
	342	ClientData clientData)
	343	{
	344	int count = 0, dirtyCount = (int )clientData;
	345
	346	for (NSWindow *window in [NSApp windows]) {
	347	if ([[window contentView] isMemberOfClass:[TKContentView class]]) {
	348	TKContentView *view = [window contentView];
	349	if ([view tkNeedsDisplay]) {
	350	count++;
	351	if (dirtyCount) {
	352	continue;
	353	}
	354	[view setNeedsDisplayInRect:[view tkDirtyRect]];
	355	}
	356	} else {
	357	[window displayIfNeeded];
	358	}
	359	}
	360	if (dirtyCount) {
	361	*dirtyCount = count;
	362	}
	363	[NSApp nextEventMatchingMask:NSAnyEventMask
	364	untilDate:[NSDate distantPast]
	365	inMode:GetRunLoopMode(TkMacOSXGetModalSession())
	366	dequeue:NO];
	367	for (NSWindow *window in [NSApp windows]) {
	368	if ([[window contentView] isMemberOfClass:[TKContentView class]]) {
	369	TKContentView *view = [window contentView];
	370
	371	/*
	372	* If we did not run drawRect, we set needsDisplay back to NO.
	373	* Note that if drawRect did run it may have added to Tk's dirty
	374	* rect, due to attempts to draw outside of drawRect's dirty rect.
	375	*/
	376
	377	if ([view needsDisplay]) {
	378	[view setNeedsDisplay: NO];
	379	}
	380	}
	381	}
	382	[NSApp setNeedsToDraw:NO];
	383	}
	384
	385	/*
	386	*----------------------------------------------------------------------
	387	*
266	388	* TkMacOSXEventsSetupProc --
267	389	*
268	390	* This procedure implements the setup part of the MacOSX event source. It
269		* is invoked by Tcl_DoOneEvent before calling TkMacOSXEventsProc to
	391	* is invoked by Tcl_DoOneEvent before calling TkMacOSXEventsCheckProc to
270	392	* process all queued NSEvents. In our case, all we need to do is to set
271	393	* the Tcl MaxBlockTime to 0 before starting the loop to process all
272	394	* queued NSEvents.

276	398	*
277	399	* Side effects:
278	400	*
279		* If NSEvents are queued, then the maximum block time will be set to 0 to
280		* ensure that control returns immediately to Tcl.
281		*
282		*----------------------------------------------------------------------
283		*/
	401	* If NSEvents are queued, or if there is any drawing that needs to be
	402	* done, then the maximum block time will be set to 0 to ensure that
	403	* Tcl_WaitForEvent returns immediately.
	404	*
	405	*----------------------------------------------------------------------
	406	*/
	407
	408	#define TICK 200
	409	static Tcl_TimerToken ticker = NULL;
	410
	411	static void
	412	Heartbeat(
	413	ClientData clientData)
	414	{
	415
	416	if (ticker) {
	417	ticker = Tcl_CreateTimerHandler(TICK, Heartbeat, NULL);
	418	}
	419	}
	420
	421	static const Tcl_Time zeroBlockTime = { 0, 0 };
284	422
285	423	static void
286	424	TkMacOSXEventsSetupProc(
287	425	ClientData clientData,
288	426	int flags)
289	427	{
290		static Bool havePeriodicEvents = NO;
291	428	NSString *runloopMode = [[NSRunLoop currentRunLoop] currentMode];
292	429
293	430	/*

295	432	*/
296	433
297	434	if (flags & TCL_WINDOW_EVENTS && !runloopMode) {
298		static const Tcl_Time zeroBlockTime = { 0, 0 };
	435
299	436	[NSApp _resetAutoreleasePool];
300	437
301		/*
302		* Call this with dequeue=NO -- just checking if the queue is empty.
303		*/
	438	/*
	439	* After calling this setup proc, Tcl_DoOneEvent will call
	440	* Tcl_WaitForEvent. Then it will call check proc to collect the
	441	* events and translate them into XEvents.
	442	*
	443	* If we have any events waiting or if there is any drawing to be done
	444	* we want Tcl_WaitForEvent to return immediately. So we set the block
	445	* time to 0 and stop the heartbeat.
	446	*/
304	447
305	448	NSEvent *currentEvent =
306	449	[NSApp nextEventMatchingMask:NSAnyEventMask
307	450	untilDate:[NSDate distantPast]
308	451	inMode:GetRunLoopMode(TkMacOSXGetModalSession())
309	452	dequeue:NO];
310		if (currentEvent) {
311		if (currentEvent.type > 0) {
312		Tcl_SetMaxBlockTime(&zeroBlockTime);
313		[NSEvent stopPeriodicEvents];
314		havePeriodicEvents = NO;
315		}
316		} else if (!havePeriodicEvents){
	453	if ((currentEvent) \|\| [NSApp needsToDraw] ) {
	454	Tcl_SetMaxBlockTime(&zeroBlockTime);
	455	Tcl_DeleteTimerHandler(ticker);
	456	ticker = NULL;
	457	} else if (ticker == NULL) {
317	458
318	459	/*
319		* When the user is not generating events we schedule a "hearbeat"
320		* event to fire every 0.1 seconds. This helps to make the vwait
321		* command more responsive when there is no user input, e.g. when
322		* running the test suite.
	460	* When the user is not generating events we schedule a "heartbeat"
	461	* TimerHandler to fire every 200 milliseconds. The handler does
	462	* nothing, but when its timer fires it causes Tcl_WaitForEvent to
	463	* return. This helps avoid hangs when calling vwait during the
	464	* non-regression tests.
323	465	*/
324	466
325		havePeriodicEvents = YES;
326		[NSEvent startPeriodicEventsAfterDelay:0.0 withPeriod:0.1];
	467	ticker = Tcl_CreateTimerHandler(TICK, Heartbeat, NULL);
327	468	}
328	469	}
329	470	}

351	492	int flags)
352	493	{
353	494	NSString *runloopMode = [[NSRunLoop currentRunLoop] currentMode];
	495	int eventsFound = 0;
354	496
355	497	/*
356	498	* runloopMode will be nil if we are in a Tcl event loop.

389	531	inMode:GetRunLoopMode(modalSession)
390	532	dequeue:YES];
391	533	if (currentEvent) {
	534
392	535	/*
393	536	* Generate Xevents.
394	537	*/
395	538
396		int oldServiceMode = Tcl_SetServiceMode(TCL_SERVICE_ALL);
397	539	NSEvent *processedEvent = [NSApp tkProcessEvent:currentEvent];
398		Tcl_SetServiceMode(oldServiceMode);
399	540	if (processedEvent) {
	541	eventsFound++;
	542
400	543	#ifdef TK_MAC_DEBUG_EVENTS
401	544	TKLog(@" event: %@", currentEvent);
402	545	#endif
	546
403	547	if (modalSession) {
404	548	[NSApp _modalSession:modalSession sendEvent:currentEvent];
405	549	} else {

416	560	*/
417	561
418	562	[NSApp _unlockAutoreleasePool];
	563
	564	/*
	565	* Add an idle task to the end of the idle queue which will redisplay
	566	* all of our dirty windows. We want this to happen after all other
	567	* idle tasks have run so that all widgets will be configured before
	568	* they are displayed. The drawRect method "borrows" the idle queue
	569	* while drawing views. That is, it sends expose events which cause
	570	* display procs to be posted as idle tasks and then runs an inner
	571	* event loop to processes those idle tasks. We are trying to arrange
	572	* for the idle queue to be empty when it starts that process and empty
	573	* when it finishes.
	574	*/
	575
	576	int dirtyCount = 0;
	577	TkMacOSXDrawAllViews(&dirtyCount);
	578	if (dirtyCount > 0) {
	579	Tcl_CancelIdleCall(TkMacOSXDrawAllViews, NULL);
	580	Tcl_DoWhenIdle(TkMacOSXDrawAllViews, NULL);
	581	}
419	582	}
420	583	}
421	584

+31

-21

macosx/tkMacOSXPort.h less more

0	0	/*
1	1	* tkMacOSXPort.h --
2	2	*
3		* This file is included by all of the Tk C files. It contains
	3	* This file is included by all of the Tk C files. It contains
4	4	* information that may be configuration-dependent, such as
5	5	* #includes for system include files and a few other things.
6	6	*

16	16	#define _TKMACPORT
17	17
18	18	#include <stdio.h>
	19	#include <pwd.h>
	20	#include <assert.h>
	21	#include <errno.h>
	22	#include <fcntl.h>
19	23	#include <ctype.h>
20		#include <fcntl.h>
	24	#include <math.h>
	25	#include <string.h>
21	26	#include <limits.h>
22		#include <math.h>
23		#include <pwd.h>
24	27	#include <stdlib.h>
25		#include <assert.h>
26		#include <string.h>
27	28	#include <sys/types.h>
28	29	#include <sys/file.h>
29	30	#ifdef HAVE_SYS_SELECT_H

157	158	*/
158	159
159	160	#define TK_NO_DOUBLE_BUFFERING 1
	161	#define TK_HAS_DYNAMIC_COLORS 1
	162	#define TK_DYNAMIC_COLORMAP 0x0fffffff
160	163
161	164	/*
162		* Magic pixel code values for system colors.
163		*
164		* NOTE: values must be kept in sync with indices into the
165		* systemColorMap array in tkMacOSXColor.c !
	165	* Inform tkImgPhInstance.c that our tkPutImage can render an image with an
	166	* alpha channel directly into a window.
166	167	*/
167	168
168		#define TRANSPARENT_PIXEL 30
169		#define APPEARANCE_PIXEL 52
170		#define PIXEL_MAGIC ((unsigned char) 0x69)
	169	#define TKPUTIMAGE_CAN_BLEND
171	170
172	171	/*
173		* The following macro returns the pixel value that corresponds to the
174		* 16-bit RGB values in the given XColor structure.
175		* The format is: (PIXEL_MAGIC <<< 24) \| (R << 16) \| (G << 8) \| B
176		* where each of R, G and B is the high order byte of a 16-bit component.
	172	* Used by xcolor.c
177	173	*/
178	174
179		#define TkpGetPixel(p) ((((((PIXEL_MAGIC << 8) \
180		\| (((p)->red >> 8) & 0xff)) << 8) \
181		\| (((p)->green >> 8) & 0xff)) << 8) \
182		\| (((p)->blue >> 8) & 0xff))
	175	MODULE_SCOPE unsigned long TkMacOSXRGBPixel(unsigned long red, unsigned long green,
	176	unsigned long blue);
	177	#define TkpGetPixel(p) (TkMacOSXRGBPixel(p->red >> 8, p->green >> 8, p->blue >> 8))
183	178
	179	/*
	180	* Used by tkWindow.c
	181	*/
	182
	183	MODULE_SCOPE void TkMacOSXHandleMapOrUnmap(Tk_Window tkwin, XEvent *event);
	184
	185	#define TkpHandleMapOrUnmap(tkwin, event) TkMacOSXHandleMapOrUnmap(tkwin, event)
	186
	187	/*
	188	* Used by tkAppInit
	189	*/
	190
	191	#define USE_CUSTOM_EXIT_PROC
	192	EXTERN int TkpWantsExitProc(void);
	193	EXTERN TCL_NORETURN void TkpExitProc(void *);
184	194
185	195	#endif /* _TKMACPORT */

+183

-53

macosx/tkMacOSXPrivate.h less more

3	3	* Macros and declarations that are purely internal & private to TkAqua.
4	4	*
5	5	* Copyright (c) 2005-2009 Daniel A. Steffen <das@users.sourceforge.net>
6		* Copyright 2008-2009, Apple Inc.
	6	* Copyright (c) 2008-2009 Apple Inc.
	7	* Copyright (c) 2020 Marc Culler
7	8	*
8	9	* See the file "license.terms" for information on usage and redistribution
9	10	* of this file, and for a DISCLAIMER OF ALL WARRANTIES.

16	17
17	18	#if !__OBJC__
18	19	#error Objective-C compiler required
	20	#endif
	21
	22	#ifndef __clang__
	23	#define instancetype id
19	24	#endif
20	25
21	26	#define TextStyle MacTextStyle

97	102	* debug message in case of failure.
98	103	*/
99	104	#define ChkErr(f, ...) ({ \
100		OSStatus err = f(__VA_ARGS__); \
101		if (err != noErr) { \
102		TkMacOSXDbgOSErr(f, err); \
	105	OSStatus err_ = f(__VA_ARGS__); \
	106	if (err_ != noErr) { \
	107	TkMacOSXDbgOSErr(f, err_); \
103	108	} \
104		err;})
	109	err_;})
105	110
106	111	#else /* TK_MAC_DEBUG */
107	112	#define TKLog(f, ...)

122	127	}
123	128
124	129	/*
	130	* The structure of a 32-bit XEvent keycode on macOS. It may be viewed as
	131	* an unsigned int or as having either two or three bitfields.
	132	*/
	133
	134	typedef struct keycode_v_t {
	135	unsigned keychar: 22; /* UCS-32 character */
	136	unsigned o_s: 2; /* State of Option and Shift keys. */
	137	unsigned virtual: 8; /* 8-bit virtual keycode - identifies a key. */
	138	} keycode_v;
	139
	140	typedef struct keycode_x_t {
	141	unsigned keychar: 22; /* UCS-32 character */
	142	unsigned xvirtual: 10; /* Combines o_s and virtual. This 10-bit integer
	143	* is used as a key for looking up the character
	144	* produced when pressing a key with a particular
	145	* Shift and Option modifier state. */
	146	} keycode_x;
	147
	148	typedef union MacKeycode_t {
	149	unsigned int uint;
	150	keycode_v v;
	151	keycode_x x;
	152	} MacKeycode;
	153
	154	/*
	155	* Macros used in tkMacOSXKeyboard.c and tkMacOSXKeyEvent.c.
	156	* Note that 0x7f is del and 0xF8FF is the Apple Logo character.
	157	*/
	158
	159	#define ON_KEYPAD(virtual) ((virtual >= 0x41) && (virtual <= 0x5C))
	160	#define IS_PRINTABLE(keychar) ((keychar >= 0x20) && (keychar != 0x7f) && \
	161	((keychar < 0xF700) \|\| keychar >= 0xF8FF))
	162
	163	/*
	164	* An "index" is 2-bit bitfield showing the state of the Option and Shift
	165	* keys. It is used as an index when building the keymaps and it
	166	* is the value of the o_s bitfield of a keycode_v.
	167	*/
	168
	169	#define INDEX_SHIFT 1
	170	#define INDEX_OPTION 2
	171	#define INDEX2STATE(index) ((index & INDEX_SHIFT ? ShiftMask : 0) \| \
	172	(index & INDEX_OPTION ? Mod2Mask : 0))
	173	#define INDEX2CARBON(index) ((index & INDEX_SHIFT ? shiftKey : 0) \| \
	174	(index & INDEX_OPTION ? optionKey : 0))
	175	#define STATE2INDEX(state) ((state & ShiftMask ? INDEX_SHIFT : 0) \| \
	176	(state & Mod2Mask ? INDEX_OPTION : 0))
	177
	178	/*
	179	* Special values for the virtual bitfield. Actual virtual keycodes are < 128.
	180	*/
	181
	182	#define NO_VIRTUAL 0xFF /* Not generated by a key or the NSText"InputClient. */
	183	#define REPLACEMENT_VIRTUAL 0x80 /* A BMP char sent by the NSTextInputClient. */
	184	#define NON_BMP_VIRTUAL 0x81 /* A non-BMP char sent by the NSTextInputClient. */
	185
	186	/*
	187	* A special character is used in the keycode for simulated modifier KeyPress
	188	* or KeyRelease XEvents. It is near the end of the private-use range but
	189	* different from the UniChar 0xF8FF which Apple uses for their logo character.
	190	* A different special character is used for keys, like the Menu key, which do
	191	* not appear on Macintosh keyboards.
	192	*/
	193
	194	#define MOD_KEYCHAR 0xF8FE
	195	#define UNKNOWN_KEYCHAR 0xF8FD
	196
	197	/*
125	198	* Structure encapsulating current drawing environment.
126	199	*/
127	200

142	215	* Prototypes for TkMacOSXRegion.c.
143	216	*/
144	217
145		#if 0
146		MODULE_SCOPE void TkMacOSXEmtpyRegion(TkRegion r);
147		MODULE_SCOPE int TkMacOSXIsEmptyRegion(TkRegion r);
148		#endif
149	218	MODULE_SCOPE HIShapeRef TkMacOSXGetNativeRegion(TkRegion r);
150	219	MODULE_SCOPE void TkMacOSXSetWithNativeRegion(TkRegion r,
151	220	HIShapeRef rgn);
152		MODULE_SCOPE void TkMacOSXOffsetRegion(TkRegion r, short dx, short dy);
153	221	MODULE_SCOPE HIShapeRef TkMacOSXHIShapeCreateEmpty(void);
154	222	MODULE_SCOPE HIMutableShapeRef TkMacOSXHIShapeCreateMutableWithRect(
155	223	const CGRect *inRect);
156	224	MODULE_SCOPE OSStatus TkMacOSXHIShapeSetWithShape(
157	225	HIMutableShapeRef inDestShape,
158	226	HIShapeRef inSrcShape);
159		#if 0
160		MODULE_SCOPE OSStatus TkMacOSXHIShapeSetWithRect(HIMutableShapeRef inShape,
161		const CGRect *inRect);
162		#endif
163	227	MODULE_SCOPE OSStatus TkMacOSHIShapeDifferenceWithRect(
164	228	HIMutableShapeRef inShape, const CGRect *inRect);
165	229	MODULE_SCOPE OSStatus TkMacOSHIShapeUnionWithRect(HIMutableShapeRef inShape,

180	244	int enable);
181	245	MODULE_SCOPE int TkMacOSXInitCGDrawing(Tcl_Interp *interp, int enable,
182	246	int antiAlias);
183		MODULE_SCOPE int TkMacOSXGenerateFocusEvent(TkWindow *winPtr,
184		int activeFlag);
185		MODULE_SCOPE WindowClass TkMacOSXWindowClass(TkWindow *winPtr);
186	247	MODULE_SCOPE int TkMacOSXIsWindowZoomed(TkWindow *winPtr);
187	248	MODULE_SCOPE int TkGenerateButtonEventForXPointer(Window window);
188		MODULE_SCOPE EventModifiers TkMacOSXModifierState(void);
189		MODULE_SCOPE NSBitmapImageRep* TkMacOSXBitmapRepFromDrawableRect(Drawable drawable,
190		int x, int y, unsigned int width, unsigned int height);
191		MODULE_SCOPE CGImageRef TkMacOSXCreateCGImageWithXImage(XImage *image);
192	249	MODULE_SCOPE void TkMacOSXDrawCGImage(Drawable d, GC gc, CGContextRef context,
193	250	CGImageRef image, unsigned long imageForeground,
194	251	unsigned long imageBackground, CGRect imageBounds,
195	252	CGRect srcBounds, CGRect dstBounds);
196	253	MODULE_SCOPE int TkMacOSXSetupDrawingContext(Drawable d, GC gc,
197		int useCG, TkMacOSXDrawingContext *dcPtr);
	254	TkMacOSXDrawingContext *dcPtr);
198	255	MODULE_SCOPE void TkMacOSXRestoreDrawingContext(
199	256	TkMacOSXDrawingContext *dcPtr);
200	257	MODULE_SCOPE void TkMacOSXSetColorInContext(GC gc, unsigned long pixel,
201	258	CGContextRef context);
202		MODULE_SCOPE int TkMacOSXMakeFullscreen(TkWindow *winPtr,
203		NSWindow *window, int fullscreen,
204		Tcl_Interp *interp);
205		MODULE_SCOPE void TkMacOSXEnterExitFullscreen(TkWindow *winPtr,
206		int active);
207		MODULE_SCOPE NSWindow* TkMacOSXDrawableWindow(Drawable drawable);
208		MODULE_SCOPE NSView* TkMacOSXDrawableView(MacDrawable *macWin);
	259	#define TkMacOSXGetTkWindow(window) (TkWindow *)Tk_MacOSXGetTkWindow(window)
	260	#define TkMacOSXGetNSWindowForDrawable(drawable) ((NSWindow*)TkMacOSXDrawable(drawable))
	261	#define TkMacOSXGetNSViewForDrawable(macWin) (NSView *)Tk_MacOSXGetNSViewForDrawable((Drawable)(macWin))
209	262	MODULE_SCOPE void TkMacOSXWinCGBounds(TkWindow winPtr, CGRect bounds);
210	263	MODULE_SCOPE HIShapeRef TkMacOSXGetClipRgn(Drawable drawable);
211	264	MODULE_SCOPE void TkMacOSXInvalidateViewRegion(NSView *view,
212	265	HIShapeRef rgn);
213	266	MODULE_SCOPE CGContextRef TkMacOSXGetCGContextForDrawable(Drawable drawable);
214		MODULE_SCOPE CGImageRef TkMacOSXCreateCGImageWithDrawable(Drawable drawable);
215		MODULE_SCOPE NSImage* TkMacOSXGetNSImageWithTkImage(Display *display,
	267	MODULE_SCOPE NSImage* TkMacOSXGetNSImageFromTkImage(Display *display,
216	268	Tk_Image image, int width, int height);
217		MODULE_SCOPE NSImage* TkMacOSXGetNSImageWithBitmap(Display *display,
	269	MODULE_SCOPE NSImage* TkMacOSXGetNSImageFromBitmap(Display *display,
218	270	Pixmap bitmap, GC gc, int width, int height);
219		MODULE_SCOPE CGColorRef TkMacOSXCreateCGColor(GC gc, unsigned long pixel);
220	271	MODULE_SCOPE NSColor* TkMacOSXGetNSColor(GC gc, unsigned long pixel);
221		MODULE_SCOPE Tcl_Obj * TkMacOSXGetStringObjFromCFString(CFStringRef str);
222		MODULE_SCOPE TkWindow* TkMacOSXGetTkWindow(NSWindow *w);
223	272	MODULE_SCOPE NSFont* TkMacOSXNSFontForFont(Tk_Font tkfont);
224	273	MODULE_SCOPE NSDictionary* TkMacOSXNSFontAttributesForFont(Tk_Font tkfont);
225	274	MODULE_SCOPE NSModalSession TkMacOSXGetModalSession(void);

236	285	int inset, int thickness);
237	286	MODULE_SCOPE int TkMacOSXServices_Init(Tcl_Interp *interp);
238	287	MODULE_SCOPE int TkMacOSXRegisterServiceWidgetObjCmd(ClientData clientData,
239		Tcl_Interp *interp, int objc,
240		Tcl_Obj *const objv[]);
241		MODULE_SCOPE NSString* TclUniToNSString(const char *source, int numBytes);
242		MODULE_SCOPE int TclUniAtIndex(NSString string, int index, char uni,
243		unsigned int *code);
244		MODULE_SCOPE char* NSStringToTclUni(NSString string, int numBytes);
	288	Tcl_Interp interp, int objc, Tcl_Obj const objv[]);
	289	MODULE_SCOPE unsigned TkMacOSXAddVirtual(unsigned int keycode);
	290	MODULE_SCOPE void TkMacOSXWinNSBounds(TkWindow winPtr, NSView view,
	291	NSRect *bounds);
	292	MODULE_SCOPE Bool TkMacOSXInDarkMode(Tk_Window tkwin);
	293	MODULE_SCOPE void TkMacOSXDrawAllViews(ClientData clientData);
	294	MODULE_SCOPE unsigned long TkMacOSXClearPixel(void);
245	295
246	296	#pragma mark Private Objective-C Classes
247	297

272	322	NSArray _defaultApplicationMenuItems, _defaultWindowsMenuItems;
273	323	NSArray _defaultHelpMenuItems, _defaultFileMenuItems;
274	324	NSAutoreleasePool *_mainPool;
	325	NSThread *_backgoundLoop;
	326
275	327	#ifdef __i386__
276	328	/* The Objective C runtime used on i386 requires this. */
277	329	int _poolLock;
278		int _macMinorVersion;
	330	int _macOSVersion; /* 10000 * major + 100minor /
279	331	Bool _isDrawing;
280		#endif
	332	Bool _needsToDraw;
	333	#endif
	334
281	335	}
282	336	@property int poolLock;
283		@property int macMinorVersion;
	337	@property int macOSVersion;
284	338	@property Bool isDrawing;
	339	@property Bool needsToDraw;
285	340
286	341	@end
287	342	@interface TKApplication(TKInit)

307	362	@interface NSApplication(TKNotify)
308	363	/* We need to declare this hidden method. */
309	364	- (void) _modalSession: (NSModalSession) session sendEvent: (NSEvent *) event;
	365	- (void) _runBackgroundLoop;
310	366	@end
311	367	@interface TKApplication(TKEvent)
312	368	- (NSEvent )tkProcessEvent:(NSEvent )theEvent;

323	379	@end
324	380	@interface TKApplication(TKHLEvents)
325	381	- (void) terminate: (id) sender;
	382	- (void) superTerminate: (id) sender;
326	383	- (void) preferences: (id) sender;
327	384	- (void) handleQuitApplicationEvent: (NSAppleEventDescriptor *)event
328	385	withReplyEvent: (NSAppleEventDescriptor *)replyEvent;

352	409	{
353	410	@private
354	411	NSString *privateWorkingText;
355		Bool _needsRedisplay;
356		}
357		@property Bool needsRedisplay;
	412	Bool _tkNeedsDisplay;
	413	NSRect _tkDirtyRect;
	414	}
	415	@property Bool tkNeedsDisplay;
	416	@property NSRect tkDirtyRect;
358	417	@end
359	418
360	419	@interface TKContentView(TKKeyEvent)
361	420	- (void) deleteWorkingText;
	421	- (void) cancelComposingText;
362	422	@end
363	423
364	424	@interface TKContentView(TKWindowEvent)
365		- (void) generateExposeEvents: (HIShapeRef) shape;
	425	- (void) addTkDirtyRect: (NSRect) rect;
	426	- (void) clearTkDirtyRect;
	427	- (void) generateExposeEvents: (NSRect) rect;
366	428	- (void) tkToolbarButton: (id) sender;
367	429	@end
368	430

373	435
374	436	VISIBILITY_HIDDEN
375	437	@interface TKWindow : NSWindow
	438	{
	439	#ifdef __i386__
	440	/* The Objective C runtime used on i386 requires this. */
	441	Bool _mouseInResizeArea;
	442	Window _tkWindow;
	443	#endif
	444	}
	445	@property Bool mouseInResizeArea;
	446	@property Window tkWindow;
376	447	@end
377	448
378	449	@interface TKWindow(TKWm)
379	450	- (void) tkLayoutChanged;
380	451	@end
381	452
382		@interface NSDrawerWindow : NSWindow
	453	@interface TKDrawerWindow : NSWindow
383	454	{
384	455	id _i1, _i2;
385		}
	456	#ifdef __i386__
	457	/* The Objective C runtime used on i386 requires this. */
	458	Window _tkWindow;
	459	#endif
	460	}
	461	@property Window tkWindow;
	462	@end
	463
	464	@interface TKPanel : NSPanel
	465	{
	466	#ifdef __i386__
	467	/* The Objective C runtime used on i386 requires this. */
	468	Window _tkWindow;
	469	#endif
	470	}
	471	@property Window tkWindow;
386	472	@end
387	473
388	474	#pragma mark NSMenu & NSMenuItem Utilities

432	518	- (void) setAppleMenu: (NSMenu *) menu;
433	519	@end
434	520
	521	/*
	522	* These methods are exposed because they are needed to prevent zombie windows
	523	* on systems with a TouchBar. The TouchBar Key-Value observer holds a
	524	* reference to the key window, which prevents deallocation of the key window
	525	* when it is closed.
	526	*/
	527
	528	@interface NSApplication(TkWm)
	529	- (id) _setKeyWindow: (NSWindow *) window;
	530	- (id) _setMainWindow: (NSWindow *) window;
	531	@end
	532
	533
	534	/*
	535	*---------------------------------------------------------------------------
	536	*
	537	* TKNSString --
	538	*
	539	* When Tcl is compiled with TCL_UTF_MAX = 3 (the default for 8.6) it cannot
	540	* deal directly with UTF-8 encoded non-BMP characters, since their UTF-8
	541	* encoding requires 4 bytes. Instead, when using these versions of Tcl, Tk
	542	* uses the CESU-8 encoding internally. This encoding is similar to UTF-8
	543	* except that it allows encoding surrogate characters as 3-byte sequences
	544	* using the same algorithm which UTF-8 uses for non-surrogates. This means
	545	* that a non-BMP character is encoded as a string of length 6. Apple's
	546	* NSString class does not provide a constructor which accepts a CESU-8 encoded
	547	* byte sequence as initial data. So we add a new class which does provide
	548	* such a constructor. It also has a DString property which is a DString whose
	549	* string pointer is a byte sequence encoding the NSString with the current Tk
	550	* encoding, namely UTF-8 if TCL_UTF_MAX >= 4 or CESU-8 if TCL_UTF_MAX = 3.
	551	*
	552	*---------------------------------------------------------------------------
	553	*/
	554
	555	@interface TKNSString:NSString {
	556	@private
	557	Tcl_DString _ds;
	558	NSString *_string;
	559	const char *_UTF8String;
	560	}
	561	@property const char *UTF8String;
	562	@property (readonly) Tcl_DString DString;
	563	- (instancetype)initWithTclUtfBytes:(const void *)bytes
	564	length:(NSUInteger)len;
	565	@end
	566
435	567	#endif /* _TKMACPRIV */
436
437		int TkMacOSXGetAppPath(ClientData cd, Tcl_Interp ip, int objc, Tcl_Obj const objv[]);
438
	568
439	569	/*
440	570	* Local Variables:
441	571	* mode: objc

+38

-37

macosx/tkMacOSXRegion.c less more

11	11	*/
12	12
13	13	#include "tkMacOSXPrivate.h"
	14	static void RetainRegion(TkRegion r);
	15	static void ReleaseRegion(TkRegion r);
	16
	17	#ifdef DEBUG
	18	static int totalRegions = 0;
	19	static int totalRegionRetainCount = 0;
	20	#define DebugLog(msg, ...) fprintf(stderr, (msg), ##__VA_ARGS__)
	21	#else
	22	#define DebugLog(msg, ...)
	23	#endif
14	24
15	25
16	26	/*

33	43	TkRegion
34	44	TkCreateRegion(void)
35	45	{
36		return (TkRegion) HIShapeCreateMutable();
	46	TkRegion region = (TkRegion) HIShapeCreateMutable();
	47	DebugLog("Created region: total regions = %d\n", ++totalRegions);
	48	RetainRegion(region);
	49	return region;
37	50	}
38	51
39	52	/*

58	71	TkRegion r)
59	72	{
60	73	if (r) {
61		CFRelease(r);
	74	DebugLog("Destroyed region: total regions = %d\n", --totalRegions);
	75	ReleaseRegion(r);
62	76	}
63	77	return Success;
64	78	}

174	188	*----------------------------------------------------------------------
175	189	*/
176	190
177		int
	191	static int
178	192	TkMacOSXIsEmptyRegion(
179	193	TkRegion r)
180	194	{

319	333	/*
320	334	*----------------------------------------------------------------------
321	335	*
322		* TkpRetainRegion --
	336	* RetainRegion --
323	337	*
324	338	* Increases reference count of region.
325	339	*

332	346	*----------------------------------------------------------------------
333	347	*/
334	348
335		void
336		TkpRetainRegion(
	349	static void
	350	RetainRegion(
337	351	TkRegion r)
338	352	{
339	353	CFRetain(r);
340		}
341
342		/*
343		*----------------------------------------------------------------------
344		*
345		* TkpReleaseRegion --
	354	DebugLog("Retained region: total count is %d\n", ++totalRegionRetainCount);
	355	}
	356
	357	/*
	358	*----------------------------------------------------------------------
	359	*
	360	* ReleaseRegion --
346	361	*
347	362	* Decreases reference count of region.
348	363	*

355	370	*----------------------------------------------------------------------
356	371	*/
357	372
358		void
359		TkpReleaseRegion(
	373	static void
	374	ReleaseRegion(
360	375	TkRegion r)
361	376	{
362	377	CFRelease(r);
	378	DebugLog("Released region: total count is %d\n", --totalRegionRetainCount);
363	379	}
364	380
365	381	/*

435	451	/*
436	452	*----------------------------------------------------------------------
437	453	*
438		* TkMacOSXOffsetRegion --
	454	* XOffsetRegion --
439	455	*
440	456	* Offsets region by given distances.
441	457	*

448	464	*----------------------------------------------------------------------
449	465	*/
450	466
451		void
452		TkMacOSXOffsetRegion(
453		TkRegion r,
454		short dx,
455		short dy)
	467	int
	468	XOffsetRegion(
	469	void *r,
	470	int dx,
	471	int dy)
456	472	{
457	473	ChkErr(HIShapeOffset, (HIMutableShapeRef) r, dx, dy);
	474	return Success;
458	475	}
459	476
460	477	/*
461	478	*----------------------------------------------------------------------
462	479	*
463	480	* TkMacOSXHIShapeCreateEmpty, TkMacOSXHIShapeCreateMutableWithRect,
464		* TkMacOSXHIShapeSetWithShape, TkMacOSXHIShapeSetWithRect,
	481	* TkMacOSXHIShapeSetWithShape,
465	482	* TkMacOSHIShapeDifferenceWithRect, TkMacOSHIShapeUnionWithRect,
466	483	* TkMacOSHIShapeUnion --
467	484	*

499	516	result = HIShapeSetWithShape(inDestShape, inSrcShape);
500	517	return result;
501	518	}
502
503		#if 0
504		OSStatus
505		TkMacOSXHIShapeSetWithRect(
506		HIMutableShapeRef inShape,
507		const CGRect *inRect)
508		{
509		OSStatus result;
510		HIShapeRef rgn = HIShapeCreateWithRect(inRect);
511
512		result = TkMacOSXHIShapeSetWithShape(inShape, rgn);
513		CFRelease(rgn);
514
515		return result;
516		}
517		#endif
518	519
519	520	OSStatus
520	521	TkMacOSHIShapeDifferenceWithRect(

+4

-37

macosx/tkMacOSXScale.c less more

75	75	TkpCreateScale(
76	76	Tk_Window tkwin)
77	77	{
78		MacScale *macScalePtr = ckalloc(sizeof(MacScale));
	78	MacScale macScalePtr = (MacScale )ckalloc(sizeof(MacScale));
79	79
80	80	macScalePtr->scaleHandle = NULL;
81	81	if (scaleActionProc == NULL) {

148	148	MacScale *macScalePtr = clientData;
149	149	Rect r;
150	150	WindowRef windowRef;
151		CGrafPtr destPort, savePort;
152		Boolean portChanged;
153	151	MacDrawable *macDraw;
154	152	SInt32 initialValue, minValue, maxValue;
155	153	UInt16 numTicks;

178	176	Tcl_DStringAppend(&buf, scalePtr->command, -1);
179	177	Tcl_DStringAppend(&buf, " ", -1);
180	178	Tcl_DStringAppend(&buf, string, -1);
181		result = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), -1, 0);
	179	result = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), -1, TCL_EVAL_GLOBAL);
182	180	Tcl_DStringFree(&buf);
183	181	if (result != TCL_OK) {
184	182	Tcl_AddErrorInfo(interp, "\n (command executed by scale)");

214	212	* Set up port for drawing Macintosh control.
215	213	*/
216	214
217		macDraw = (MacDrawable *) Tk_WindowId(tkwin);
218		destPort = TkMacOSXGetDrawablePort(Tk_WindowId(tkwin));
219		windowRef = TkMacOSXDrawableWindow(Tk_WindowId(tkwin));
220		portChanged = QDSwapPort(destPort, &savePort);
221		TkMacOSXSetUpClippingRgn(Tk_WindowId(tkwin));
	215	macDraw = (MacDrawable *)Tk_WindowId(tkwin);
	216	windowRef = TkMacOSXGetNSWindowForDrawable(Tk_WindowId(tkwin));
222	217
223	218	/*
224	219	* Create Macintosh control.

291	286	SetControlVisibility(macScalePtr->scaleHandle, true, true);
292	287	HiliteControl(macScalePtr->scaleHandle, 0);
293	288	Draw1Control(macScalePtr->scaleHandle);
294
295		if (portChanged) {
296		QDSwapPort(savePort, NULL);
297		}
298	289	done:
299	290	scalePtr->flags &= ~REDRAW_ALL;
300	291	}

326	317	ControlPartCode part;
327	318	Point where;
328	319	Rect bounds;
329		CGrafPtr destPort, savePort;
330		Boolean portChanged;
331	320
332	321	#ifdef TK_MAC_DEBUG_SCALE
333	322	TkMacOSXDbgMsg("TkpScaleElement");
334	323	#endif
335		destPort = TkMacOSXGetDrawablePort(Tk_WindowId(scalePtr->tkwin));
336		portChanged = QDSwapPort(destPort, &savePort);
337	324
338	325	/*
339	326	* All of the calculations in this procedure mirror those in

344	331	where.h = x + bounds.left;
345	332	where.v = y + bounds.top;
346	333	part = TestControl(macScalePtr->scaleHandle, where);
347
348		if (portChanged) {
349		QDSwapPort(savePort, NULL);
350		}
351	334
352	335	#ifdef TK_MAC_DEBUG_SCALE
353	336	fprintf (stderr,"ScalePart %d, pos ( %d %d )\n", part, where.h, where.v );

400	383	Point where;
401	384	Rect bounds;
402	385	int part;
403		CGrafPtr destPort, savePort;
404		Boolean portChanged;
405	386
406	387	#ifdef TK_MAC_DEBUG_SCALE
407	388	fprintf(stderr,"MacScaleEventProc\n" );
408	389	#endif
409
410		/*
411		* To call Macintosh control routines we must have the port set to the
412		* window containing the control. We will then test which part of the
413		* control was hit and act accordingly.
414		*/
415
416		destPort = TkMacOSXGetDrawablePort(Tk_WindowId(macScalePtr->info.tkwin));
417		portChanged = QDSwapPort(destPort, &savePort);
418		TkMacOSXSetUpClippingRgn(Tk_WindowId(macScalePtr->info.tkwin));
419	390
420	391	TkMacOSXWinBounds((TkWindow *) macScalePtr->info.tkwin, &bounds);
421	392	where.h = eventPtr->xbutton.x + bounds.left;

446	417	*/
447	418
448	419	TkGenerateButtonEventForXPointer(Tk_WindowId(macScalePtr->info.tkwin));
449
450		if (portChanged) {
451		QDSwapPort(savePort, NULL);
452		}
453	420	}
454	421
455	422	/*

+16

-16

macosx/tkMacOSXScrlbr.c less more

120	120	TkpCreateScrollbar(
121	121	Tk_Window tkwin)
122	122	{
123		MacScrollbar *scrollPtr = ckalloc(sizeof(MacScrollbar));
	123	MacScrollbar scrollPtr = (MacScrollbar )ckalloc(sizeof(MacScrollbar));
124	124
125	125	scrollPtr->troughGC = NULL;
126	126	scrollPtr->copyGC = NULL;

173	173	MacScrollbar *msPtr,
174	174	CGContextRef context)
175	175	{
176		MacDrawable macWin = (MacDrawable ) Tk_WindowId(scrollPtr->tkwin);
177		NSView *view = TkMacOSXDrawableView(macWin);
	176	Drawable d = Tk_WindowId(scrollPtr->tkwin);
	177	NSView *view = TkMacOSXGetNSViewForDrawable(d);
178	178	CGPathRef path;
179	179	CGPoint inner[2], outer[2], thumbOrigin;
180	180	CGSize thumbSize;

245	245	TkpDisplayScrollbar(
246	246	ClientData clientData) /* Information about window. */
247	247	{
248		register TkScrollbar *scrollPtr = clientData;
	248	TkScrollbar *scrollPtr = clientData;
249	249	MacScrollbar msPtr = (MacScrollbar ) scrollPtr;
250		register Tk_Window tkwin = scrollPtr->tkwin;
	250	Tk_Window tkwin = scrollPtr->tkwin;
251	251	TkWindow winPtr = (TkWindow ) tkwin;
252	252	TkMacOSXDrawingContext dc;
253	253

257	257	return;
258	258	}
259	259
260		MacDrawable macWin = (MacDrawable ) winPtr->window;
261		NSView *view = TkMacOSXDrawableView(macWin);
	260	MacDrawable macWin = (MacDrawable )winPtr->window;
	261	NSView *view = TkMacOSXGetNSViewForDrawable(macWin);
262	262
263	263	if ((view == NULL)
264	264	\|\| (macWin->flags & TK_DO_NOT_DRAW)
265		\|\| !TkMacOSXSetupDrawingContext((Drawable) macWin, NULL, 1, &dc)) {
	265	\|\| !TkMacOSXSetupDrawingContext((Drawable)macWin, NULL, &dc)) {
266	266	return;
267	267	}
268	268

315	315	if (SNOW_LEOPARD_STYLE) {
316	316	HIThemeDrawTrack(&msPtr->info, 0, dc.context,
317	317	kHIThemeOrientationInverted);
318		} else if ([NSApp macMinorVersion] <= 8) {
	318	} else if ([NSApp macOSVersion] <= 100800) {
319	319	HIThemeDrawTrack(&msPtr->info, 0, dc.context,
320	320	kHIThemeOrientationNormal);
321	321	} else {

353	353
354	354	extern void
355	355	TkpComputeScrollbarGeometry(
356		register TkScrollbar *scrollPtr)
	356	TkScrollbar *scrollPtr)
357	357	/* Scrollbar whose geometry may have
358	358	* changed. */
359	359	{

376	376	scrollPtr->highlightWidth = 0;
377	377	}
378	378	scrollPtr->inset = scrollPtr->highlightWidth + scrollPtr->borderWidth;
379		if ([NSApp macMinorVersion] == 6) {
	379	if ([NSApp macOSVersion] == 100600) {
380	380	scrollPtr->arrowLength = scrollPtr->width;
381	381	} else {
382	382	scrollPtr->arrowLength = 0;

483	483
484	484	void
485	485	TkpConfigureScrollbar(
486		register TkScrollbar *scrollPtr)
	486	TkScrollbar *scrollPtr)
487	487	{
488	488	/* empty */
489	489	}

508	508
509	509	int
510	510	TkpScrollbarPosition(
511		register TkScrollbar *scrollPtr,
	511	TkScrollbar *scrollPtr,
512	512	/* Scrollbar widget record. */
513	513	int x, int y) /* Coordinates within scrollPtr's window. */
514	514	{

518	518	*/
519	519
520	520	int length, width, tmp;
521		register const int inset = scrollPtr->inset;
	521	const int inset = scrollPtr->inset;
522	522
523	523	if (scrollPtr->vertical) {
524	524	length = Tk_Height(scrollPtr->tkwin);

588	588	{
589	589	MacScrollbar msPtr = (MacScrollbar ) scrollPtr;
590	590	Tk_Window tkwin = scrollPtr->tkwin;
591		MacDrawable macWin = (MacDrawable ) Tk_WindowId(scrollPtr->tkwin);
	591	MacDrawable macWin = (MacDrawable )Tk_WindowId(scrollPtr->tkwin);
592	592	double dViewSize;
593	593	HIRect contrlRect;
594	594	short width, height;
595	595
596		NSView *view = TkMacOSXDrawableView(macWin);
	596	NSView *view = TkMacOSXGetNSViewForDrawable(macWin);
597	597	CGFloat viewHeight = [view bounds].size.height;
598	598	NSRect frame;
599	599

+1

-1

macosx/tkMacOSXSend.c less more

2	2	*
3	3	* This file provides procedures that implement the "send" command,
4	4	* allowing commands to be passed from interpreter to interpreter. This
5		* current implementation for the Mac has most functionality stubed out.
	5	* current implementation for the Mac has most functionality stubbed out.
6	6	*
7	7	* The current plan, which we have not had time to implement, is for the
8	8	* first Wish app to create a gestalt of type 'WIsH'. This gestalt will

+9

-6

macosx/tkMacOSXServices.c less more

19	19
20	20	static int
21	21	ServicesEventProc(
22		Tcl_Event *event,
23		int flags)
	22	TCL_UNUSED(Tcl_Event *),
	23	TCL_UNUSED(int))
24	24	{
25	25	TkMainInfo *info = TkGetMainInfoList();
	26
26	27	Tcl_GlobalEval(info->interp, "::tk::mac::PerformService");
27	28	return 1;
28	29	}

42	43	- (void) provideService:(NSPasteboard *)pboard
43	44	userData:(NSString *)data
44	45	error:(NSString **)error;
45		- (BOOL)writeSelectionToPasteboard:(NSPasteboard *)pboard
46		types:(NSArray *)types;
	46	- (BOOL) writeSelectionToPasteboard:(NSPasteboard *)pboard
	47	types:(NSArray *)types;
47	48
48	49	@end
49	50

103	104	NSString pboardString = nil, pboardType = nil;
104	105	NSArray *types = [pboard types];
105	106	Tcl_Event *event;
	107	(void)data;
	108	(void)error;
106	109
107	110	/*
108	111	* Get a string from the private pasteboard and copy it to the general

122	125	[generalpasteboard declareTypes:[NSArray arrayWithObjects:pboardType, nil]
123	126	owner:nil];
124	127	[generalpasteboard setString:pboardString forType:pboardType];
125		event = ckalloc(sizeof(Tcl_Event));
	128	event = (Tcl_Event *)ckalloc(sizeof(Tcl_Event));
126	129	event->proc = ServicesEventProc;
127	130	Tcl_QueueEvent((Tcl_Event *)event, TCL_QUEUE_TAIL);
128	131	}

136	139
137	140	int
138	141	TkMacOSXServices_Init(
139		Tcl_Interp *interp)
	142	TCL_UNUSED(Tcl_Interp *))
140	143	{
141	144	/*
142	145	* Initialize an instance of TkService and register it with the NSApp.

+204

-206

macosx/tkMacOSXSubwindows.c less more

13	13	#include "tkMacOSXPrivate.h"
14	14	#include "tkMacOSXDebug.h"
15	15	#include "tkMacOSXWm.h"
	16	#include "tkMacOSXConstants.h"
16	17
17	18	/*
18	19	#ifdef TK_MAC_DEBUG

37	38	*
38	39	* XDestroyWindow --
39	40	*
40		* Dealocates the given X Window.
	41	* Deallocates the given X Window.
41	42	*
42	43	* Results:
43	44	* The window id is returned.

50	51
51	52	int
52	53	XDestroyWindow(
53		Display display, / Display. */
	54	TCL_UNUSED(Display ), / Display. */
54	55	Window window) /* Window. */
55	56	{
56		MacDrawable macWin = (MacDrawable ) window;
	57	MacDrawable macWin = (MacDrawable )window;
57	58
58	59	/*
59	60	* Remove any dangling pointers that may exist if the window we are

67	68	if (!Tk_IsTopLevel(macWin->winPtr)) {
68	69	TkMacOSXInvalidateWindow(macWin, TK_PARENT_WINDOW);
69	70	if (macWin->winPtr->parentPtr != NULL) {
70		TkMacOSXInvalClipRgns((Tk_Window) macWin->winPtr->parentPtr);
	71	TkMacOSXInvalClipRgns((Tk_Window)macWin->winPtr->parentPtr);
71	72	}
72	73	if (macWin->visRgn) {
73	74	CFRelease(macWin->visRgn);

118	119	*
119	120	* XMapWindow --
120	121	*
121		* Map the given X Window to the screen. See X window documentation for
122		* more details.
123		*
124		* Results:
125		* None.
126		*
127		* Side effects:
128		* The subwindow or toplevel may appear on the screen.
	122	* This X11 stub maps the given X11 Window but does not update any of
	123	* the Tk structures describing the window. Tk applications should
	124	* never call this directly, but it is called by Tk_MapWindow and
	125	* Tk_WmMapWindow.
	126	*
	127	* Results:
	128	* Returns Success or BadWindow.
	129	*
	130	* Side effects:
	131	* The subwindow or toplevel may appear on the screen. VisibilityNotify
	132	* events are generated.
	133	*
129	134	*
130	135	*----------------------------------------------------------------------
131	136	*/

135	140	Display display, / Display. */
136	141	Window window) /* Window. */
137	142	{
138		MacDrawable macWin = (MacDrawable ) window;
	143	if (!window) {
	144	return BadWindow;
	145	}
	146	MacDrawable macWin = (MacDrawable )window;
139	147	TkWindow *winPtr = macWin->winPtr;
140		NSWindow *win = TkMacOSXDrawableWindow(window);
141		XEvent event;
	148	NSWindow *win = TkMacOSXGetNSWindowForDrawable(window);
	149	static Bool initialized = NO;
142	150
143	151	/*
144	152	* Under certain situations it's possible for this function to be called

153	161	}
154	162
155	163	display->request++;
156		winPtr->flags \|= TK_MAPPED;
157	164	if (Tk_IsTopLevel(winPtr)) {
158	165	if (!Tk_IsEmbedded(winPtr)) {
	166	TKContentView *view = [win contentView];
159	167
160	168	/*
161	169	* We want to activate Tk when a toplevel is mapped but we must not

167	175
168	176	TkMacOSXApplyWindowAttributes(winPtr, win);
169	177	[win setExcludedFromWindowsMenu:NO];
170		[NSApp activateIgnoringOtherApps:NO];
171		[[win contentView] setNeedsDisplay:YES];
172		if ([win canBecomeKeyWindow]) {
173		[win makeKeyAndOrderFront:NSApp];
174		} else {
175		[win orderFrontRegardless];
	178	[NSApp activateIgnoringOtherApps:initialized];
	179	[view addTkDirtyRect: [view bounds]];
	180	if (initialized) {
	181	if ([win canBecomeKeyWindow]) {
	182	[win makeKeyAndOrderFront:NSApp];
	183	} else {
	184	[win orderFrontRegardless];
	185	}
176	186	}
177	187	} else {
178	188	TkWindow *contWinPtr = TkpGetOtherWindow(winPtr);

182	192	* the window.
183	193	*/
184	194
185		TkMacOSXInvalClipRgns((Tk_Window) contWinPtr);
	195	TkMacOSXInvalClipRgns((Tk_Window)contWinPtr);
186	196	TkMacOSXInvalidateWindow(macWin, TK_PARENT_WINDOW);
187	197	}
188
189		TkMacOSXInvalClipRgns((Tk_Window) winPtr);
190
191		/*
192		* We only need to send the MapNotify event for toplevel windows.
193		*/
194
195		event.xany.serial = LastKnownRequestProcessed(display);
196		event.xany.send_event = False;
197		event.xany.display = display;
198
199		event.xmap.window = window;
200		event.xmap.type = MapNotify;
201		event.xmap.event = window;
202		event.xmap.override_redirect = winPtr->atts.override_redirect;
203		Tk_QueueWindowEvent(&event, TCL_QUEUE_TAIL);
	198	TkMacOSXInvalClipRgns((Tk_Window)winPtr);
204	199	} else {
205	200
206	201	/*

208	203	* and redisplay the window.
209	204	*/
210	205
211		TkMacOSXInvalClipRgns((Tk_Window) winPtr->parentPtr);
212		}
213
214		if ([NSApp isDrawing]) {
215		[[win contentView] setNeedsRedisplay:YES];
216		} else {
217		[[win contentView] setNeedsDisplay:YES];
	206	TkMacOSXInvalClipRgns((Tk_Window)winPtr->parentPtr);
	207	}
	208
	209	/*
	210	* Mark the toplevel as needing to be redrawn, unless the window is being
	211	* mapped while drawing is taking place.
	212	*/
	213
	214	TKContentView *view = [win contentView];
	215	if (view != [NSView focusView]) {
	216	[view addTkDirtyRect:[view bounds]];
218	217	}
219	218
220	219	/*
221	220	* Generate VisibilityNotify events for window and all mapped children.
222	221	*/
223	222
224		event.xany.send_event = False;
225		event.xany.display = display;
226		event.xvisibility.type = VisibilityNotify;
227		event.xvisibility.state = VisibilityUnobscured;
228		NotifyVisibility(winPtr, &event);
	223	if (initialized) {
	224	XEvent event;
	225	event.xany.send_event = False;
	226	event.xany.display = display;
	227	event.xvisibility.type = VisibilityNotify;
	228	event.xvisibility.state = VisibilityUnobscured;
	229	NotifyVisibility(winPtr, &event);
	230	} else {
	231	initialized = YES;
	232	}
229	233	return Success;
230	234	}
231	235

268	272	*
269	273	* XUnmapWindow --
270	274	*
271		* Unmap the given X Window to the screen. See X window documentation for
272		* more details.
273		*
274		* Results:
275		* None.
	275	* This X11 stub maps the given X11 Window but does not update any of
	276	* The Tk structures describing the window. Tk applications should
	277	* never call this directly, but it is called by Tk_UnmapWindow and
	278	* Tk_WmUnmapWindow.
	279	*
	280	* Results:
	281	* Always returns Success or BadWindow.
276	282	*
277	283	* Side effects:
278	284	* The subwindow or toplevel may be removed from the screen.

285	291	Display display, / Display. */
286	292	Window window) /* Window. */
287	293	{
288		MacDrawable macWin = (MacDrawable ) window;
	294	MacDrawable macWin = (MacDrawable )window;
289	295	TkWindow *winPtr = macWin->winPtr;
290	296	TkWindow *parentPtr = winPtr->parentPtr;
291		NSWindow *win = TkMacOSXDrawableWindow(window);
292		XEvent event;
293
	297	NSWindow *win = TkMacOSXGetNSWindowForDrawable(window);
	298
	299	if (!window) {
	300	return BadWindow;
	301	}
294	302	display->request++;
295	303	if (Tk_IsTopLevel(winPtr)) {
296	304	if (!Tk_IsEmbedded(winPtr) &&
297	305	winPtr->wmInfoPtr->hints.initial_state!=IconicState) {
298	306	[win orderOut:nil];
299		}
300		TkMacOSXInvalClipRgns((Tk_Window) winPtr);
301
302		/*
303		* We only need to send the UnmapNotify event for toplevel windows.
304		*/
305
306		event.xany.serial = LastKnownRequestProcessed(display);
307		event.xany.send_event = False;
308		event.xany.display = display;
309
310		event.xunmap.type = UnmapNotify;
311		event.xunmap.window = window;
312		event.xunmap.event = window;
313		event.xunmap.from_configure = false;
314		Tk_QueueWindowEvent(&event, TCL_QUEUE_TAIL);
	307	[win setExcludedFromWindowsMenu:YES];
	308	}
	309	TkMacOSXInvalClipRgns((Tk_Window)winPtr);
315	310	} else {
316	311	/*
317	312	* Rebuild the visRgn clip region for the parent so it will be allowed

321	316
322	317	if (parentPtr && parentPtr->privatePtr->visRgn) {
323	318	TkMacOSXInvalidateViewRegion(
324		TkMacOSXDrawableView(parentPtr->privatePtr),
	319	TkMacOSXGetNSViewForDrawable(parentPtr->privatePtr),
325	320	parentPtr->privatePtr->visRgn);
326	321	}
327		TkMacOSXInvalClipRgns((Tk_Window) parentPtr);
	322	TkMacOSXInvalClipRgns((Tk_Window)parentPtr);
328	323	TkMacOSXUpdateClipRgn(parentPtr);
329	324	}
330		winPtr->flags &= ~TK_MAPPED;
331		if ([NSApp isDrawing]) {
332		[[win contentView] setNeedsRedisplay:YES];
333		} else {
334		[[win contentView] setNeedsDisplay:YES];
	325	TKContentView *view = [win contentView];
	326	if (view != [NSView focusView]) {
	327	[view addTkDirtyRect:[view bounds]];
335	328	}
336	329	return Success;
337	330	}

360	353	unsigned int width,
361	354	unsigned int height)
362	355	{
363		MacDrawable macWin = (MacDrawable ) window;
	356	MacDrawable macWin = (MacDrawable )window;
364	357
365	358	display->request++;
366	359	if (Tk_IsTopLevel(macWin->winPtr) && !Tk_IsEmbedded(macWin->winPtr)) {
367		NSWindow *w = macWin->winPtr->wmInfoPtr->window;
	360	TKWindow w = (TKWindow )macWin->winPtr->wmInfoPtr->window;
368	361
369	362	if (w) {
370		NSRect r = [w contentRectForFrameRect:[w frame]];
371
372		r.origin.y += r.size.height - height;
373		r.size.width = width;
374		r.size.height = height;
375		[w setFrame:[w frameRectForContentRect:r] display:YES];
	363	if ([w styleMask] & NSFullScreenWindowMask) {
	364	[w tkLayoutChanged];
	365	} else {
	366	NSRect r = [w contentRectForFrameRect:[w frame]];
	367
	368	r.origin.y += r.size.height - height;
	369	r.size.width = width;
	370	r.size.height = height;
	371	[w setFrame:[w frameRectForContentRect:r] display:NO];
	372	}
376	373	}
377	374	} else {
378	375	MoveResizeWindow(macWin);

405	402	unsigned int width,
406	403	unsigned int height)
407	404	{
408		MacDrawable macWin = (MacDrawable ) window;
	405	MacDrawable macWin = (MacDrawable )window;
409	406
410	407	display->request++;
411	408	if (Tk_IsTopLevel(macWin->winPtr) && !Tk_IsEmbedded(macWin->winPtr)) {

428	425	X + XOff, TkMacOSXZeroScreenHeight() - Y - YOff - Height,
429	426	Width, Height);
430	427
431		[w setFrame:[w frameRectForContentRect:r] display:YES];
	428	[w setFrame:[w frameRectForContentRect:r] display:NO];
432	429	}
433	430	} else {
434	431	MoveResizeWindow(macWin);

458	455	Window window, /* Window. */
459	456	int x, int y)
460	457	{
461		MacDrawable macWin = (MacDrawable ) window;
	458	MacDrawable macWin = (MacDrawable )window;
462	459
463	460	display->request++;
464	461	if (Tk_IsTopLevel(macWin->winPtr) && !Tk_IsEmbedded(macWin->winPtr)) {

496	493	{
497	494	int deltaX = 0, deltaY = 0, parentBorderwidth = 0;
498	495	MacDrawable *macParent = NULL;
499		NSWindow *macWindow = TkMacOSXDrawableWindow((Drawable) macWin);
	496	NSWindow *macWindow = TkMacOSXGetNSWindowForDrawable((Drawable)macWin);
500	497
501	498	/*
502	499	* Find the Parent window, for an embedded window it will be its container.

533	530	if (macWindow) {
534	531	TkMacOSXInvalidateWindow(macWin, TK_PARENT_WINDOW);
535	532	if (macParent) {
536		TkMacOSXInvalClipRgns((Tk_Window) macParent->winPtr);
	533	TkMacOSXInvalClipRgns((Tk_Window)macParent->winPtr);
537	534	}
538	535	}
539	536	UpdateOffsets(macWin->winPtr, deltaX, deltaY);

601	598	Display display, / Display. */
602	599	Window window) /* Window. */
603	600	{
604		MacDrawable macWin = (MacDrawable ) window;
	601	MacDrawable macWin = (MacDrawable )window;
605	602
606	603	display->request++;
607	604	if (Tk_IsTopLevel(macWin->winPtr) && !Tk_IsEmbedded(macWin->winPtr)) {

614	611	return Success;
615	612	}
616	613
617		#if 0
618	614	/*
619	615	*----------------------------------------------------------------------
620	616	*

631	627	*----------------------------------------------------------------------
632	628	*/
633	629
634		void
	630	int
635	631	XLowerWindow(
636	632	Display display, / Display. */
637	633	Window window) /* Window. */
638	634	{
639		MacDrawable macWin = (MacDrawable ) window;
	635	MacDrawable macWin = (MacDrawable )window;
640	636
641	637	display->request++;
642	638	if (Tk_IsTopLevel(macWin->winPtr) && !Tk_IsEmbedded(macWin->winPtr)) {
643	639	TkWmRestackToplevel(macWin->winPtr, Below, NULL);
644	640	} else {
645		/*
	641	/*
646	642	* TODO: this should generate damage
647	643	*/
648	644	}
649		}
650		#endif
	645	return Success;
	646	}
651	647
652	648	/*
653	649	*----------------------------------------------------------------------

672	668	Display display, / Display. */
673	669	Window w, /* Window. */
674	670	unsigned int value_mask,
675		XWindowChanges *values)
676		{
677		MacDrawable macWin = (MacDrawable ) w;
	671	TCL_UNUSED(XWindowChanges *))
	672	{
	673	MacDrawable macWin = (MacDrawable )w;
678	674	TkWindow *winPtr = macWin->winPtr;
679	675
680	676	display->request++;

696	692	*/
697	693
698	694	if (value_mask & CWStackMode) {
699		NSView *view = TkMacOSXDrawableView(macWin);
700		Rect bounds;
701		NSRect r;
	695	NSView *view = TkMacOSXGetNSViewForDrawable(macWin);
702	696
703	697	if (view) {
704		TkMacOSXInvalClipRgns((Tk_Window) winPtr->parentPtr);
705		TkMacOSXWinBounds(winPtr, &bounds);
706		r = NSMakeRect(bounds.left,
707		[view bounds].size.height - bounds.bottom,
708		bounds.right - bounds.left, bounds.bottom - bounds.top);
709		[view setNeedsDisplayInRect:r];
	698	TkMacOSXInvalClipRgns((Tk_Window)winPtr->parentPtr);
	699	TkpRedrawWidget((Tk_Window)winPtr);
710	700	}
711	701	}
712	702

825	815
826	816	/*
827	817	* Clip away the area of any windows that may obscure this window.
828		* For a non-toplevel window, first, clip to the parents visible
	818	* For a non-toplevel window, first, clip to the parent's visible
829	819	* clip region. Second, clip away any siblings that are higher in
830	820	* the stacking order. For an embedded toplevel, just clip to the
831	821	* container's visible clip region. Remember, we only allow one

858	848	TkRegion r = TkCreateRegion();
859	849	HIShapeRef visRgn;
860	850
861		tkMacOSXEmbedHandler->getClipProc((Tk_Window) winPtr, r);
	851	tkMacOSXEmbedHandler->getClipProc((Tk_Window)winPtr, r);
862	852	visRgn = TkMacOSXGetNativeRegion(r);
863	853	ChkErr(HIShapeIntersect, visRgn, rgn, rgn);
864	854	CFRelease(visRgn);
865		TkpReleaseRegion(r);
	855	TkDestroyRegion(r);
866	856	}
867	857
868	858	/*

986	976	static OSStatus
987	977	InvalViewRect(
988	978	int msg,
989		HIShapeRef rgn,
	979	TCL_UNUSED(HIShapeRef),
990	980	const CGRect *rect,
991	981	void *ref)
992	982	{
993	983	static CGAffineTransform t;
994		NSView *view = ref;
	984	TKContentView *view = ref;
	985	NSRect dirtyRect;
995	986
996	987	if (!view) {
997	988	return paramErr;

1002	993	NSHeight([view bounds]));
1003	994	break;
1004	995	case kHIShapeEnumerateRect:
1005		[view setNeedsDisplayInRect:NSRectFromCGRect(
1006		CGRectApplyAffineTransform(*rect, t))];
	996	dirtyRect = NSRectFromCGRect(CGRectApplyAffineTransform(*rect, t));
	997	[view addTkDirtyRect:dirtyRect];
1007	998	break;
1008	999	}
1009	1000	return noErr;

1049	1040	if (macWin->flags & TK_CLIP_INVALID) {
1050	1041	TkMacOSXUpdateClipRgn(macWin->winPtr);
1051	1042	}
1052		TkMacOSXInvalidateViewRegion(TkMacOSXDrawableView(macWin),
	1043	TkMacOSXInvalidateViewRegion(TkMacOSXGetNSViewForDrawable(macWin),
1053	1044	(flag == TK_WINDOW_ONLY) ? macWin->visRgn : macWin->aboveVisRgn);
1054	1045	}
1055	1046
1056	1047	/*
1057	1048	*----------------------------------------------------------------------
1058	1049	*
1059		* TkMacOSXDrawableWindow --
	1050	* TkMacOSXGetNSWindowForDrawable --
1060	1051	*
1061	1052	* This function returns the NSWindow for a given X drawable.
1062	1053	*

1069	1060	*----------------------------------------------------------------------
1070	1061	*/
1071	1062
1072		NSWindow *
1073		TkMacOSXDrawableWindow(
	1063	void *
	1064	TkMacOSXDrawable(
1074	1065	Drawable drawable)
1075	1066	{
1076		MacDrawable macWin = (MacDrawable ) drawable;
	1067	MacDrawable macWin = (MacDrawable )drawable;
1077	1068	NSWindow *result = nil;
1078	1069
1079	1070	if (!macWin \|\| macWin->flags & TK_IS_PIXMAP) {

1089	1080	TkWindow *contWinPtr = TkpGetOtherWindow(macWin->toplevel->winPtr);
1090	1081
1091	1082	if (contWinPtr) {
1092		result = TkMacOSXDrawableWindow((Drawable) contWinPtr->privatePtr);
	1083	result = TkMacOSXGetNSWindowForDrawable((Drawable)contWinPtr->privatePtr);
1093	1084	}
1094	1085	}
1095	1086	return result;
1096	1087	}
1097
1098		void *
1099		TkMacOSXDrawable(
1100		Drawable drawable)
1101		{
1102		return TkMacOSXDrawableWindow(drawable);
1103		}
1104	1088
1105	1089	/*
1106	1090	*----------------------------------------------------------------------
1107	1091	*
1108	1092	* TkMacOSXGetDrawablePort --
1109	1093	*
1110		* This function returns the Graphics Port for a given X drawable.
	1094	* This function only exists because it is listed in the stubs table.
	1095	* It is useless.
1111	1096	*
1112	1097	* Results:
1113	1098	* NULL.

1120	1105
1121	1106	void *
1122	1107	TkMacOSXGetDrawablePort(
	1108	TCL_UNUSED(Drawable))
	1109	{
	1110	return NULL;
	1111	}
	1112
	1113	/*
	1114	*----------------------------------------------------------------------
	1115	*
	1116	* TkMacOSXGetNSViewForDrawable/TkMacOSXGetRootControl --
	1117	*
	1118	* The function name TkMacOSXGetRootControl is being preserved only
	1119	* because it exists in a stubs table. Nobody knows what it means to
	1120	* get a "RootControl". The macro TkMacOSXGetNSViewForDrawable calls
	1121	* this function and should always be used rather than directly using
	1122	* the obscure official name of this function.
	1123	*
	1124	* It returns the NSView for a given X drawable in the case that the
	1125	* drawable is a window. If the drawable is a pixmap it returns nil.
	1126	*
	1127	* Results:
	1128	* A NSView* or nil.
	1129	*
	1130	* Side effects:
	1131	* None.
	1132	*
	1133	*----------------------------------------------------------------------
	1134	*/
	1135
	1136	void *
	1137	TkMacOSXGetRootControl(
1123	1138	Drawable drawable)
1124	1139	{
1125		return NULL;
1126		}
1127
1128		/*
1129		*----------------------------------------------------------------------
1130		*
1131		* TkMacOSXDrawableView --
1132		*
1133		* This function returns the NSView for a given X drawable.
1134		*
1135		* Results:
1136		* A NSView* or nil.
1137		*
1138		* Side effects:
1139		* None.
1140		*
1141		*----------------------------------------------------------------------
1142		*/
1143
1144		NSView *
1145		TkMacOSXDrawableView(
1146		MacDrawable *macWin)
1147		{
1148		NSView *result = nil;
	1140	void *result = NULL;
	1141	MacDrawable macWin = (MacDrawable )drawable;
1149	1142
1150	1143	if (!macWin) {
1151		result = nil;
	1144	result = NULL;
1152	1145	} else if (!macWin->toplevel) {
1153	1146	result = macWin->view;
1154	1147	} else if (!(macWin->toplevel->flags & TK_EMBEDDED)) {

1157	1150	TkWindow *contWinPtr = TkpGetOtherWindow(macWin->toplevel->winPtr);
1158	1151
1159	1152	if (contWinPtr) {
1160		result = TkMacOSXDrawableView(contWinPtr->privatePtr);
	1153	result = TkMacOSXGetRootControl((Drawable)contWinPtr->privatePtr);
1161	1154	}
1162	1155	}
1163	1156	return result;
1164		}
1165
1166		/*
1167		*----------------------------------------------------------------------
1168		*
1169		* TkMacOSXGetRootControl --
1170		*
1171		* This function returns the NSView for a given X drawable.
1172		*
1173		* Results:
1174		* A NSView* .
1175		*
1176		* Side effects:
1177		* None.
1178		*
1179		*----------------------------------------------------------------------
1180		*/
1181
1182		void *
1183		TkMacOSXGetRootControl(
1184		Drawable drawable)
1185		{
1186		/*
1187		* will probably need to fix this up for embedding
1188		*/
1189
1190		return TkMacOSXDrawableView((MacDrawable *) drawable);
1191	1157	}
1192	1158
1193	1159	/*

1253	1219	childPtr = winPtr->childList;
1254	1220	while (childPtr) {
1255	1221	if (!Tk_IsTopLevel(childPtr)) {
1256		TkMacOSXInvalClipRgns((Tk_Window) childPtr);
	1222	TkMacOSXInvalClipRgns((Tk_Window)childPtr);
1257	1223	}
1258	1224	childPtr = childPtr->nextPtr;
1259	1225	}

1266	1232	childPtr = TkpGetOtherWindow(winPtr);
1267	1233
1268	1234	if (childPtr) {
1269		TkMacOSXInvalClipRgns((Tk_Window) childPtr);
	1235	TkMacOSXInvalClipRgns((Tk_Window)childPtr);
1270	1236	}
1271	1237
1272	1238	/*

1280	1246	*
1281	1247	* TkMacOSXWinBounds --
1282	1248	*
1283		* Given a Tk window this function determines the windows bounds in
	1249	* Given a Tk window this function determines the window's bounds in
1284	1250	* relation to the Macintosh window's coordinate system. This is also the
1285	1251	* same coordinate system as the Tk toplevel window in which this window
1286	1252	* is contained.

1289	1255	* None.
1290	1256	*
1291	1257	* Side effects:
1292		* None.
	1258	* Fills in a Rect.
1293	1259	*
1294	1260	*----------------------------------------------------------------------
1295	1261	*/

1312	1278	*
1313	1279	* TkMacOSXWinCGBounds --
1314	1280	*
1315		* Given a Tk window this function determines the windows bounds in
1316		* relation to the Macintosh window's coordinate system. This is also the
1317		* same coordinate system as the Tk toplevel window in which this window
1318		* is contained.
1319		*
1320		* Results:
1321		* None.
1322		*
1323		* Side effects:
1324		* None.
	1281	* Given a Tk window this function determines the window's bounds in
	1282	* the coordinate system of the Tk toplevel window in which this window
	1283	* is contained. This fills in a CGRect struct.
	1284	*
	1285	* Results:
	1286	* None.
	1287	*
	1288	* Side effects:
	1289	* Fill in a CGRect.
1325	1290	*
1326	1291	*----------------------------------------------------------------------
1327	1292	*/

1335	1300	bounds->origin.y = winPtr->privatePtr->yOff;
1336	1301	bounds->size.width = winPtr->changes.width;
1337	1302	bounds->size.height = winPtr->changes.height;
	1303	}
	1304	/*
	1305	*----------------------------------------------------------------------
	1306	*
	1307	* TkMacOSXWinNSBounds --
	1308	*
	1309	* Given a Tk window this function determines the window's bounds in
	1310	* the coordinate system of the TKContentView in which this Tk window
	1311	* is contained, which has the origin at the lower left corner. This
	1312	* fills in an NSRect struct and requires the TKContentView as a
	1313	* parameter
	1314	*
	1315	* Results:
	1316	* None.
	1317	*
	1318	* Side effects:
	1319	* Fills in an NSRect.
	1320	*
	1321	*----------------------------------------------------------------------
	1322	*/
	1323
	1324	void
	1325	TkMacOSXWinNSBounds(
	1326	TkWindow *winPtr,
	1327	NSView *view,
	1328	NSRect *bounds)
	1329	{
	1330	bounds->size.width = winPtr->changes.width;
	1331	bounds->size.height = winPtr->changes.height;
	1332	bounds->origin.x = winPtr->privatePtr->xOff;
	1333	bounds->origin.y = ([view bounds].size.height -
	1334	bounds->size.height -
	1335	winPtr->privatePtr->yOff);
1338	1336	}
1339	1337
1340	1338	/*

1416	1414	Pixmap
1417	1415	Tk_GetPixmap(
1418	1416	Display display, / Display for new pixmap (can be null). */
1419		Drawable d, /* Drawable where pixmap will be used (ignored). */
	1417	TCL_UNUSED(Drawable), /* Drawable where pixmap will be used (ignored). */
1420	1418	int width, /* Dimensions of pixmap. */
1421	1419	int height,
1422	1420	int depth) /* Bits per pixel for pixmap. */

1426	1424	if (display != NULL) {
1427	1425	display->request++;
1428	1426	}
1429		macPix = ckalloc(sizeof(MacDrawable));
	1427	macPix = (MacDrawable *)ckalloc(sizeof(MacDrawable));
1430	1428	macPix->winPtr = NULL;
1431	1429	macPix->xOff = 0;
1432	1430	macPix->yOff = 0;

1464	1462	Display display, / Display. */
1465	1463	Pixmap pixmap) /* Pixmap to destroy */
1466	1464	{
1467		MacDrawable macPix = (MacDrawable ) pixmap;
	1465	MacDrawable macPix = (MacDrawable )pixmap;
1468	1466
1469	1467	display->request++;
1470	1468	if (macPix->context) {

+193

-33

macosx/tkMacOSXTest.c less more

13	13
14	14	#include "tkMacOSXPrivate.h"
15	15	#include "tkMacOSXConstants.h"
	16	#include "tkMacOSXWm.h"
	17
16	18
17	19	/*
18	20	* Forward declarations of procedures defined later in this file:

23	25	int objc, Tcl_Obj *const objv[]);
24	26	#endif
25	27	static int PressButtonObjCmd (ClientData dummy, Tcl_Interp *interp,
26		int objc, Tcl_Obj *const objv[]);
	28	int objc, Tcl_Obj const objv);
	29	static int InjectKeyEventObjCmd (ClientData dummy, Tcl_Interp *interp,
	30	int objc, Tcl_Obj const objv);
	31	static int MenuBarHeightObjCmd (ClientData dummy, Tcl_Interp *interp,
	32	int objc, Tcl_Obj const objv);
27	33
28	34
29	35	/*

55	61	Tcl_CreateObjCommand(interp, "debugger", DebuggerObjCmd, NULL, NULL);
56	62	#endif
57	63	Tcl_CreateObjCommand(interp, "pressbutton", PressButtonObjCmd, NULL, NULL);
58
	64	Tcl_CreateObjCommand(interp, "injectkeyevent", InjectKeyEventObjCmd, NULL, NULL);
	65	Tcl_CreateObjCommand(interp, "menubarheight", MenuBarHeightObjCmd, NULL, NULL);
59	66	return TCL_OK;
60	67	}
61	68

92	99	/*
93	100	*----------------------------------------------------------------------
94	101	*
	102	* MenuBarHeightObjCmd --
	103	*
	104	* This procedure calls [NSMenu menuBarHeight] and returns the result
	105	* as an integer. Windows can never be placed to overlap the MenuBar,
	106	* so tests need to be aware of its size.
	107	*
	108	* Results:
	109	* A standard Tcl result.
	110	*
	111	* Side effects:
	112	* None.
	113	*
	114	*----------------------------------------------------------------------
	115	*/
	116
	117	static int
	118	MenuBarHeightObjCmd(
	119	TCL_UNUSED(void ), / Not used. */
	120	Tcl_Interp interp, / Not used. */
	121	TCL_UNUSED(int), /* Not used. */
	122	TCL_UNUSED(Tcl_Obj const )) /* Not used. */
	123	{
	124	static int height = 0;
	125	if (height == 0) {
	126	height = (int) [[NSApp mainMenu] menuBarHeight];
	127	}
	128	Tcl_SetObjResult(interp, Tcl_NewIntObj(height));
	129	return TCL_OK;
	130	}
	131
	132	/*
	133	*----------------------------------------------------------------------
	134	*
95	135	* TkTestLogDisplay --
96	136	*
97	137	* The test image display procedure calls this to determine whether it
98		* should write a log message recording that it has being run. On OSX
99		* 10.14 and later, only calls to the display procedure which occur inside
100		* of the drawRect method should be logged, since those are the only ones
101		* which actually draw anything. On earlier systems the opposite is true.
102		* The calls from within the drawRect method are redundant, since the
103		* first time the display procedure is run it will do the drawing and that
104		* first call will usually not occur inside of drawRect.
105		*
106		* Results:
107		* On OSX 10.14 and later, returns true if and only if called from
108		* within [NSView drawRect]. On earlier systems returns false if
109		* and only if called from with [NSView drawRect].
	138	* should write a log message recording that it has being run.
	139	*
	140	* Results:
	141	* Returns true if and only if the NSView of the drawable is the
	142	* current focusView, which on 10.14 and newer systems can only be the
	143	* case when within [NSView drawRect].
110	144	*
111	145	* Side effects:
112	146	* None

114	148	*----------------------------------------------------------------------
115	149	*/
116	150	MODULE_SCOPE Bool
117		TkTestLogDisplay(void) {
118		if ([NSApp macMinorVersion] >= 14) {
119		return [NSApp isDrawing];
	151	TkTestLogDisplay(
	152	Drawable drawable)
	153	{
	154	MacDrawable macWin = (MacDrawable )drawable;
	155	NSWindow *win = nil;
	156	if (macWin->toplevel && macWin->toplevel->winPtr &&
	157	macWin->toplevel->winPtr->wmInfoPtr &&
	158	macWin->toplevel->winPtr->wmInfoPtr->window) {
	159	win = macWin->toplevel->winPtr->wmInfoPtr->window;
	160	} else if (macWin->winPtr && macWin->winPtr->wmInfoPtr &&
	161	macWin->winPtr->wmInfoPtr->window) {
	162	win = macWin->winPtr->wmInfoPtr->window;
	163	}
	164	if (win) {
	165	return ([win contentView] == [NSView focusView]);
120	166	} else {
121		return ![NSApp isDrawing];
	167	return True;
122	168	}
123	169	}
124	170

128	174	* PressButtonObjCmd --
129	175	*
130	176	* This Tcl command simulates a button press at a specific screen
131		* location. It injects NSEvents into the NSApplication event queue,
132		* as opposed to adding events to the Tcl queue as event generate
133		* would do. One application is for testing the grab command.
	177	* location. It injects NSEvents into the NSApplication event queue, as
	178	* opposed to adding events to the Tcl queue as event generate would do.
	179	* One application is for testing the grab command. These events have
	180	* their unused context property set to 1 as a signal indicating that they
	181	* should not be ignored by [NSApp tkProcessMouseEvent].
134	182	*
135	183	* Results:
136	184	* A standard Tcl result.

141	189	*----------------------------------------------------------------------
142	190	*/
143	191
144		/* ARGSUSED */
145	192	static int
146	193	PressButtonObjCmd(
147		ClientData clientData,
	194	TCL_UNUSED(void *),
148	195	Tcl_Interp *interp,
149	196	int objc,
150	197	Tcl_Obj *const objv[])
151	198	{
152		int x, y, i, value, wNum;
	199	int x = 0, y = 0, i, value;
	200	NSInteger signal = -1;
153	201	CGPoint pt;
154	202	NSPoint loc;
155	203	NSEvent motion, press, *release;

183	231	pt.x = loc.x = x;
184	232	pt.y = y;
185	233	loc.y = ScreenHeight - y;
186		wNum = 0;
	234
	235	/*
	236	* We set the window number and the eventNumber to -1 as a signal to
	237	* processMouseEvent.
	238	*/
	239
187	240	CGWarpMouseCursorPosition(pt);
188	241	motion = [NSEvent mouseEventWithType:NSMouseMoved
189	242	location:loc
190	243	modifierFlags:0
191	244	timestamp:GetCurrentEventTime()
192		windowNumber:wNum
	245	windowNumber:signal
193	246	context:nil
194		eventNumber:0
	247	eventNumber:signal
195	248	clickCount:1
196	249	pressure:0.0];
197	250	[NSApp postEvent:motion atStart:NO];

199	252	location:loc
200	253	modifierFlags:0
201	254	timestamp:GetCurrentEventTime()
202		windowNumber:wNum
	255	windowNumber:signal
203	256	context:nil
204		eventNumber:1
	257	eventNumber:signal
205	258	clickCount:1
206	259	pressure:0.0];
207	260	[NSApp postEvent:press atStart:NO];

209	262	location:loc
210	263	modifierFlags:0
211	264	timestamp:GetCurrentEventTime()
212		windowNumber:wNum
	265	windowNumber:signal
213	266	context:nil
214		eventNumber:2
	267	eventNumber:signal
215	268	clickCount:1
216		pressure:0.0];
	269	pressure:-1.0];
217	270	[NSApp postEvent:release atStart:NO];
218	271	return TCL_OK;
219	272	}
220	273
221
	274	static int
	275	InjectKeyEventObjCmd(
	276	TCL_UNUSED(void *),
	277	Tcl_Interp *interp,
	278	int objc,
	279	Tcl_Obj *const objv[])
	280	{
	281	static const char *const optionStrings[] = {
	282	"press", "release", "flagschanged", NULL};
	283	NSUInteger types[3] = {NSKeyDown, NSKeyUp, NSFlagsChanged};
	284	static const char *const argStrings[] = {
	285	"-shift", "-control", "-option", "-command", "-function", "-x", "-y", NULL};
	286	enum args {KEYEVENT_SHIFT, KEYEVENT_CONTROL, KEYEVENT_OPTION, KEYEVENT_COMMAND,
	287	KEYEVENT_FUNCTION, KEYEVENT_X, KEYEVENT_Y};
	288	int i, index, keysym, mods = 0, x = 0, y = 0;
	289	NSString chars = nil, unmod = nil, upper, lower;
	290	NSEvent *keyEvent;
	291	NSUInteger type;
	292	MacKeycode macKC;
	293
	294	if (objc < 3) {
	295	wrongArgs:
	296	Tcl_WrongNumArgs(interp, 1, objv, "option keysym ?arg?");
	297	return TCL_ERROR;
	298	}
	299	if (Tcl_GetIndexFromObj(interp, objv[1], optionStrings, "option", 0,
	300	&index) != TCL_OK) {
	301	return TCL_ERROR;
	302	}
	303	type = types[index];
	304	if (Tcl_GetIntFromObj(interp, objv[2], &keysym) != TCL_OK) {
	305	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
	306	"keysym must be an integer"));
	307	Tcl_SetErrorCode(interp, "TK", "TEST", "INJECT", "KEYSYM", NULL);
	308	return TCL_ERROR;
	309	}
	310	macKC.uint = XKeysymToKeycode(NULL, keysym);
	311	for (i = 3; i < objc; i++) {
	312	if (Tcl_GetIndexFromObjStruct(interp, objv[i], argStrings,
	313	sizeof(char *), "option", TCL_EXACT, &index) != TCL_OK) {
	314	return TCL_ERROR;
	315	}
	316	switch ((enum args) index) {
	317	case KEYEVENT_SHIFT:
	318	mods \|= NSShiftKeyMask;
	319	break;
	320	case KEYEVENT_CONTROL:
	321	mods \|= NSControlKeyMask;
	322	break;
	323	case KEYEVENT_OPTION:
	324	mods \|= NSAlternateKeyMask;
	325	break;
	326	case KEYEVENT_COMMAND:
	327	mods \|= NSCommandKeyMask;
	328	break;
	329	case KEYEVENT_FUNCTION:
	330	mods \|= NSFunctionKeyMask;
	331	break;
	332	case KEYEVENT_X:
	333	if (++i >= objc) {
	334	goto wrongArgs;
	335	}
	336	if (Tcl_GetIntFromObj(interp,objv[i], &x) != TCL_OK) {
	337	return TCL_ERROR;
	338	}
	339	break;
	340	case KEYEVENT_Y:
	341	if (++i >= objc) {
	342	goto wrongArgs;
	343	}
	344	if (Tcl_GetIntFromObj(interp,objv[i], &y) != TCL_OK) {
	345	return TCL_ERROR;
	346	}
	347	break;
	348	}
	349	}
	350	if (type != NSFlagsChanged) {
	351	UniChar keychar = macKC.v.keychar;
	352	chars = [[NSString alloc] initWithCharacters: &keychar length:1];
	353	upper = [chars uppercaseString];
	354	lower = [chars lowercaseString];
	355	if (![upper isEqual: lower] && [chars isEqual: upper]) {
	356	mods \|= NSShiftKeyMask;
	357	}
	358	if (mods & NSShiftKeyMask) {
	359	chars = upper;
	360	unmod = lower;
	361	macKC.v.o_s \|= INDEX_SHIFT;
	362	} else {
	363	unmod = chars;
	364	}
	365	if (macKC.v.o_s & INDEX_OPTION) {
	366	mods \|= NSAlternateKeyMask;
	367	}
	368	}
	369	keyEvent = [NSEvent keyEventWithType:type
	370	location:NSMakePoint(x, y)
	371	modifierFlags:mods
	372	timestamp:GetCurrentEventTime()
	373	windowNumber:0
	374	context:nil
	375	characters:chars
	376	charactersIgnoringModifiers:unmod
	377	isARepeat:NO
	378	keyCode:macKC.v.virtual];
	379	[NSApp postEvent:keyEvent atStart:NO];
	380	return TCL_OK;
	381	}
222	382	/*
223	383	* Local Variables:
224	384	* mode: objc

+325

-280

macosx/tkMacOSXWindowEvent.c less more

29	29	* Declaration of functions used only in this file
30	30	*/
31	31
32		static int GenerateUpdates(HIShapeRef updateRgn,
33		CGRect updateBounds, TkWindow winPtr);
	32	static int GenerateUpdates(
	33	CGRect updateBounds, TkWindow winPtr);
34	34	static int GenerateActivateEvents(TkWindow *winPtr,
35	35	int activeFlag);
36		static void DoWindowActivate(ClientData clientData);
37	36
38	37	#pragma mark TKApplication(TKWindowEvent)
39	38
40		#ifdef TK_MAC_DEBUG_NOTIFICATIONS
	39	extern NSString *NSWindowDidOrderOnScreenNotification;
41	40	extern NSString *NSWindowWillOrderOnScreenNotification;
42		extern NSString *NSWindowDidOrderOnScreenNotification;
	41
	42	#ifdef TK_MAC_DEBUG_NOTIFICATIONS
43	43	extern NSString *NSWindowDidOrderOffScreenNotification;
44	44	#endif
45	45

89	89	height = bounds.size.height - wmPtr->yInParent;
90	90	flags \|= TK_SIZE_CHANGED;
91	91	}
92		if (Tcl_GetServiceMode() != TCL_SERVICE_NONE) {
93		/*
94		* Propagate geometry changes immediately.
95		*/
96
97		flags \|= TK_MACOSX_HANDLE_EVENT_IMMEDIATELY;
98		}
99
100		TkGenWMConfigureEvent((Tk_Window) winPtr, x, y, width, height, flags);
	92	/*
	93	* Propagate geometry changes immediately.
	94	*/
	95
	96	flags \|= TK_MACOSX_HANDLE_EVENT_IMMEDIATELY;
	97	TkGenWMConfigureEvent((Tk_Window)winPtr, x, y, width, height, flags);
101	98	}
102	99
103	100	}

113	110	if (winPtr) {
114	111	winPtr->wmInfoPtr->hints.initial_state =
115	112	TkMacOSXIsWindowZoomed(winPtr) ? ZoomState : NormalState;
116		Tk_MapWindow((Tk_Window) winPtr);
117		if (Tcl_GetServiceMode() != TCL_SERVICE_NONE) {
118
119		/*
120		* Process all Tk events generated by Tk_MapWindow().
121		*/
122
123		while (Tcl_ServiceEvent(0)) {}
124		while (Tcl_DoOneEvent(TCL_IDLE_EVENTS\|TCL_DONT_WAIT)) {}
125
126		/*
127		* NSWindowDidDeminiaturizeNotification is received after
128		* NSWindowDidBecomeKeyNotification, so activate manually
129		*/
130
131		GenerateActivateEvents(winPtr, 1);
132		} else {
133		Tcl_DoWhenIdle(DoWindowActivate, winPtr);
134		}
	113	Tk_MapWindow((Tk_Window)winPtr);
	114
	115	/*
	116	* Process all Tk events generated by Tk_MapWindow().
	117	*/
	118
	119	while (Tcl_ServiceEvent(0)) {}
	120	while (Tcl_DoOneEvent(TCL_IDLE_EVENTS)) {}
	121
	122	/*
	123	* NSWindowDidDeminiaturizeNotification is received after
	124	* NSWindowDidBecomeKeyNotification, so activate manually
	125	*/
	126
	127	GenerateActivateEvents(winPtr, 1);
135	128	}
136	129	}
137	130
138	131	- (NSRect)windowWillUseStandardFrame:(NSWindow *)window
139	132	defaultFrame:(NSRect)newFrame
140	133	{
	134	(void)window;
	135
141	136	/*
142	137	* This method needs to be implemented in order for [NSWindow isZoomed] to
143	138	* give the correct answer. But it suffices to always validate every

150	145	- (NSSize)window:(NSWindow *)window
151	146	willUseFullScreenContentSize:(NSSize)proposedSize
152	147	{
	148	(void)window;
	149
153	150	/*
154	151	* We don't need to change the proposed size, but we do need to implement
155	152	* this method. Otherwise the full screen window will be sized to the

184	181	TkWindow *winPtr = TkMacOSXGetTkWindow(w);
185	182
186	183	if (winPtr) {
187		Tk_UnmapWindow((Tk_Window) winPtr);
	184	Tk_UnmapWindow((Tk_Window)winPtr);
188	185	}
189	186	}
190	187

196	193	TkWindow *winPtr = TkMacOSXGetTkWindow(w);
197	194
198	195	if (winPtr) {
199		TkGenWMDestroyEvent((Tk_Window) winPtr);
	196	TkGenWMDestroyEvent((Tk_Window)winPtr);
200	197	}
201	198
202	199	/*

207	204	return (winPtr ? NO : YES);
208	205	}
209	206
	207	- (void) windowBecameVisible: (NSNotification *) notification
	208	{
	209	NSWindow *window = [notification object];
	210	TkWindow *winPtr = TkMacOSXGetTkWindow(window);
	211	if (winPtr) {
	212	TKContentView *view = [window contentView];
	213
	214	#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101500
	215	if (@available(macOS 10.15, *)) {
	216	[view viewDidChangeEffectiveAppearance];
	217	}
	218	#endif
	219	[view addTkDirtyRect:[view bounds]];
	220	Tcl_CancelIdleCall(TkMacOSXDrawAllViews, NULL);
	221	Tcl_DoWhenIdle(TkMacOSXDrawAllViews, NULL);
	222	}
	223	}
	224
	225	- (void) windowMapped: (NSNotification *) notification
	226	{
	227	NSWindow *w = [notification object];
	228	TkWindow *winPtr = TkMacOSXGetTkWindow(w);
	229
	230	if (winPtr) {
	231	while (Tcl_DoOneEvent(TCL_IDLE_EVENTS)) {}
	232	}
	233	}
	234
210	235	#ifdef TK_MAC_DEBUG_NOTIFICATIONS
211	236
212	237	- (void) windowDragStart: (NSNotification *) notification

220	245	//BOOL start = [[notification name] isEqualToString:NSWindowWillStartLiveResizeNotification];
221	246	}
222	247
223		- (void) windowMapped: (NSNotification *) notification
	248	- (void) windowUnmapped: (NSNotification *) notification
224	249	{
225	250	TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification);
226	251	NSWindow *w = [notification object];
227	252	TkWindow *winPtr = TkMacOSXGetTkWindow(w);
228	253
229	254	if (winPtr) {
230		//Tk_MapWindow((Tk_Window) winPtr);
231		}
232		}
233
234		- (void) windowBecameVisible: (NSNotification *) notification
235		{
236		TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification);
237		}
238
239		- (void) windowUnmapped: (NSNotification *) notification
240		{
241		TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification);
242		NSWindow *w = [notification object];
243		TkWindow *winPtr = TkMacOSXGetTkWindow(w);
244
245		if (winPtr) {
246		//Tk_UnmapWindow((Tk_Window) winPtr);
	255	//Tk_UnmapWindow((Tk_Window)winPtr);
247	256	}
248	257	}
249	258

262	271	observe(NSWindowDidResizeNotification, windowBoundsChanged:);
263	272	observe(NSWindowDidDeminiaturizeNotification, windowExpanded:);
264	273	observe(NSWindowDidMiniaturizeNotification, windowCollapsed:);
	274	observe(NSWindowWillOrderOnScreenNotification, windowMapped:);
	275	observe(NSWindowDidOrderOnScreenNotification, windowBecameVisible:);
265	276
266	277	#if !(MAC_OS_X_VERSION_MAX_ALLOWED < 1070)
267	278	observe(NSWindowDidEnterFullScreenNotification, windowEnteredFullScreen:);

272	283	observe(NSWindowWillMoveNotification, windowDragStart:);
273	284	observe(NSWindowWillStartLiveResizeNotification, windowLiveResize:);
274	285	observe(NSWindowDidEndLiveResizeNotification, windowLiveResize:);
275		observe(NSWindowWillOrderOnScreenNotification, windowMapped:);
276		observe(NSWindowDidOrderOnScreenNotification, windowBecameVisible:);
277	286	observe(NSWindowDidOrderOffScreenNotification, windowUnmapped:);
278	287	#endif
279	288	#undef observe

287	296
288	297	- (void) applicationActivate: (NSNotification *) notification
289	298	{
	299	(void)notification;
	300
290	301	#ifdef TK_MAC_DEBUG_NOTIFICATIONS
291	302	TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification);
292	303	#endif

311	322
312	323	- (void) applicationDeactivate: (NSNotification *) notification
313	324	{
	325	(void)notification;
	326
314	327	#ifdef TK_MAC_DEBUG_NOTIFICATIONS
315	328	TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification);
316	329	#endif
	330
	331	/*
	332	* To prevent zombie windows on systems with a TouchBar, set the key window
	333	* to nil if the current key window is not visible. This allows a closed
	334	* Help or About window to be deallocated so it will not reappear as a
	335	* zombie when the app is reactivated.
	336	*/
	337
	338	NSWindow *keywindow = [NSApp keyWindow];
	339	if (keywindow && ![keywindow isVisible]) {
	340	[NSApp _setKeyWindow:nil];
	341	[NSApp _setMainWindow:nil];
	342	}
	343
317	344	}
318	345
319	346	- (BOOL)applicationShouldHandleReopen:(NSApplication *)sender
320	347	hasVisibleWindows:(BOOL)flag
321	348	{
	349	(void)sender;
	350	(void)flag;
	351
322	352	/*
323	353	* Allowing the default response means that withdrawn windows will get
324	354	* displayed on the screen with unresponsive title buttons. We don't

351	381
352	382	- (void) displayChanged: (NSNotification *) notification
353	383	{
	384	(void)notification;
	385
354	386	#ifdef TK_MAC_DEBUG_NOTIFICATIONS
355	387	TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification);
356	388	#endif

367	399	/*
368	400	*----------------------------------------------------------------------
369	401	*
370		* TkpAppIsDrawing --
	402	* TkpWillDrawWidget --
371	403	*
372	404	* A widget display procedure can call this to determine whether it is
373		* being run inside of the drawRect method. This is needed for some tests,
374		* especially of the Text widget, which record data in a global Tcl
375		* variable and assume that display procedures will be run in a
376		* predictable sequence as Tcl idle tasks.
	405	* being run inside of the drawRect method. If not, it may be desirable
	406	* for the display procedure to simply clear the REDRAW_PENDING flag
	407	* and return. The widget can be recorded in order to schedule a
	408	* redraw, via and Expose event, from within drawRect.
	409	*
	410	* This is also needed for some tests, especially of the Text widget,
	411	* which record data in a global Tcl variable and assume that display
	412	* procedures will be run in a predictable sequence as Tcl idle tasks.
377	413	*
378	414	* Results:
379		* True only while running the drawRect method of a TKContentView;
	415	* True if called from the drawRect method of a TKContentView with
	416	* tkwin NULL or pointing to a widget in the current focusView.
380	417	*
381	418	* Side effects:
382		* None
383		*
384		*----------------------------------------------------------------------
385		*/
386
387		MODULE_SCOPE Bool
388		TkpAppIsDrawing(void) {
389		return [NSApp isDrawing];
	419	* Currently none. One day the tkwin parameter may be recorded to
	420	* handle redrawing the widget later.
	421	*
	422	*----------------------------------------------------------------------
	423	*/
	424
	425	int
	426	TkpWillDrawWidget(Tk_Window tkwin) {
	427	int result;
	428	if (tkwin) {
	429	TkWindow winPtr = (TkWindow )tkwin;
	430	TKContentView view = (TKContentView )TkMacOSXGetNSViewForDrawable(
	431	(Drawable)winPtr->privatePtr);
	432	result = ([NSApp isDrawing] && view == [NSView focusView]);
	433	#if 0
	434	printf("TkpWillDrawWidget: %s %d %d \n", Tk_PathName(tkwin),
	435	[NSApp isDrawing], (view == [NSView focusView]));
	436	if (!result) {
	437	NSRect dirtyRect;
	438	TkMacOSXWinNSBounds(winPtr, view, &dirtyRect);
	439	printf("TkpAppCanDraw: dirtyRect for %s is %s\n",
	440	Tk_PathName(tkwin),
	441	NSStringFromRect(dirtyRect).UTF8String);
	442	[view addTkDirtyRect:dirtyRect];
	443	}
	444	#endif
	445	} else {
	446	result = [NSApp isDrawing];
	447	}
	448	return result;
390	449	}
391	450
392	451	/*

394	453	*
395	454	* GenerateUpdates --
396	455	*
397		* Given a Macintosh update region and a Tk window this function geneates
	456	* Given an update rectangle and a Tk window, this function generates
398	457	* an X Expose event for the window if it meets the update region. The
399		* function will then recursivly have each damaged window generate Expose
	458	* function will then recursively have each damaged window generate Expose
400	459	* events for its child windows.
401	460	*
402	461	* Results:
403	462	* True if event(s) are generated - false otherwise.
404	463	*
405	464	* Side effects:
406		* Additional events may be place on the Tk event queue.
	465	* Additional events may be placed on the Tk event queue.
407	466	*
408	467	*----------------------------------------------------------------------
409	468	*/
410	469
411	470	static int
412	471	GenerateUpdates(
413		HIShapeRef updateRgn,
414	472	CGRect *updateBounds,
415	473	TkWindow *winPtr)
416	474	{
417	475	TkWindow *childPtr;
418	476	XEvent event;
419	477	CGRect bounds, damageBounds;
420		HIShapeRef boundsRgn, damageRgn;
421	478
422	479	TkMacOSXWinCGBounds(winPtr, &bounds);
423	480	if (!CGRectIntersectsRect(bounds, *updateBounds)) {
424	481	return 0;
425	482	}
426		if (!HIShapeIntersectsRect(updateRgn, &bounds)) {
427		return 0;
428		}
429
430		/*
431		* Compute the bounding box of the area that the damage occured in.
432		*/
433
434		boundsRgn = HIShapeCreateWithRect(&bounds);
435		damageRgn = HIShapeCreateIntersection(updateRgn, boundsRgn);
436		if (HIShapeIsEmpty(damageRgn)) {
437		CFRelease(damageRgn);
438		CFRelease(boundsRgn);
439		return 0;
440		}
441		HIShapeGetBounds(damageRgn, &damageBounds);
442
443		CFRelease(damageRgn);
444		CFRelease(boundsRgn);
445
	483
	484	/*
	485	* Compute the bounding box of the area that the damage occurred in.
	486	*/
	487
	488	damageBounds = CGRectIntersection(bounds, *updateBounds);
446	489	event.xany.serial = LastKnownRequestProcessed(Tk_Display(winPtr));
447	490	event.xany.send_event = false;
448	491	event.xany.window = Tk_WindowId(winPtr);

456	499	Tk_QueueWindowEvent(&event, TCL_QUEUE_TAIL);
457	500
458	501	#ifdef TK_MAC_DEBUG_DRAWING
459		TKLog(@"Expose %p {{%d, %d}, {%d, %d}}", event.xany.window, event.xexpose.x,
	502	TKLog(@"Exposed %p {{%d, %d}, {%d, %d}}", event.xany.window, event.xexpose.x,
460	503	event.xexpose.y, event.xexpose.width, event.xexpose.height);
461	504	#endif
462	505

469	512	if (!Tk_IsMapped(childPtr) \|\| Tk_IsTopLevel(childPtr)) {
470	513	continue;
471	514	}
472		GenerateUpdates(updateRgn, updateBounds, childPtr);
	515	GenerateUpdates(updateBounds, childPtr);
473	516	}
474	517
475	518	/*

479	522	if (Tk_IsContainer(winPtr)) {
480	523	childPtr = TkpGetOtherWindow(winPtr);
481	524	if (childPtr != NULL && Tk_IsMapped(childPtr)) {
482		GenerateUpdates(updateRgn, updateBounds, childPtr);
	525	GenerateUpdates(updateBounds, childPtr);
483	526	}
484	527
485	528	/*

493	536	/*
494	537	*----------------------------------------------------------------------
495	538	*
496		* GenerateActivateEvents --
497		*
498		* Given a Macintosh window activate event this function generates all the
499		* X Activate events needed by Tk.
	539	* TkMacOSXGenerateFocusEvent --
	540	*
	541	* Given a Macintosh window activate event this function generates all
	542	* the X Focus events needed by Tk.
500	543	*
501	544	* Results:
502	545	* True if event(s) are generated - false otherwise.
503	546	*
504	547	* Side effects:
505		* Additional events may be place on the Tk event queue.
506		*
507		*----------------------------------------------------------------------
508		*/
509
510		int
511		GenerateActivateEvents(
512		TkWindow *winPtr,
513		int activeFlag)
514		{
515		TkGenerateActivateEvents(winPtr, activeFlag);
516		if (activeFlag \|\| ![NSApp isActive]) {
517		TkMacOSXGenerateFocusEvent(winPtr, activeFlag);
518		}
519		return true;
520		}
521
522		/*
523		*----------------------------------------------------------------------
524		*
525		* DoWindowActivate --
526		*
527		* Idle handler that calls GenerateActivateEvents().
528		*
529		* Results:
530		* None.
531		*
532		* Side effects:
533		* Additional events may be place on the Tk event queue.
534		*
535		*----------------------------------------------------------------------
536		*/
537
538		void
539		DoWindowActivate(
540		ClientData clientData)
541		{
542		GenerateActivateEvents(clientData, 1);
543		}
544
545		/*
546		*----------------------------------------------------------------------
547		*
548		* TkMacOSXGenerateFocusEvent --
549		*
550		* Given a Macintosh window activate event this function generates all
551		* the X Focus events needed by Tk.
552		*
553		* Results:
554		* True if event(s) are generated - false otherwise.
555		*
556		* Side effects:
557		* Additional events may be place on the Tk event queue.
558		*
559		*----------------------------------------------------------------------
560		*/
561
562		MODULE_SCOPE int
	548	* Additional events may be placed on the Tk event queue.
	549	*
	550	*----------------------------------------------------------------------
	551	*/
	552
	553	static int
563	554	TkMacOSXGenerateFocusEvent(
564	555	TkWindow winPtr, / Root X window for event. */
565	556	int activeFlag)

598	589	return true;
599	590	}
600	591
	592	/*
	593	*----------------------------------------------------------------------
	594	*
	595	* GenerateActivateEvents --
	596	*
	597	* Given a Macintosh window activate event this function generates all the
	598	* X Activate events needed by Tk.
	599	*
	600	* Results:
	601	* True if event(s) are generated - false otherwise.
	602	*
	603	* Side effects:
	604	* Additional events may be placed on the Tk event queue.
	605	*
	606	*----------------------------------------------------------------------
	607	*/
	608
	609	int
	610	GenerateActivateEvents(
	611	TkWindow *winPtr,
	612	int activeFlag)
	613	{
	614	TkGenerateActivateEvents(winPtr, activeFlag);
	615	if (activeFlag \|\| ![NSApp isActive]) {
	616	TkMacOSXGenerateFocusEvent(winPtr, activeFlag);
	617	}
	618	return true;
	619	}
	620
601	621	/*
602	622	*----------------------------------------------------------------------
603	623	*

712	732
713	733	/*
714	734	* Now set up the changes structure. Under X we wait for the
715		* ConfigureNotify to set these values. On the Mac we know imediatly that
	735	* ConfigureNotify to set these values. On the Mac we know immediately that
716	736	* this is what we want - so we just set them. However, we need to make
717	737	* sure the windows clipping region is marked invalid so the change is
718	738	* visible to the subwindow.

803	823	if (result != TCL_OK) {
804	824	Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf(
805	825	"\n (command for \"%s\" window manager protocol)",
806		Tk_GetAtomName((Tk_Window) winPtr, protocol)));
	826	Tk_GetAtomName((Tk_Window)winPtr, protocol)));
807	827	Tcl_BackgroundException(interp, result);
808	828	}
809	829	Tcl_Release(interp);

817	837	* message then just destroy the window.
818	838	*/
819	839
820		if (protocol == Tk_InternAtom((Tk_Window) winPtr, "WM_DELETE_WINDOW")) {
821		Tk_DestroyWindow((Tk_Window) winPtr);
	840	if (protocol == Tk_InternAtom((Tk_Window)winPtr, "WM_DELETE_WINDOW")) {
	841	Tk_DestroyWindow((Tk_Window)winPtr);
822	842	}
823	843	}
824	844

886	906
887	907	static Tk_RestrictAction
888	908	ConfigureRestrictProc(
889		ClientData arg,
	909	TCL_UNUSED(void *),
890	910	XEvent *eventPtr)
891	911	{
892	912	return (eventPtr->type==ConfigureNotify ? TK_PROCESS_EVENT : TK_DEFER_EVENT);
893	913	}
894	914
895		/*
896		* If a window gets mapped inside the drawRect method, this will be run as an
897		* idle task, after drawRect returns, to clean up the mess.
898		*/
899
900		static void
901		RedisplayView(
902		ClientData clientdata)
903		{
904		NSView view = (NSView ) clientdata;
905
906		/*
907		* Make sure that we are not trying to displaying a view that no longer
908		* exists.
909		*/
910
911		for (NSWindow *w in [NSApp orderedWindows]) {
912		if ([w contentView] == view) {
913		[view setNeedsDisplay:YES];
914		break;
915		}
916		}
917		}
918
919	915	@implementation TKContentView(TKWindowEvent)
920	916
	917	- (void) addTkDirtyRect: (NSRect) rect
	918	{
	919	_tkNeedsDisplay = YES;
	920	_tkDirtyRect = NSUnionRect(_tkDirtyRect, rect);
	921	[NSApp setNeedsToDraw:YES];
	922	}
	923
	924	- (void) clearTkDirtyRect
	925	{
	926	_tkNeedsDisplay = NO;
	927	_tkDirtyRect = NSZeroRect;
	928	[NSApp setNeedsToDraw:NO];
	929	}
	930
921	931	- (void) drawRect: (NSRect) rect
922	932	{
923		const NSRect *rectsBeingDrawn;
924		NSInteger rectsBeingDrawnCount;
	933	(void)rect;
925	934
926	935	#ifdef TK_MAC_DEBUG_DRAWING
927	936	TkWindow *winPtr = TkMacOSXGetTkWindow([self window]);
928		if (winPtr) fprintf(stderr, "drawRect: drawing %s\n",
929		Tk_PathName(winPtr));
	937	if (winPtr) {
	938	fprintf(stderr, "drawRect: drawing %s in %s\n",
	939	Tk_PathName(winPtr), NSStringFromRect(rect).UTF8String);
	940	}
930	941	#endif
931	942
932	943	/*

935	946	*/
936	947
937	948	if ([NSApp isDrawing]) {
938		if ([NSApp macMinorVersion] > 13) {
	949	if ([NSApp macOSVersion] > 101300) {
939	950	TKLog(@"WARNING: a recursive call to drawRect was aborted.");
940	951	}
941	952	return;
942	953	}
943	954
944	955	[NSApp setIsDrawing: YES];
945
946		[self getRectsBeingDrawn:&rectsBeingDrawn count:&rectsBeingDrawnCount];
947		CGFloat height = [self bounds].size.height;
948		HIMutableShapeRef drawShape = HIShapeCreateMutable();
949
950		while (rectsBeingDrawnCount--) {
951		CGRect r = NSRectToCGRect(*rectsBeingDrawn++);
952
953		#ifdef TK_MAC_DEBUG_DRAWING
954		fprintf(stderr, "drawRect: %dx%d@(%d,%d)\n", (int)r.size.width,
955		(int)r.size.height, (int)r.origin.x, (int)r.origin.y);
956		#endif
957
958		r.origin.y = height - (r.origin.y + r.size.height);
959		HIShapeUnionWithRect(drawShape, &r);
960		}
961		[self generateExposeEvents:(HIShapeRef)drawShape];
962		CFRelease(drawShape);
963		[NSApp setIsDrawing: NO];
964
965		if ([self needsRedisplay]) {
966		[self setNeedsRedisplay:NO];
967		Tcl_DoWhenIdle(RedisplayView, self);
968		}
	956	[self clearTkDirtyRect];
	957	[self generateExposeEvents:rect];
	958	[NSApp setIsDrawing:NO];
969	959
970	960	#ifdef TK_MAC_DEBUG_DRAWING
971	961	fprintf(stderr, "drawRect: done.\n");

977	967	[super setFrameSize: newsize];
978	968	NSWindow *w = [self window];
979	969	TkWindow *winPtr = TkMacOSXGetTkWindow(w);
980		Tk_Window tkwin = (Tk_Window) winPtr;
	970	Tk_Window tkwin = (Tk_Window)winPtr;
981	971
982	972	if (![self inLiveResize] &&
983	973	[w respondsToSelector: @selector (tkLayoutChanged)]) {

1022	1012	TkMacOSXUpdateClipRgn(winPtr);
1023	1013
1024	1014	/*
1025		* Generate and process expose events to redraw the window.
	1015	* Generate and process expose events to redraw the window. To avoid
	1016	* crashes, only do this if we are being called from drawRect. See
	1017	* ticket [1fa8c3ed8d].
1026	1018	*/
1027	1019
1028		HIRect bounds = NSRectToCGRect([self bounds]);
1029		HIShapeRef shape = HIShapeCreateWithRect(&bounds);
1030		[self generateExposeEvents: shape];
1031		[w displayIfNeeded];
	1020	if([NSApp isDrawing] \|\| [self inLiveResize]) {
	1021	[self generateExposeEvents: [self bounds]];
	1022	}
1032	1023
1033	1024	/*
1034	1025	* Finally, unlock the main autoreleasePool.

1045	1036	* pending idle events are processed so the drawing will actually take place.
1046	1037	*/
1047	1038
1048		- (void) generateExposeEvents: (HIShapeRef) shape
	1039	- (void) generateExposeEvents: (NSRect) rect
1049	1040	{
1050	1041	unsigned long serial;
	1042	int updatesNeeded;
1051	1043	CGRect updateBounds;
1052		int updatesNeeded;
1053	1044	TkWindow *winPtr = TkMacOSXGetTkWindow([self window]);
1054	1045	ClientData oldArg;
1055	1046	Tk_RestrictProc *oldProc;

1058	1049	}
1059	1050
1060	1051	/*
1061		* Generate Tk Expose events.
1062		*/
1063
1064		HIShapeGetBounds(shape, &updateBounds);
1065
1066		/*
1067		* All of these events will share the same serial number.
1068		*/
1069
1070		serial = LastKnownRequestProcessed(Tk_Display(winPtr));
1071		updatesNeeded = GenerateUpdates(shape, &updateBounds, winPtr);
1072
	1052	* Generate Tk Expose events. All of these events will share the same
	1053	* serial number.
	1054	*/
	1055
	1056	updateBounds = NSRectToCGRect(rect);
	1057	updateBounds.origin.y = ([self bounds].size.height - updateBounds.origin.y
	1058	- updateBounds.size.height);
	1059	updatesNeeded = GenerateUpdates(&updateBounds, winPtr);
1073	1060	if (updatesNeeded) {
1074	1061
	1062	serial = LastKnownRequestProcessed(Tk_Display(winPtr));
	1063
1075	1064	/*
1076		* First process all of the Expose events.
	1065	* Use the ExposeRestrictProc to process only the expose events. This
	1066	* will create idle drawing tasks, which we handle before we return.
1077	1067	*/
1078	1068
1079	1069	oldProc = Tk_RestrictEvents(ExposeRestrictProc, UINT2PTR(serial), &oldArg);
1080		while (Tcl_ServiceEvent(TCL_WINDOW_EVENTS)) {};
	1070	while (Tcl_ServiceEvent(TCL_WINDOW_EVENTS\|TCL_DONT_WAIT)) {};
1081	1071	Tk_RestrictEvents(oldProc, oldArg, &oldArg);
1082	1072
1083	1073	/*

1089	1079	* effect.)
1090	1080	*
1091	1081	* Fortunately, Tk schedules all drawing to be done while Tcl is idle.
1092		* So we can do the drawing by processing all of the idle events that
1093		* were created when the expose events were processed.
	1082	* So to run any display procs which were scheduled by the expose
	1083	* events we process all idle events before returning.
1094	1084	*/
	1085
1095	1086	while (Tcl_DoOneEvent(TCL_IDLE_EVENTS)) {}
1096	1087	}
1097	1088	}
1098	1089
1099	1090	/*
1100		* This method is called when a user changes between light and dark mode. The
1101		* implementation here generates a Tk virtual event which can be bound to a
1102		* function that redraws the window in an appropriate style.
1103		*/
	1091	* In macOS 10.14 and later this method is called when a user changes between
	1092	* light and dark mode or changes the accent color. The implementation
	1093	* generates two virtual events. The first is either <<LightAqua>> or
	1094	* <<DarkAqua>>, depending on the view's current effective appearance. The
	1095	* second is <<AppearnceChanged>> and has a data string describing the
	1096	* effective appearance of the view and the current accent and highlight
	1097	* colors.
	1098	*/
	1099
	1100	#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
	1101
	1102	static const char *const accentNames[] = {
	1103	"Graphite",
	1104	"Red",
	1105	"Orange",
	1106	"Yellow",
	1107	"Green",
	1108	"Blue",
	1109	"Purple",
	1110	"Pink"
	1111	};
1104	1112
1105	1113	- (void) viewDidChangeEffectiveAppearance
1106	1114	{
1107		XVirtualEvent event;
1108		int x, y;
1109		NSWindow *w = [self window];
1110		TkWindow *winPtr = TkMacOSXGetTkWindow(w);
1111		Tk_Window tkwin = (Tk_Window) winPtr;
1112
1113		if (!winPtr) {
	1115	Tk_Window tkwin = (Tk_Window)TkMacOSXGetTkWindow([self window]);
	1116	if (!tkwin) {
1114	1117	return;
1115	1118	}
1116		bzero(&event, sizeof(XVirtualEvent));
1117		event.type = VirtualEvent;
1118		event.serial = LastKnownRequestProcessed(Tk_Display(tkwin));
1119		event.send_event = false;
1120		event.display = Tk_Display(tkwin);
1121		event.event = Tk_WindowId(tkwin);
1122		event.root = XRootWindow(Tk_Display(tkwin), 0);
1123		event.subwindow = None;
1124		event.time = TkpGetMS();
1125		XQueryPointer(NULL, winPtr->window, NULL, NULL,
1126		&event.x_root, &event.y_root, &x, &y, &event.state);
1127		Tk_TopCoordsToWindow(tkwin, x, y, &event.x, &event.y);
1128		event.same_screen = true;
1129		if (TkMacOSXInDarkMode(tkwin)) {
1130		event.name = Tk_GetUid("DarkAqua");
1131		} else {
1132		event.name = Tk_GetUid("LightAqua");
1133		}
1134		Tk_QueueWindowEvent((XEvent *) &event, TCL_QUEUE_TAIL);
1135		}
	1119	NSAppearanceName effectiveAppearanceName = [[self effectiveAppearance] name];
	1120	NSUserDefaults *preferences = [NSUserDefaults standardUserDefaults];
	1121	static const char *defaultColor = NULL;
	1122
	1123	if (effectiveAppearanceName == NSAppearanceNameAqua) {
	1124	TkSendVirtualEvent(tkwin, "LightAqua", NULL);
	1125	} else if (effectiveAppearanceName == NSAppearanceNameDarkAqua) {
	1126	TkSendVirtualEvent(tkwin, "DarkAqua", NULL);
	1127	}
	1128	if ([NSApp macOSVersion] < 101500) {
	1129
	1130	/*
	1131	* Mojave cannot handle the KVO shenanigans that we need for the
	1132	* highlight and accent color notifications.
	1133	*/
	1134
	1135	return;
	1136	}
	1137	if (!defaultColor) {
	1138	defaultColor = [NSApp macOSVersion] < 110000 ? "Blue" : "Multicolor";
	1139	preferences = [[NSUserDefaults standardUserDefaults] retain];
	1140
	1141	/*
	1142	* AppKit calls this method when the user changes the Accent Color
	1143	* but not when the user changes the Highlight Color. So we register
	1144	* to receive KVO notifications for Highlight Color as well.
	1145	*/
	1146
	1147	[preferences addObserver:self
	1148	forKeyPath:@"AppleHighlightColor"
	1149	options:NSKeyValueObservingOptionNew
	1150	context:NULL];
	1151	}
	1152	NSString *accent = [preferences stringForKey:@"AppleAccentColor"];
	1153	NSArray *words = [[preferences stringForKey:@"AppleHighlightColor"]
	1154	componentsSeparatedByString: @" "];
	1155	NSString *highlight = [words count] > 3 ? [words objectAtIndex:3] : nil;
	1156	const char *accentName = accent ? accentNames[1 + accent.intValue] : defaultColor;
	1157	const char *highlightName = highlight ? highlight.UTF8String: defaultColor;
	1158	char data[256];
	1159	snprintf(data, 256, "Appearance %s Accent %s Highlight %s",
	1160	effectiveAppearanceName.UTF8String, accentName,
	1161	highlightName);
	1162	TkSendVirtualEvent(tkwin, "AppearanceChanged", Tcl_NewStringObj(data, -1));
	1163	}
	1164
	1165	- (void)observeValueForKeyPath:(NSString *)keyPath
	1166	ofObject:(id)object
	1167	change:(NSDictionary *)change
	1168	context:(void *)context
	1169	{
	1170	NSUserDefaults *preferences = [NSUserDefaults standardUserDefaults];
	1171	if (object == preferences && [keyPath isEqualToString:@"AppleHighlightColor"]) {
	1172	if (@available(macOS 10.14, *)) {
	1173	[self viewDidChangeEffectiveAppearance];
	1174	}
	1175	}
	1176	}
	1177
	1178	#endif
1136	1179
1137	1180	/*
1138	1181	* This is no-op on 10.7 and up because Apple has removed this widget, but we

1147	1190	XVirtualEvent event;
1148	1191	int x, y;
1149	1192	TkWindow *winPtr = TkMacOSXGetTkWindow([self window]);
1150		Tk_Window tkwin = (Tk_Window) winPtr;
	1193	Tk_Window tkwin = (Tk_Window)winPtr;
	1194	(void)sender;
	1195
1151	1196	if (!winPtr){
1152	1197	return;
1153	1198	}

1168	1213	Tk_QueueWindowEvent((XEvent *) &event, TCL_QUEUE_TAIL);
1169	1214	}
1170	1215
1171		- (BOOL) isOpaque
1172		{
1173		NSWindow *w = [self window];
1174		return (w && (([w styleMask] & NSTexturedBackgroundWindowMask) \|\|
1175		![w isOpaque]) ? NO : YES);
1176		}
	1216	/*
	1217	* On Catalina this is never called and drawRect clips to the rect that
	1218	* is passed to it by AppKit.
	1219	*/
1177	1220
1178	1221	- (BOOL) wantsDefaultClipping
1179	1222	{

1192	1235
1193	1236	- (void) keyDown: (NSEvent *) theEvent
1194	1237	{
	1238	(void)theEvent;
	1239
1195	1240	#ifdef TK_MAC_DEBUG_EVENTS
1196	1241	TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, theEvent);
1197	1242	#endif

1199	1244
1200	1245	/*
1201	1246	* When the services menu is opened this is called for each Responder in
1202		* the Responder chain until a service provider is found. The TkContentView
	1247	* the Responder chain until a service provider is found. The TKContentView
1203	1248	* should be the first (and generally only) Responder in the chain. We
1204	1249	* return the TkServices object that was created in TkpInit.
1205	1250	*/

+545

-501

macosx/tkMacOSXWm.c less more

20	20	#include "tkMacOSXEvent.h"
21	21	#include "tkMacOSXDebug.h"
22	22	#include "tkMacOSXConstants.h"
	23
	24	/*
	25	* Setting this to 1 prints when each window is freed, setting it to 2 adds
	26	* dumps of the autorelease pools, and setting it to 3 also shows each retain
	27	* and release.
	28	*/
23	29
24	30	#define DEBUG_ZOMBIES 0
25	31

184	190	*/
185	191
186	192	static int tkMacOSXWmAttrNotifyVal = 0;
187
188		/*
189		* Hash table for Mac Window -> TkWindow mapping.
190		*/
191
192		static Tcl_HashTable windowTable;
193		static int windowHashInit = false;
194	193
195	194	/*
196	195	* Forward declarations for procedures defined in this file:

313	312	static void ApplyWindowAttributeFlagChanges(TkWindow *winPtr,
314	313	NSWindow *macWindow, UInt64 oldAttributes,
315	314	int oldFlags, int create, int initial);
316		static void ApplyMasterOverrideChanges(TkWindow *winPtr,
	315	static void ApplyContainerOverrideChanges(TkWindow *winPtr,
317	316	NSWindow *macWindow);
318	317	static void GetMinSize(TkWindow winPtr, int minWidthPtr,
319	318	int *minHeightPtr);

353	352
354	353	#pragma mark -
355	354
	355	@implementation TKPanel: NSPanel
	356	@synthesize tkWindow = _tkWindow;
	357	@end
	358
	359	@implementation TKDrawerWindow: NSWindow
	360	@synthesize tkWindow = _tkWindow;
	361	@end
	362
	363	@implementation TKWindow: NSWindow
	364	@synthesize mouseInResizeArea = _mouseInResizeArea;
	365	@synthesize tkWindow = _tkWindow;
	366	@end
	367
356	368	#pragma mark TKWindow(TKWm)
357
358		@implementation TKWindow: NSWindow
359
360		@end
361	369
362	370	@implementation TKWindow(TKWm)
363	371

429	437	- (BOOL) canBecomeKeyWindow
430	438	{
431	439	TkWindow *winPtr = TkMacOSXGetTkWindow(self);
432		if (!winPtr) {
	440
	441	if (!winPtr \|\| !winPtr->wmInfoPtr) {
433	442	return NO;
434	443	}
435	444	return (winPtr->wmInfoPtr &&

446	455	if (title == nil) {
447	456	title = "unnamed window";
448	457	}
449		if (DEBUG_ZOMBIES > 1) {
	458	if (DEBUG_ZOMBIES > 2) {
450	459	fprintf(stderr, "Retained <%s>. Count is: %lu\n",
451	460	title, [self retainCount]);
452	461	}

460	469	if (title == nil) {
461	470	title = "unnamed window";
462	471	}
463		if (DEBUG_ZOMBIES > 1) {
	472	if (DEBUG_ZOMBIES > 2) {
464	473	fprintf(stderr, "Autoreleased <%s>. Count is %lu\n",
465	474	title, [self retainCount]);
466	475	}

472	481	if (title == nil) {
473	482	title = "unnamed window";
474	483	}
475		if (DEBUG_ZOMBIES > 1) {
	484	if (DEBUG_ZOMBIES > 2) {
476	485	fprintf(stderr, "Releasing <%s>. Count is %lu\n",
477	486	title, [self retainCount]);
478	487	}

516	525	SetWindowSizeLimits(
517	526	TkWindow *winPtr)
518	527	{
519		NSWindow *macWindow = TkMacOSXDrawableWindow(winPtr->window);
	528	NSWindow *macWindow = TkMacOSXGetNSWindowForDrawable(winPtr->window);
520	529	WmInfo *wmPtr = winPtr->wmInfoPtr;
521	530	int minWidth, minHeight, maxWidth, maxHeight, base;
522	531

658	667	TkWmNewWindow(
659	668	TkWindow winPtr) / Newly-created top-level window. */
660	669	{
661		WmInfo *wmPtr = ckalloc(sizeof(WmInfo));
	670	WmInfo wmPtr = (WmInfo )ckalloc(sizeof(WmInfo));
662	671
663	672	wmPtr->winPtr = winPtr;
664	673	wmPtr->reparent = None;
665	674	wmPtr->titleUid = NULL;
666	675	wmPtr->iconName = NULL;
667		wmPtr->master = NULL;
	676	wmPtr->container = NULL;
668	677	wmPtr->hints.flags = InputHint \| StateHint;
669	678	wmPtr->hints.input = True;
670	679	wmPtr->hints.initial_state = NormalState;

722	731	* detect size and position changes caused by window managers.
723	732	*/
724	733
725		Tk_CreateEventHandler((Tk_Window) winPtr, StructureNotifyMask,
	734	Tk_CreateEventHandler((Tk_Window)winPtr, StructureNotifyMask,
726	735	TopLevelEventProc, winPtr);
727	736
728	737	/*

730	739	* window manager.
731	740	*/
732	741
733		Tk_ManageGeometry((Tk_Window) winPtr, &wmMgrType, (ClientData) 0);
	742	Tk_ManageGeometry((Tk_Window)winPtr, &wmMgrType, NULL);
	743	}
	744
	745	/*
	746	*----------------------------------------------------------------------
	747	*
	748	* TkMacOSXHandleMapOrUnmap --
	749	*
	750	* The mechanism used by a geometry manager to propogate the information
	751	* about which of its content widgets are mapped is to call Tk_MapWindow
	752	* or Tk_UnmapNotify. Those functions generate MapNotify or UnmapNotify
	753	* events and then handle them immediately. Other platforms use
	754	* Tk_HandleEvent to do this. But that does not work correctly on macOS
	755	* due to the fact that the calls to Tk_MapNotify or Tk_UnmapNotify can
	756	* occur in display procedures which are being run in the drawRect method
	757	* of a TKContentView. The events will be processed after drawRect
	758	* returns, but they need to be processed immediately in some cases.
	759
	760	* This function operates as a macOS alternative to Tk_HandleEvent, for
	761	* processing MapNotify or UnmapNotify events only. It is called by
	762	* Tk_MapWindow, Tk_UnmapWindow, TkWmMapWindow and TkWmUnmapWindow.
	763	* Rather than using Tk_HandleEvent it installs a filter which restricts
	764	* to the MapNotify or UnmapNotify events, it queues the event and then
	765	* processes window events with the filter installed. This allows the
	766	* event to be handled immediately even from within the drawRect method.
	767	*
	768	* Results:
	769	* None.
	770	*
	771	* Side effects:
	772	* Handles a MapNotify or UnMapNotify event.
	773	*
	774	*----------------------------------------------------------------------
	775	*/
	776	static Tk_RestrictAction
	777	MapUnmapRestrictProc(
	778	ClientData arg,
	779	XEvent *eventPtr)
	780	{
	781	return (eventPtr->type==MapNotify \|\| eventPtr->type==UnmapNotify ?
	782	TK_PROCESS_EVENT : TK_DEFER_EVENT);
	783	}
	784
	785	MODULE_SCOPE
	786	void TkMacOSXHandleMapOrUnmap(
	787	Tk_Window tkwin,
	788	XEvent *event)
	789	{
	790	ClientData oldArg;
	791	Tk_RestrictProc *oldProc;
	792	TkWindow winPtr = (TkWindow ) tkwin;
	793	const Tk_GeomMgr *geomMgrPtr = winPtr->geomMgrPtr;
	794
	795	/*
	796	* Sadly, this approach does not work with the "text" geometry manager.
	797	* The mysterious unexplained crash elicited by textDisp-5.2 occurs. So we
	798	* have to check for the "text" manager and revert to using Tk_HandleEvent
	799	* in that case. Hopefully this can be removed when the revised text
	800	* widget is in place.
	801	*/
	802
	803	if (geomMgrPtr && strcmp(geomMgrPtr->name, "text") == 0) {
	804	Tk_HandleEvent(event);
	805	return;
	806	}
	807	oldProc = Tk_RestrictEvents(MapUnmapRestrictProc, NULL, &oldArg);
	808	Tk_QueueWindowEvent(event, TCL_QUEUE_TAIL);
	809	while (Tcl_DoOneEvent(TCL_WINDOW_EVENTS\|TCL_DONT_WAIT)) {}
	810	Tk_RestrictEvents(oldProc, oldArg, &oldArg);
734	811	}
735	812
736	813	/*

762	839	* mapped. */
763	840	{
764	841	WmInfo *wmPtr = winPtr->wmInfoPtr;
	842	XEvent event;
	843
765	844	if (wmPtr->flags & WM_NEVER_MAPPED) {
766	845	/*
767	846	* Create the underlying Mac window for this Tk window.

777	856	* Generate configure event when we first map the window.
778	857	*/
779	858
780		TkGenWMConfigureEvent((Tk_Window) winPtr, wmPtr->x, wmPtr->y, -1, -1,
	859	TkGenWMConfigureEvent((Tk_Window)winPtr, wmPtr->x, wmPtr->y, -1, -1,
781	860	TK_LOCATION_CHANGED);
782	861
783	862	/*

825	904	wmPtr->flags &= ~WM_ABOUT_TO_MAP;
826	905
827	906	/*
828		* Map the window.
	907	* Map the window and process a MapNotify event for it.
829	908	*/
830	909
	910	winPtr->flags \|= TK_MAPPED;
831	911	XMapWindow(winPtr->display, winPtr->window);
	912	event.xany.serial = LastKnownRequestProcessed(winPtr->display);
	913	event.xany.send_event = False;
	914	event.xany.display = winPtr->display;
	915	event.xmap.window = winPtr->window;
	916	event.xmap.type = MapNotify;
	917	event.xmap.event = winPtr->window;
	918	event.xmap.override_redirect = winPtr->atts.override_redirect;
	919	TkpHandleMapOrUnmap((Tk_Window)winPtr, &event);
832	920	}
833	921
834	922	/*

853	941	TkWindow winPtr) / Top-level window that's about to be
854	942	* unmapped. */
855	943	{
	944	XEvent event;
	945
	946	event.xany.serial = LastKnownRequestProcessed(winPtr->display);
	947	event.xany.send_event = False;
	948	event.xany.display = winPtr->display;
	949	event.xunmap.type = UnmapNotify;
	950	event.xunmap.window = winPtr->window;
	951	event.xunmap.event = winPtr->window;
	952	event.xunmap.from_configure = false;
	953	winPtr->flags &= ~TK_MAPPED;
856	954	XUnmapWindow(winPtr->display, winPtr->window);
	955	TkpHandleMapOrUnmap((Tk_Window)winPtr, &event);
857	956	}
858	957
859	958	/*

878	977	TkWindow winPtr) / Top-level window that's being deleted. */
879	978	{
880	979	WmInfo wmPtr = winPtr->wmInfoPtr, wmPtr2;
	980	TKWindow *deadNSWindow;
881	981
882	982	if (wmPtr == NULL) {
883	983	return;
884	984	}
885	985
886	986	/*
887		*If the dead window is a transient, remove it from the master's list.
	987	*If the dead window is a transient, remove it from the container's list.
888	988	*/
889	989
890	990	RemoveTransient(winPtr);
891		Tk_ManageGeometry((Tk_Window) winPtr, NULL, NULL);
892		Tk_DeleteEventHandler((Tk_Window) winPtr, StructureNotifyMask,
	991	Tk_ManageGeometry((Tk_Window)winPtr, NULL, NULL);
	992	Tk_DeleteEventHandler((Tk_Window)winPtr, StructureNotifyMask,
893	993	TopLevelEventProc, winPtr);
894	994	if (wmPtr->hints.flags & IconPixmapHint) {
895	995	Tk_FreeBitmap(winPtr->display, wmPtr->hints.icon_pixmap);

904	1004	ckfree(wmPtr->leaderName);
905	1005	}
906	1006	if (wmPtr->icon != NULL) {
907		wmPtr2 = ((TkWindow *) wmPtr->icon)->wmInfoPtr;
	1007	wmPtr2 = ((TkWindow *)wmPtr->icon)->wmInfoPtr;
908	1008	wmPtr2->iconFor = NULL;
909	1009	}
910	1010	if (wmPtr->iconFor != NULL) {
911		wmPtr2 = ((TkWindow *) wmPtr->iconFor)->wmInfoPtr;
	1011	wmPtr2 = ((TkWindow *)wmPtr->iconFor)->wmInfoPtr;
912	1012	wmPtr2->icon = NULL;
913	1013	wmPtr2->hints.flags &= ~IconWindowHint;
914	1014	}

935	1035	for (Transient *transientPtr = wmPtr->transientPtr;
936	1036	transientPtr != NULL; transientPtr = transientPtr->nextPtr) {
937	1037	TkWindow *winPtr2 = transientPtr->winPtr;
938		TkWindow masterPtr = (TkWindow ) TkGetTransientMaster(winPtr2);
939
940		if (masterPtr == winPtr) {
	1038	TkWindow containerPtr = (TkWindow )TkMacOSXGetContainer(winPtr2);
	1039
	1040	if (containerPtr == winPtr) {
941	1041	wmPtr2 = winPtr2->wmInfoPtr;
942		wmPtr2->master = NULL;
	1042	wmPtr2->container = NULL;
943	1043	}
944	1044	}
945	1045

951	1051	}
952	1052
953	1053	/*
954		* Delete the Mac window and remove it from the windowTable. The window
955		* could be nil if the window was never mapped. However, we don't do this
956		* for embedded windows, they don't go in the window list, and they do not
957		* own their portPtr's.
	1054	* Unregister the NSWindow and remove all references to it from the Tk
	1055	* data structures. If the NSWindow is a child, disassociate it from
	1056	* the parent. Then close and release the NSWindow.
958	1057	*/
959	1058
960		NSWindow *window = wmPtr->window;
961
962		if (window && !Tk_IsEmbedded(winPtr)) {
963		NSWindow *parent = [window parentWindow];
	1059	deadNSWindow = (TKWindow *)wmPtr->window;
	1060	if (deadNSWindow && !Tk_IsEmbedded(winPtr)) {
	1061	NSWindow *parent = [deadNSWindow parentWindow];
	1062	[deadNSWindow setTkWindow:None];
	1063	if (winPtr->window) {
	1064	((MacDrawable *)winPtr->window)->view = nil;
	1065	}
	1066	wmPtr->window = NULL;
964	1067
965	1068	if (parent) {
966		[parent removeChildWindow:window];
967		}
968		#if DEBUG_ZOMBIES > 0
	1069	[parent removeChildWindow:deadNSWindow];
	1070	}
	1071
	1072	#if DEBUG_ZOMBIES > 1
969	1073	{
970		const char *title = [[window title] UTF8String];
	1074	const char *title = [[deadNSWindow title] UTF8String];
971	1075	if (title == nil) {
972	1076	title = "unnamed window";
973	1077	}
974	1078	fprintf(stderr, ">>>> Closing <%s>. Count is: %lu\n", title,
975		[window retainCount]);
	1079	[deadNSWindow retainCount]);
976	1080	}
977	1081	#endif
978		[window close];
979		TkMacOSXUnregisterMacWindow(window);
980		if (winPtr->window) {
981		((MacDrawable *) winPtr->window)->view = nil;
982		}
983		wmPtr->window = NULL;
984		[window release];
985
986		/* Activate the highest window left on the screen. */
987		NSArray *windows = [NSApp orderedWindows];
988		for (id nswindow in windows) {
989		TkWindow *winPtr2 = TkMacOSXGetTkWindow(nswindow);
990
991		if (winPtr2 && nswindow != window) {
992		WmInfo *wmPtr = winPtr2->wmInfoPtr;
993		BOOL minimized = (wmPtr->hints.initial_state == IconicState
994		\|\| wmPtr->hints.initial_state == WithdrawnState);
995
996		/*
997		* If no windows are left on the screen and the next window is
998		* iconified or withdrawn, we don't want to make it be the
999		* KeyWindow because that would cause it to be displayed on the
1000		* screen.
1001		*/
1002
1003		if ([nswindow canBecomeKeyWindow] && !minimized) {
1004		[nswindow makeKeyAndOrderFront:NSApp];
1005		break;
1006		}
	1082
	1083	/*
	1084	* When a window is closed we want to move the focus to the next
	1085	* highest window. Apple's documentation says that calling the
	1086	* orderOut method of the key window will accomplish this. But
	1087	* experiment shows that this is not the case. So we have to reset the
	1088	* key window ourselves. When the window is the last one on the screen
	1089	* there is no choice for a new key window. Moreover, if the host
	1090	* computer has a TouchBar then the TouchBar holds a reference to the
	1091	* key window which prevents it from being deallocated until it stops
	1092	* being the key window. On these systems the only option for
	1093	* preventing zombies is to set the key window to nil.
	1094	*/
	1095
	1096	for (NSWindow *w in [NSApp orderedWindows]) {
	1097	TkWindow *winPtr2 = TkMacOSXGetTkWindow(w);
	1098	BOOL isOnScreen;
	1099
	1100	if (!winPtr2 \|\| !winPtr2->wmInfoPtr) {
	1101	continue;
1007	1102	}
	1103	wmPtr2 = winPtr2->wmInfoPtr;
	1104	isOnScreen = (wmPtr2->hints.initial_state != IconicState &&
	1105	wmPtr2->hints.initial_state != WithdrawnState);
	1106	if (w != deadNSWindow && isOnScreen && [w canBecomeKeyWindow]) {
	1107	[w makeKeyAndOrderFront:NSApp];
	1108	break;
	1109	}
1008	1110	}
1009	1111
1010	1112	/*
1011		* Process all window events immediately to force the closed window to
1012		* be deallocated. But don't do this for the root window as that is
1013		* unnecessary and can lead to segfaults.
	1113	* Prevent zombies on systems with a TouchBar.
1014	1114	*/
1015	1115
1016		if (winPtr->parentPtr) {
1017		while (Tcl_DoOneEvent(TCL_WINDOW_EVENTS\|TCL_DONT_WAIT)) {}
1018		}
	1116	if (deadNSWindow == [NSApp keyWindow]) {
	1117	[NSApp _setKeyWindow:nil];
	1118	[NSApp _setMainWindow:nil];
	1119	}
	1120	[deadNSWindow close];
	1121	[deadNSWindow release];
1019	1122	[NSApp _resetAutoreleasePool];
1020		#if DEBUG_ZOMBIES > 0
	1123
	1124	#if DEBUG_ZOMBIES > 1
1021	1125	fprintf(stderr, "================= Pool dump ===================\n");
1022	1126	[NSAutoreleasePool showPools];
1023	1127	#endif
1024		}
	1128
	1129	}
	1130
	1131	/*
	1132	* Deallocate the wmInfo and clear the wmInfoPtr.
	1133	*/
	1134
1025	1135	ckfree(wmPtr);
1026	1136	winPtr->wmInfoPtr = NULL;
1027	1137	}

1047	1157
1048	1158	void
1049	1159	TkWmSetClass(
1050		TkWindow winPtr) / Newly-created top-level window. */
	1160	TCL_UNUSED(TkWindow )) / Newly-created top-level window. */
1051	1161	{
1052	1162	return;
1053	1163	}

1069	1179	*----------------------------------------------------------------------
1070	1180	*/
1071	1181
1072		/* ARGSUSED */
1073	1182	int
1074	1183	Tk_WmObjCmd(
1075	1184	ClientData clientData, /* Main window associated with interpreter. */

1077	1186	int objc, /* Number of arguments. */
1078	1187	Tcl_Obj const objv[]) / Argument objects. */
1079	1188	{
1080		Tk_Window tkwin = (Tk_Window) clientData;
	1189	Tk_Window tkwin = (Tk_Window)clientData;
1081	1190	static const char *const optionStrings[] = {
1082	1191	"aspect", "attributes", "client", "colormapwindows",
1083	1192	"command", "deiconify", "focusmodel", "forget",

1234	1343
1235	1344	static int
1236	1345	WmAspectCmd(
1237		Tk_Window tkwin, /* Main window of the application. */
	1346	TCL_UNUSED(Tk_Window), /* Main window of the application. */
1238	1347	TkWindow winPtr, / Toplevel to work with */
1239	1348	Tcl_Interp interp, / Current interpreter. */
1240	1349	int objc, /* Number of arguments. */
1241	1350	Tcl_Obj const objv[]) / Argument objects. */
1242	1351	{
1243		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	1352	WmInfo *wmPtr = winPtr->wmInfoPtr;
1244	1353	int numer1, denom1, numer2, denom2;
1245	1354
1246	1355	if ((objc != 3) && (objc != 7)) {

1338	1447	if (Tcl_GetBooleanFromObj(interp, value, &boolean) != TCL_OK) {
1339	1448	return TCL_ERROR;
1340	1449	}
1341		if (boolean != ((wmPtr->flags & WM_FULLSCREEN) != 0)) {
	1450	if (boolean != (([macWindow styleMask] & NSFullScreenWindowMask) != 0)) {
1342	1451	#if !(MAC_OS_X_VERSION_MAX_ALLOWED < 1070)
1343	1452	[macWindow toggleFullScreen:macWindow];
1344	1453	#else

1416	1525	oldFlags, 1, 0);
1417	1526	[macWindow setBackgroundColor:boolean ? [NSColor clearColor] : nil];
1418	1527	[macWindow setOpaque:!boolean];
1419		TkMacOSXInvalidateWindow((MacDrawable *) winPtr->window,
	1528	TkMacOSXInvalidateWindow((MacDrawable *)winPtr->window,
1420	1529	TK_PARENT_WINDOW);
1421	1530	}
1422	1531	break;

1455	1564	result = Tcl_NewDoubleObj([macWindow alphaValue]);
1456	1565	break;
1457	1566	case WMATT_FULLSCREEN:
1458		result = Tcl_NewBooleanObj(wmPtr->flags & WM_FULLSCREEN);
	1567	result = Tcl_NewBooleanObj([macWindow styleMask] & NSFullScreenWindowMask);
1459	1568	break;
1460	1569	case WMATT_MODIFIED:
1461	1570	result = Tcl_NewBooleanObj([macWindow isDocumentEdited]);

1502	1611
1503	1612	static int
1504	1613	WmAttributesCmd(
1505		Tk_Window tkwin, /* Main window of the application. */
	1614	TCL_UNUSED(Tk_Window), /* Main window of the application. */
1506	1615	TkWindow winPtr, / Toplevel to work with */
1507	1616	Tcl_Interp interp, / Current interpreter. */
1508	1617	int objc, /* Number of arguments. */

1512	1621	NSWindow *macWindow;
1513	1622
1514	1623	if (winPtr->window == None) {
1515		Tk_MakeWindowExist((Tk_Window) winPtr);
	1624	Tk_MakeWindowExist((Tk_Window)winPtr);
1516	1625	}
1517	1626	if (!TkMacOSXHostToplevelExists(winPtr)) {
1518	1627	TkMacOSXMakeRealWindowExist(winPtr);
1519	1628	}
1520		macWindow = TkMacOSXDrawableWindow(winPtr->window);
	1629	macWindow = TkMacOSXGetNSWindowForDrawable(winPtr->window);
1521	1630
1522	1631	if (objc == 3) { /* wm attributes $win */
1523	1632	Tcl_Obj *result = Tcl_NewObj();

1574	1683
1575	1684	static int
1576	1685	WmClientCmd(
1577		Tk_Window tkwin, /* Main window of the application. */
	1686	TCL_UNUSED(Tk_Window), /* Main window of the application. */
1578	1687	TkWindow winPtr, / Toplevel to work with */
1579	1688	Tcl_Interp interp, / Current interpreter. */
1580	1689	int objc, /* Number of arguments. */
1581	1690	Tcl_Obj const objv[]) / Argument objects. */
1582	1691	{
1583		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	1692	WmInfo *wmPtr = winPtr->wmInfoPtr;
1584	1693	char *argv3;
1585	1694	int length;
1586	1695

1606	1715	if (wmPtr->clientMachine != NULL) {
1607	1716	ckfree(wmPtr->clientMachine);
1608	1717	}
1609		wmPtr->clientMachine = ckalloc(length + 1);
	1718	wmPtr->clientMachine = (char *)ckalloc(length + 1);
1610	1719	strcpy(wmPtr->clientMachine, argv3);
1611	1720	return TCL_OK;
1612	1721	}

1636	1745	int objc, /* Number of arguments. */
1637	1746	Tcl_Obj const objv[]) / Argument objects. */
1638	1747	{
1639		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	1748	WmInfo *wmPtr = winPtr->wmInfoPtr;
1640	1749	TkWindow *cmapList, winPtr2;
1641	1750	int i, windowObjc, gotToplevel = 0;
1642	1751	Tcl_Obj *windowObjv, resultObj;

1646	1755	return TCL_ERROR;
1647	1756	}
1648	1757	if (objc == 3) {
1649		Tk_MakeWindowExist((Tk_Window) winPtr);
	1758	Tk_MakeWindowExist((Tk_Window)winPtr);
1650	1759	resultObj = Tcl_NewObj();
1651	1760	for (i = 0; i < wmPtr->cmapCount; i++) {
1652	1761	if ((i == (wmPtr->cmapCount-1))

1654	1763	break;
1655	1764	}
1656	1765	Tcl_ListObjAppendElement(NULL, resultObj,
1657		TkNewWindowObj((Tk_Window) wmPtr->cmapList[i]));
	1766	TkNewWindowObj((Tk_Window)wmPtr->cmapList[i]));
1658	1767	}
1659	1768	Tcl_SetObjResult(interp, resultObj);
1660	1769	return TCL_OK;

1663	1772	!= TCL_OK) {
1664	1773	return TCL_ERROR;
1665	1774	}
1666		cmapList = ckalloc((windowObjc+1) * sizeof(TkWindow*));
	1775	cmapList = (TkWindow *)ckalloc((windowObjc+1) sizeof(TkWindow*));
1667	1776	for (i = 0; i < windowObjc; i++) {
1668	1777	if (TkGetWindowFromObj(interp, tkwin, windowObjv[i],
1669	1778	(Tk_Window *) &winPtr2) != TCL_OK) {

1674	1783	gotToplevel = 1;
1675	1784	}
1676	1785	if (winPtr2->window == None) {
1677		Tk_MakeWindowExist((Tk_Window) winPtr2);
	1786	Tk_MakeWindowExist((Tk_Window)winPtr2);
1678	1787	}
1679	1788	cmapList[i] = winPtr2;
1680	1789	}

1693	1802	wmPtr->cmapCount = windowObjc;
1694	1803
1695	1804	/*
1696		* On the Macintosh all of this is just an excercise in compatability as
	1805	* On the Macintosh all of this is just an excercise in compatibility as
1697	1806	* we don't support colormaps. If we did they would be installed here.
1698	1807	*/
1699	1808

1719	1828
1720	1829	static int
1721	1830	WmCommandCmd(
1722		Tk_Window tkwin, /* Main window of the application. */
	1831	TCL_UNUSED(Tk_Window), /* Main window of the application. */
1723	1832	TkWindow winPtr, / Toplevel to work with */
1724	1833	Tcl_Interp interp, / Current interpreter. */
1725	1834	int objc, /* Number of arguments. */
1726	1835	Tcl_Obj const objv[]) / Argument objects. */
1727	1836	{
1728		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	1837	WmInfo *wmPtr = winPtr->wmInfoPtr;
1729	1838	int len;
1730	1839
1731	1840	if ((objc != 3) && (objc != 4)) {

1776	1885
1777	1886	static int
1778	1887	WmDeiconifyCmd(
1779		Tk_Window tkwin, /* Main window of the application. */
	1888	TCL_UNUSED(Tk_Window), /* Main window of the application. */
1780	1889	TkWindow winPtr, / Toplevel to work with */
1781	1890	Tcl_Interp interp, / Current interpreter. */
1782	1891	int objc, /* Number of arguments. */
1783	1892	Tcl_Obj const objv[]) / Argument objects. */
1784	1893	{
1785		register WmInfo *wmPtr = winPtr->wmInfoPtr;
1786		NSWindow *win = TkMacOSXDrawableWindow(winPtr->window);
	1894	WmInfo *wmPtr = winPtr->wmInfoPtr;
	1895	NSWindow *win = TkMacOSXGetNSWindowForDrawable(winPtr->window);
1787	1896
1788	1897	if (objc != 3) {
1789	1898	Tcl_WrongNumArgs(interp, 2, objv, "window");
1790	1899	return TCL_ERROR;
1791	1900	}
1792
1793	1901	if (wmPtr->iconFor != NULL) {
1794	1902	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
1795	1903	"can't deiconify %s: it is an icon for %s",

1808	1916	ZoomState : NormalState);
1809	1917	[win setExcludedFromWindowsMenu:NO];
1810	1918	TkMacOSXApplyWindowAttributes(winPtr, win);
1811		[win orderFront:nil];
	1919	[win orderFront:NSApp];
1812	1920	if (wmPtr->icon) {
1813	1921	Tk_UnmapWindow((Tk_Window)wmPtr->icon);
1814	1922	}
1815	1923
1816	1924	/*
1817	1925	* If this window has a transient, the transient must also be deiconified if
1818		* it was withdrawn by the master.
	1926	* it was withdrawn by the container.
1819	1927	*/
1820	1928
1821	1929	for (Transient *transientPtr = wmPtr->transientPtr;
1822	1930	transientPtr != NULL; transientPtr = transientPtr->nextPtr) {
1823	1931	TkWindow *winPtr2 = transientPtr->winPtr;
1824	1932	WmInfo *wmPtr2 = winPtr2->wmInfoPtr;
1825		TkWindow masterPtr = (TkWindow ) TkGetTransientMaster(winPtr2);
1826
1827		if (masterPtr == winPtr) {
	1933	TkWindow containerPtr = (TkWindow )TkMacOSXGetContainer(winPtr2);
	1934
	1935	if (containerPtr == winPtr) {
1828	1936	if ((wmPtr2->hints.initial_state == WithdrawnState) &&
1829		((transientPtr->flags & WITHDRAWN_BY_MASTER) != 0)) {
	1937	((transientPtr->flags & WITHDRAWN_BY_CONTAINER) != 0)) {
1830	1938	TkpWmSetState(winPtr2, NormalState);
1831		transientPtr->flags &= ~WITHDRAWN_BY_MASTER;
	1939	transientPtr->flags &= ~WITHDRAWN_BY_CONTAINER;
1832	1940	}
1833	1941	}
1834	1942	}

1855	1963
1856	1964	static int
1857	1965	WmFocusmodelCmd(
1858		Tk_Window tkwin, /* Main window of the application. */
	1966	TCL_UNUSED(Tk_Window), /* Main window of the application. */
1859	1967	TkWindow winPtr, / Toplevel to work with */
1860	1968	Tcl_Interp interp, / Current interpreter. */
1861	1969	int objc, /* Number of arguments. */
1862	1970	Tcl_Obj const objv[]) / Argument objects. */
1863	1971	{
1864		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	1972	WmInfo *wmPtr = winPtr->wmInfoPtr;
1865	1973	static const char *const optionStrings[] = {
1866	1974	"active", "passive", NULL };
1867	1975	enum options {

1909	2017
1910	2018	static int
1911	2019	WmForgetCmd(
1912		Tk_Window tkwin, /* Main window of the application. */
	2020	TCL_UNUSED(Tk_Window), /* Main window of the application. */
1913	2021	TkWindow winPtr, / Toplevel or Frame to work with */
1914		Tcl_Interp interp, / Current interpreter. */
1915		int objc, /* Number of arguments. */
1916		Tcl_Obj const objv[]) / Argument objects. */
1917		{
1918		register Tk_Window frameWin = (Tk_Window) winPtr;
	2022	TCL_UNUSED(Tcl_Interp ), / Current interpreter. */
	2023	TCL_UNUSED(int), /* Number of arguments. */
	2024	TCL_UNUSED(Tcl_Obj const )) /* Argument objects. */
	2025	{
	2026	Tk_Window frameWin = (Tk_Window)winPtr;
1919	2027
1920	2028	if (Tk_IsTopLevel(frameWin)) {
1921	2029	MacDrawable *macWin;

1923	2031	Tk_MakeWindowExist(frameWin);
1924	2032	Tk_MakeWindowExist((Tk_Window)winPtr->parentPtr);
1925	2033
1926		macWin = (MacDrawable *) winPtr->window;
	2034	macWin = (MacDrawable *)winPtr->window;
1927	2035
1928	2036	TkFocusJoin(winPtr);
1929	2037	Tk_UnmapWindow(frameWin);

1934	2042	macWin->flags &= ~TK_HOST_EXISTS;
1935	2043
1936	2044	TkWmDeadWindow(winPtr);
1937		RemapWindows(winPtr, (MacDrawable *) winPtr->parentPtr->window);
	2045	RemapWindows(winPtr, (MacDrawable *)winPtr->parentPtr->window);
1938	2046
1939	2047	/*
1940	2048	* Make sure wm no longer manages this window

1975	2083
1976	2084	static int
1977	2085	WmFrameCmd(
1978		Tk_Window tkwin, /* Main window of the application. */
	2086	TCL_UNUSED(Tk_Window), /* Main window of the application. */
1979	2087	TkWindow winPtr, / Toplevel to work with */
1980	2088	Tcl_Interp interp, / Current interpreter. */
1981	2089	int objc, /* Number of arguments. */
1982	2090	Tcl_Obj const objv[]) / Argument objects. */
1983	2091	{
1984		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	2092	WmInfo *wmPtr = winPtr->wmInfoPtr;
1985	2093	Window window;
1986	2094	char buf[TCL_INTEGER_SPACE];
1987	2095

1991	2099	}
1992	2100	window = wmPtr->reparent;
1993	2101	if (window == None) {
1994		window = Tk_WindowId((Tk_Window) winPtr);
	2102	window = Tk_WindowId((Tk_Window)winPtr);
1995	2103	}
1996	2104	sprintf(buf, "0x%" TCL_Z_MODIFIER "x", (size_t)window);
1997	2105	Tcl_SetObjResult(interp, Tcl_NewStringObj(buf, -1));

2017	2125
2018	2126	static int
2019	2127	WmGeometryCmd(
2020		Tk_Window tkwin, /* Main window of the application. */
	2128	TCL_UNUSED(Tk_Window), /* Main window of the application. */
2021	2129	TkWindow winPtr, / Toplevel to work with */
2022	2130	Tcl_Interp interp, / Current interpreter. */
2023	2131	int objc, /* Number of arguments. */
2024	2132	Tcl_Obj const objv[]) / Argument objects. */
2025	2133	{
2026		register WmInfo *wmPtr = winPtr->wmInfoPtr;
2027		NSWindow *win = TkMacOSXDrawableWindow(winPtr->window);
	2134	WmInfo *wmPtr = winPtr->wmInfoPtr;
	2135	NSWindow *win = TkMacOSXGetNSWindowForDrawable(winPtr->window);
2028	2136	char xSign = '+', ySign = '+';
2029	2137	int width, height, x = wmPtr->x, y= wmPtr->y;
2030	2138	char *argv3;

2088	2196
2089	2197	static int
2090	2198	WmGridCmd(
2091		Tk_Window tkwin, /* Main window of the application. */
	2199	TCL_UNUSED(Tk_Window), /* Main window of the application. */
2092	2200	TkWindow winPtr, / Toplevel to work with */
2093	2201	Tcl_Interp interp, / Current interpreter. */
2094	2202	int objc, /* Number of arguments. */
2095	2203	Tcl_Obj const objv[]) / Argument objects. */
2096	2204	{
2097		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	2205	WmInfo *wmPtr = winPtr->wmInfoPtr;
2098	2206	int reqWidth, reqHeight, widthInc, heightInc;
2099	2207	const char *errorMsg;
2100	2208

2150	2258	errorMsg = "heightInc can't be <= 0";
2151	2259	goto error;
2152	2260	}
2153		Tk_SetGrid((Tk_Window) winPtr, reqWidth, reqHeight, widthInc,
	2261	Tk_SetGrid((Tk_Window)winPtr, reqWidth, reqHeight, widthInc,
2154	2262	heightInc);
2155	2263	}
2156	2264	wmPtr->flags \|= WM_UPDATE_SIZE_HINTS;

2188	2296	int objc, /* Number of arguments. */
2189	2297	Tcl_Obj const objv[]) / Argument objects. */
2190	2298	{
2191		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	2299	WmInfo *wmPtr = winPtr->wmInfoPtr;
2192	2300	Tk_Window tkwin2;
2193	2301	char *argv3;
2194	2302	int length;

2221	2329	}
2222	2330	wmPtr->hints.window_group = Tk_WindowId(tkwin2);
2223	2331	wmPtr->hints.flags \|= WindowGroupHint;
2224		wmPtr->leaderName = ckalloc(length + 1);
	2332	wmPtr->leaderName = (char *)ckalloc(length + 1);
2225	2333	strcpy(wmPtr->leaderName, argv3);
2226	2334	}
2227	2335	return TCL_OK;

2246	2354
2247	2355	static int
2248	2356	WmIconbitmapCmd(
2249		Tk_Window tkwin, /* Main window of the application. */
	2357	TCL_UNUSED(Tk_Window), /* Main window of the application. */
2250	2358	TkWindow winPtr, / Toplevel to work with */
2251	2359	Tcl_Interp interp, / Current interpreter. */
2252	2360	int objc, /* Number of arguments. */
2253	2361	Tcl_Obj const objv[]) / Argument objects. */
2254	2362	{
2255		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	2363	WmInfo *wmPtr = winPtr->wmInfoPtr;
2256	2364	Pixmap pixmap;
2257	2365	char *str;
2258	2366	int len;

2271	2379	}
2272	2380	str = Tcl_GetStringFromObj(objv[3], &len);
2273	2381	if (winPtr->window == None) {
2274		Tk_MakeWindowExist((Tk_Window) winPtr);
	2382	Tk_MakeWindowExist((Tk_Window)winPtr);
2275	2383	}
2276	2384	if (!TkMacOSXHostToplevelExists(winPtr)) {
2277	2385	TkMacOSXMakeRealWindowExist(winPtr);
2278	2386	}
2279		if (WmSetAttribute(winPtr, TkMacOSXDrawableWindow(winPtr->window), interp,
	2387	if (WmSetAttribute(winPtr, TkMacOSXGetNSWindowForDrawable(winPtr->window), interp,
2280	2388	WMATT_TITLEPATH, objv[3]) == TCL_OK) {
2281	2389	if (!len) {
2282	2390	if (wmPtr->hints.icon_pixmap != None) {

2286	2394	wmPtr->hints.flags &= ~IconPixmapHint;
2287	2395	}
2288	2396	} else {
2289		pixmap = Tk_GetBitmap(interp, (Tk_Window) winPtr, Tk_GetUid(str));
	2397	pixmap = Tk_GetBitmap(interp, (Tk_Window)winPtr, Tk_GetUid(str));
2290	2398	if (pixmap == None) {
2291	2399	return TCL_ERROR;
2292	2400	}

2315	2423
2316	2424	static int
2317	2425	WmIconifyCmd(
2318		Tk_Window tkwin, /* Main window of the application. */
	2426	TCL_UNUSED(Tk_Window), /* Main window of the application. */
2319	2427	TkWindow winPtr, / Toplevel to work with */
2320	2428	Tcl_Interp interp, / Current interpreter. */
2321	2429	int objc, /* Number of arguments. */
2322	2430	Tcl_Obj const objv[]) / Argument objects. */
2323	2431	{
2324		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	2432	WmInfo *wmPtr = winPtr->wmInfoPtr;
2325	2433	if (objc != 3) {
2326	2434	Tcl_WrongNumArgs(interp, 2, objv, "window");
2327	2435	return TCL_ERROR;
2328	2436	}
2329	2437
2330		if (Tk_Attributes((Tk_Window) winPtr)->override_redirect) {
	2438	if (Tk_Attributes((Tk_Window)winPtr)->override_redirect) {
2331	2439	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
2332	2440	"can't iconify \"%s\": override-redirect flag is set",
2333	2441	winPtr->pathName));
2334	2442	Tcl_SetErrorCode(interp, "TK", "WM", "ICONIFY", "OVERRIDE_REDIRECT",
2335	2443	NULL);
2336	2444	return TCL_ERROR;
2337		} else if (wmPtr->master != NULL) {
	2445	} else if (wmPtr->container != NULL) {
2338	2446	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
2339	2447	"can't iconify \"%s\": it is a transient", winPtr->pathName));
2340	2448	Tcl_SetErrorCode(interp, "TK", "WM", "ICONIFY", "TRANSIENT", NULL);

2360	2468
2361	2469	/*
2362	2470	* If this window has a transient the transient must be withdrawn when
2363		* the master is iconified.
	2471	* the container is iconified.
2364	2472	*/
2365	2473
2366	2474	for (Transient *transientPtr = wmPtr->transientPtr;
2367	2475	transientPtr != NULL; transientPtr = transientPtr->nextPtr) {
2368	2476	TkWindow *winPtr2 = transientPtr->winPtr;
2369		TkWindow masterPtr = (TkWindow ) TkGetTransientMaster(winPtr2);
2370		if (masterPtr == winPtr &&
	2477	TkWindow containerPtr = (TkWindow )TkMacOSXGetContainer(winPtr2);
	2478	if (containerPtr == winPtr &&
2371	2479	winPtr2->wmInfoPtr->hints.initial_state != WithdrawnState) {
2372	2480	TkpWmSetState(winPtr2, WithdrawnState);
2373		transientPtr->flags \|= WITHDRAWN_BY_MASTER;
	2481	transientPtr->flags \|= WITHDRAWN_BY_CONTAINER;
2374	2482	}
2375	2483	}
2376	2484

2402	2510	int objc, /* Number of arguments. */
2403	2511	Tcl_Obj const objv[]) / Argument objects. */
2404	2512	{
2405		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	2513	WmInfo *wmPtr = winPtr->wmInfoPtr;
2406	2514	Pixmap pixmap;
2407	2515	char *argv3;
2408	2516

2456	2564
2457	2565	static int
2458	2566	WmIconnameCmd(
2459		Tk_Window tkwin, /* Main window of the application. */
	2567	TCL_UNUSED(Tk_Window), /* Main window of the application. */
2460	2568	TkWindow winPtr, / Toplevel to work with */
2461	2569	Tcl_Interp interp, / Current interpreter. */
2462	2570	int objc, /* Number of arguments. */
2463	2571	Tcl_Obj const objv[]) / Argument objects. */
2464	2572	{
2465		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	2573	WmInfo *wmPtr = winPtr->wmInfoPtr;
2466	2574	const char *argv3;
2467	2575	int length;
2468	2576

2481	2589	ckfree(wmPtr->iconName);
2482	2590	}
2483	2591	argv3 = Tcl_GetStringFromObj(objv[3], &length);
2484		wmPtr->iconName = ckalloc(length + 1);
	2592	wmPtr->iconName = (char *)ckalloc(length + 1);
2485	2593	strcpy(wmPtr->iconName, argv3);
2486	2594	if (!(wmPtr->flags & WM_NEVER_MAPPED)) {
2487	2595	XSetIconName(winPtr->display, winPtr->window, wmPtr->iconName);

2533	2641	isDefault = 1;
2534	2642	if (objc == 4) {
2535	2643	Tcl_WrongNumArgs(interp, 2, objv,
2536		"window ?-default? image1 ?image2 ...?");
	2644	"window ?-default? image1 ?image2 ...?");
2537	2645	return TCL_ERROR;
2538	2646	}
2539	2647	}

2565	2673
2566	2674	Tk_SizeOfImage(tk_icon, &width, &height);
2567	2675	if (width != 0 && height != 0) {
2568		newIcon = TkMacOSXGetNSImageWithTkImage(winPtr->display, tk_icon,
	2676	newIcon = TkMacOSXGetNSImageFromTkImage(winPtr->display, tk_icon,
2569	2677	width, height);
2570	2678	}
2571	2679	Tk_FreeImage(tk_icon);

2598	2706
2599	2707	static int
2600	2708	WmIconpositionCmd(
2601		Tk_Window tkwin, /* Main window of the application. */
	2709	TCL_UNUSED(Tk_Window), /* Main window of the application. */
2602	2710	TkWindow winPtr, / Toplevel to work with */
2603	2711	Tcl_Interp interp, / Current interpreter. */
2604	2712	int objc, /* Number of arguments. */
2605	2713	Tcl_Obj const objv[]) / Argument objects. */
2606	2714	{
2607		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	2715	WmInfo *wmPtr = winPtr->wmInfoPtr;
2608	2716	int x, y;
2609	2717
2610	2718	if ((objc != 3) && (objc != 5)) {

2662	2770	int objc, /* Number of arguments. */
2663	2771	Tcl_Obj const objv[]) / Argument objects. */
2664	2772	{
2665		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	2773	WmInfo *wmPtr = winPtr->wmInfoPtr;
2666	2774	Tk_Window tkwin2;
2667	2775	WmInfo *wmPtr2;
2668	2776

2681	2789	if (*Tcl_GetString(objv[3]) == '\0') {
2682	2790	wmPtr->hints.flags &= ~IconWindowHint;
2683	2791	if (wmPtr->icon != NULL) {
2684		wmPtr2 = ((TkWindow *) wmPtr->icon)->wmInfoPtr;
	2792	wmPtr2 = ((TkWindow *)wmPtr->icon)->wmInfoPtr;
2685	2793	wmPtr2->iconFor = NULL;
2686	2794	wmPtr2->hints.initial_state = WithdrawnState;
2687	2795	}

2698	2806	NULL);
2699	2807	return TCL_ERROR;
2700	2808	}
2701		wmPtr2 = ((TkWindow *) tkwin2)->wmInfoPtr;
	2809	wmPtr2 = ((TkWindow *)tkwin2)->wmInfoPtr;
2702	2810	if (wmPtr2->iconFor != NULL) {
2703	2811	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
2704	2812	"%s is already an icon for %s",

2709	2817	if (wmPtr->icon != NULL) {
2710	2818	TkWindow oldIcon = (TkWindow )wmPtr->icon;
2711	2819	WmInfo *wmPtr3 = oldIcon->wmInfoPtr;
2712		NSWindow *win = TkMacOSXDrawableWindow(oldIcon->window);
	2820	NSWindow *win = TkMacOSXGetNSWindowForDrawable(oldIcon->window);
2713	2821
2714	2822	/*
2715	2823	* The old icon should be withdrawn.

2724	2832	wmPtr->hints.icon_window = Tk_WindowId(tkwin2);
2725	2833	wmPtr->hints.flags \|= IconWindowHint;
2726	2834	wmPtr->icon = tkwin2;
2727		wmPtr2->iconFor = (Tk_Window) winPtr;
	2835	wmPtr2->iconFor = (Tk_Window)winPtr;
2728	2836	if (!(wmPtr2->flags & WM_NEVER_MAPPED)) {
2729	2837	/*
2730	2838	* If the window is in normal or zoomed state, the icon should be

2759	2867
2760	2868	static int
2761	2869	WmManageCmd(
2762		Tk_Window tkwin, /* Main window of the application. */
2763		TkWindow winPtr, / Toplevel or Frame to work with */
2764		Tcl_Interp interp, / Current interpreter. */
2765		int objc, /* Number of arguments. */
2766		Tcl_Obj const objv[]) / Argument objects. */
2767		{
2768		register Tk_Window frameWin = (Tk_Window) winPtr;
2769		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	2870	TCL_UNUSED(Tk_Window), /* Main window of the application. */
	2871	TkWindow winPtr, / Toplevel or Frame to work with */
	2872	Tcl_Interp interp, / Current interpreter. */
	2873	TCL_UNUSED(int), /* Number of arguments. */
	2874	TCL_UNUSED(Tcl_Obj const )) /* Argument objects. */
	2875	{
	2876	Tk_Window frameWin = (Tk_Window)winPtr;
	2877	WmInfo *wmPtr = winPtr->wmInfoPtr;
2770	2878
2771	2879	if (!Tk_IsTopLevel(frameWin)) {
2772		MacDrawable macWin = (MacDrawable ) winPtr->window;
	2880	MacDrawable macWin = (MacDrawable )winPtr->window;
2773	2881
2774	2882	if (!Tk_IsManageable(frameWin)) {
2775	2883	Tcl_SetObjResult(interp, Tcl_ObjPrintf(

2779	2887	Tcl_SetErrorCode(interp, "TK", "WM", "MANAGE", NULL);
2780	2888	return TCL_ERROR;
2781	2889	}
	2890
	2891	/*
	2892	* Draw the managed widget at the top left corner of its toplevel.
	2893	* See [4a40c6cace].
	2894	*/
	2895
	2896	if (macWin) {
	2897	winPtr->changes.x -= macWin->xOff;
	2898	winPtr->changes.y -= macWin->yOff;
	2899	XMoveWindow(winPtr->display, winPtr->window, 0, 0);
	2900	}
	2901
2782	2902	TkFocusSplit(winPtr);
2783	2903	Tk_UnmapWindow(frameWin);
2784	2904	if (wmPtr == NULL) {
2785	2905	TkWmNewWindow(winPtr);
2786	2906	if (winPtr->window == None) {
2787		Tk_MakeWindowExist((Tk_Window) winPtr);
2788		macWin = (MacDrawable *) winPtr->window;
	2907	Tk_MakeWindowExist((Tk_Window)winPtr);
	2908	macWin = (MacDrawable *)winPtr->window;
2789	2909	}
2790	2910	}
2791	2911	wmPtr = winPtr->wmInfoPtr;

2823	2943
2824	2944	static int
2825	2945	WmMaxsizeCmd(
2826		Tk_Window tkwin, /* Main window of the application. */
	2946	TCL_UNUSED(Tk_Window), /* Main window of the application. */
2827	2947	TkWindow winPtr, / Toplevel to work with */
2828	2948	Tcl_Interp interp, / Current interpreter. */
2829	2949	int objc, /* Number of arguments. */
2830	2950	Tcl_Obj const objv[]) / Argument objects. */
2831	2951	{
2832		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	2952	WmInfo *wmPtr = winPtr->wmInfoPtr;
2833	2953	int width, height;
2834	2954
2835	2955	if ((objc != 3) && (objc != 5)) {

2877	2997
2878	2998	static int
2879	2999	WmMinsizeCmd(
2880		Tk_Window tkwin, /* Main window of the application. */
	3000	TCL_UNUSED(Tk_Window), /* Main window of the application. */
2881	3001	TkWindow winPtr, / Toplevel to work with */
2882	3002	Tcl_Interp interp, / Current interpreter. */
2883	3003	int objc, /* Number of arguments. */
2884	3004	Tcl_Obj const objv[]) / Argument objects. */
2885	3005	{
2886		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	3006	WmInfo *wmPtr = winPtr->wmInfoPtr;
2887	3007	int width, height;
2888	3008
2889	3009	if ((objc != 3) && (objc != 5)) {

2931	3051
2932	3052	static int
2933	3053	WmOverrideredirectCmd(
2934		Tk_Window tkwin, /* Main window of the application. */
	3054	TCL_UNUSED(Tk_Window), /* Main window of the application. */
2935	3055	TkWindow winPtr, / Toplevel to work with */
2936	3056	Tcl_Interp interp, / Current interpreter. */
2937	3057	int objc, /* Number of arguments. */

2939	3059	{
2940	3060	int flag;
2941	3061	XSetWindowAttributes atts;
2942		TKWindow win = (TKWindow )TkMacOSXDrawableWindow(winPtr->window);
	3062	TKWindow win = (TKWindow )TkMacOSXGetNSWindowForDrawable(winPtr->window);
2943	3063
2944	3064	if ((objc != 3) && (objc != 4)) {
2945	3065	Tcl_WrongNumArgs(interp, 2, objv, "window ?boolean?");

2948	3068
2949	3069	if (objc == 3) {
2950	3070	Tcl_SetObjResult(interp, Tcl_NewBooleanObj(
2951		Tk_Attributes((Tk_Window) winPtr)->override_redirect));
	3071	Tk_Attributes((Tk_Window)winPtr)->override_redirect));
2952	3072	return TCL_OK;
2953	3073	}
2954	3074

2956	3076	return TCL_ERROR;
2957	3077	}
2958	3078	atts.override_redirect = flag ? True : False;
2959		Tk_ChangeWindowAttributes((Tk_Window) winPtr, CWOverrideRedirect, &atts);
2960		ApplyMasterOverrideChanges(winPtr, win);
	3079	Tk_ChangeWindowAttributes((Tk_Window)winPtr, CWOverrideRedirect, &atts);
	3080	ApplyContainerOverrideChanges(winPtr, win);
2961	3081	return TCL_OK;
2962	3082	}
2963	3083

2980	3100
2981	3101	static int
2982	3102	WmPositionfromCmd(
2983		Tk_Window tkwin, /* Main window of the application. */
	3103	TCL_UNUSED(Tk_Window), /* Main window of the application. */
2984	3104	TkWindow winPtr, / Toplevel to work with */
2985	3105	Tcl_Interp interp, / Current interpreter. */
2986	3106	int objc, /* Number of arguments. */
2987	3107	Tcl_Obj const objv[]) / Argument objects. */
2988	3108	{
2989		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	3109	WmInfo *wmPtr = winPtr->wmInfoPtr;
2990	3110	static const char *const optionStrings[] = {
2991	3111	"program", "user", NULL };
2992	3112	enum options {

3046	3166
3047	3167	static int
3048	3168	WmProtocolCmd(
3049		Tk_Window tkwin, /* Main window of the application. */
	3169	TCL_UNUSED(Tk_Window), /* Main window of the application. */
3050	3170	TkWindow winPtr, / Toplevel to work with */
3051	3171	Tcl_Interp interp, / Current interpreter. */
3052	3172	int objc, /* Number of arguments. */
3053	3173	Tcl_Obj const objv[]) / Argument objects. */
3054	3174	{
3055		register WmInfo *wmPtr = winPtr->wmInfoPtr;
3056		register ProtocolHandler protPtr, prevPtr;
	3175	WmInfo *wmPtr = winPtr->wmInfoPtr;
	3176	ProtocolHandler protPtr, prevPtr;
3057	3177	Atom protocol;
3058	3178	char *cmd;
3059	3179	int cmdLength;

3079	3199	return TCL_OK;
3080	3200	}
3081	3201
3082		protocol = Tk_InternAtom((Tk_Window) winPtr, Tcl_GetString(objv[3]));
	3202	protocol = Tk_InternAtom((Tk_Window)winPtr, Tcl_GetString(objv[3]));
3083	3203	if (objc == 4) {
3084	3204	/*
3085	3205	* Return the command to handle a given protocol.

3117	3237	}
3118	3238	cmd = Tcl_GetStringFromObj(objv[4], &cmdLength);
3119	3239	if (cmdLength > 0) {
3120		protPtr = ckalloc(sizeof(ProtocolHandler));
	3240	protPtr = (ProtocolHandler *)ckalloc(sizeof(ProtocolHandler));
3121	3241	protPtr->protocol = protocol;
3122	3242	protPtr->nextPtr = wmPtr->protPtr;
3123	3243	wmPtr->protPtr = protPtr;
3124	3244	protPtr->interp = interp;
3125		protPtr->command = ckalloc(cmdLength+1);
	3245	protPtr->command = (char *)ckalloc(cmdLength+1);
3126	3246	strcpy(protPtr->command, cmd);
3127	3247	}
3128	3248	return TCL_OK;

3147	3267
3148	3268	static int
3149	3269	WmResizableCmd(
3150		Tk_Window tkwin, /* Main window of the application. */
	3270	TCL_UNUSED(Tk_Window), /* Main window of the application. */
3151	3271	TkWindow winPtr, / Toplevel to work with */
3152	3272	Tcl_Interp interp, / Current interpreter. */
3153	3273	int objc, /* Number of arguments. */
3154	3274	Tcl_Obj const objv[]) / Argument objects. */
3155	3275	{
3156		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	3276	WmInfo *wmPtr = winPtr->wmInfoPtr;
3157	3277	int width, height;
3158	3278	UInt64 oldAttributes = wmPtr->attributes;
3159	3279	int oldFlags = wmPtr->flags;

3224	3344
3225	3345	static int
3226	3346	WmSizefromCmd(
3227		Tk_Window tkwin, /* Main window of the application. */
	3347	TCL_UNUSED(Tk_Window), /* Main window of the application. */
3228	3348	TkWindow winPtr, / Toplevel to work with */
3229	3349	Tcl_Interp interp, / Current interpreter. */
3230	3350	int objc, /* Number of arguments. */
3231	3351	Tcl_Obj const objv[]) / Argument objects. */
3232	3352	{
3233		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	3353	WmInfo *wmPtr = winPtr->wmInfoPtr;
3234	3354	static const char *const optionStrings[] = {
3235	3355	"program", "user", NULL };
3236	3356	enum options {

3317	3437	resultObj = Tcl_NewObj();
3318	3438	for (windowPtr = windows; *windowPtr ; windowPtr++) {
3319	3439	Tcl_ListObjAppendElement(NULL, resultObj,
3320		TkNewWindowObj((Tk_Window) *windowPtr));
	3440	TkNewWindowObj((Tk_Window)*windowPtr));
3321	3441	}
3322	3442	Tcl_SetObjResult(interp, resultObj);
3323	3443	ckfree(windows);

3416	3536
3417	3537	static int
3418	3538	WmStateCmd(
3419		Tk_Window tkwin, /* Main window of the application. */
	3539	TCL_UNUSED(Tk_Window), /* Main window of the application. */
3420	3540	TkWindow winPtr, / Toplevel to work with */
3421	3541	Tcl_Interp interp, / Current interpreter. */
3422	3542	int objc, /* Number of arguments. */
3423	3543	Tcl_Obj const objv[]) / Argument objects. */
3424	3544	{
3425		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	3545	WmInfo *wmPtr = winPtr->wmInfoPtr;
3426	3546	static const char *const optionStrings[] = {
3427	3547	"normal", "iconic", "withdrawn", "zoomed", NULL };
3428	3548	enum options {

3466	3586
3467	3587	break;
3468	3588	case OPT_ICONIC:
3469		if (Tk_Attributes((Tk_Window) winPtr)->override_redirect) {
	3589	if (Tk_Attributes((Tk_Window)winPtr)->override_redirect) {
3470	3590	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
3471	3591	"can't iconify \"%s\": override-redirect flag is set",
3472	3592	winPtr->pathName));

3474	3594	"OVERRIDE_REDIRECT", NULL);
3475	3595	return TCL_ERROR;
3476	3596	}
3477		if (wmPtr->master != NULL) {
	3597	if (wmPtr->container != NULL) {
3478	3598	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
3479	3599	"can't iconify \"%s\": it is a transient",
3480	3600	winPtr->pathName));

3536	3656
3537	3657	static int
3538	3658	WmTitleCmd(
3539		Tk_Window tkwin, /* Main window of the application. */
	3659	TCL_UNUSED(Tk_Window), /* Main window of the application. */
3540	3660	TkWindow winPtr, / Toplevel to work with */
3541	3661	Tcl_Interp interp, / Current interpreter. */
3542	3662	int objc, /* Number of arguments. */
3543	3663	Tcl_Obj const objv[]) / Argument objects. */
3544	3664	{
3545		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	3665	WmInfo *wmPtr = winPtr->wmInfoPtr;
3546	3666	char *argv3;
3547	3667	int length;
3548	3668

3590	3710	int objc, /* Number of arguments. */
3591	3711	Tcl_Obj const objv[]) / Argument objects. */
3592	3712	{
3593		register WmInfo *wmPtr = winPtr->wmInfoPtr;
3594		Tk_Window master;
3595		TkWindow masterPtr, w;
	3713	WmInfo *wmPtr = winPtr->wmInfoPtr;
	3714	Tk_Window container;
	3715	TkWindow containerPtr, w;
3596	3716	WmInfo *wmPtr2;
3597	3717	Transient *transient;
3598	3718

3601	3721	return TCL_ERROR;
3602	3722	}
3603	3723	if (objc == 3) {
3604		if (wmPtr->master != NULL) {
	3724	if (wmPtr->container != NULL) {
3605	3725	Tcl_SetObjResult(interp,
3606		Tcl_NewStringObj(Tk_PathName(wmPtr->master), -1));
	3726	Tcl_NewStringObj(Tk_PathName(wmPtr->container), -1));
3607	3727	}
3608	3728	return TCL_OK;
3609	3729	}
3610	3730	if (*Tcl_GetString(objv[3]) == '\0') {
3611	3731	RemoveTransient(winPtr);
3612	3732	} else {
3613		if (TkGetWindowFromObj(interp, tkwin, objv[3], &master) != TCL_OK) {
	3733	if (TkGetWindowFromObj(interp, tkwin, objv[3], &container) != TCL_OK) {
3614	3734	return TCL_ERROR;
3615	3735	}
3616		masterPtr = (TkWindow*) master;
3617		while (!Tk_TopWinHierarchy(masterPtr)) {
	3736	containerPtr = (TkWindow*) container;
	3737	while (!Tk_TopWinHierarchy(containerPtr)) {
3618	3738	/*
3619		* Ensure that the master window is actually a Tk toplevel.
	3739	* Ensure that the container window is actually a Tk toplevel.
3620	3740	*/
3621	3741
3622		masterPtr = masterPtr->parentPtr;
	3742	containerPtr = containerPtr->parentPtr;
3623	3743	}
3624		Tk_MakeWindowExist((Tk_Window)masterPtr);
	3744	Tk_MakeWindowExist((Tk_Window)containerPtr);
3625	3745
3626	3746	if (wmPtr->iconFor != NULL) {
3627	3747	Tcl_SetObjResult(interp, Tcl_ObjPrintf(

3631	3751	return TCL_ERROR;
3632	3752	}
3633	3753
3634		wmPtr2 = masterPtr->wmInfoPtr;
	3754	wmPtr2 = containerPtr->wmInfoPtr;
3635	3755
3636	3756	/*
3637	3757	* Under some circumstances, wmPtr2 is NULL here.

3645	3765	return TCL_ERROR;
3646	3766	}
3647	3767
3648		for (w = masterPtr; w != NULL && w->wmInfoPtr != NULL;
3649		w = (TkWindow *)w->wmInfoPtr->master) {
	3768	for (w = containerPtr; w != NULL && w->wmInfoPtr != NULL;
	3769	w = (TkWindow *)w->wmInfoPtr->container) {
3650	3770	if (w == winPtr) {
3651	3771	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
3652	3772	"setting \"%s\" as master creates a transient/master cycle",
3653		Tk_PathName(masterPtr)));
	3773	Tk_PathName(containerPtr)));
3654	3774	Tcl_SetErrorCode(interp, "TK", "WM", "TRANSIENT", "SELF", NULL);
3655	3775	return TCL_ERROR;
3656	3776	}
3657	3777	}
3658	3778
3659	3779	/*
3660		* Add the transient to the master's list, if it not already there.
	3780	* Add the transient to the container's list, if it not already there.
3661	3781	*/
3662	3782
3663	3783	for (transient = wmPtr2->transientPtr;
3664	3784	transient != NULL && transient->winPtr != winPtr;
3665	3785	transient = transient->nextPtr) {}
3666	3786	if (transient == NULL) {
3667		transient = ckalloc(sizeof(Transient));
	3787	transient = (Transient *)ckalloc(sizeof(Transient));
3668	3788	transient->winPtr = winPtr;
3669	3789	transient->flags = 0;
3670	3790	transient->nextPtr = wmPtr2->transientPtr;

3672	3792	}
3673	3793
3674	3794	/*
3675		* If the master is withdrawn or iconic then withdraw the transient.
	3795	* If the container is withdrawn or iconic then withdraw the transient.
3676	3796	*/
3677	3797
3678	3798	if ((wmPtr2->hints.initial_state == WithdrawnState \|\|
3679	3799	wmPtr2->hints.initial_state == IconicState) &&
3680	3800	wmPtr->hints.initial_state != WithdrawnState) {
3681	3801	TkpWmSetState(winPtr, WithdrawnState);
3682		transient->flags \|= WITHDRAWN_BY_MASTER;
3683		}
3684
3685		wmPtr->master = (Tk_Window) masterPtr;
3686		}
3687		ApplyMasterOverrideChanges(winPtr, NULL);
	3802	transient->flags \|= WITHDRAWN_BY_CONTAINER;
	3803	}
	3804
	3805	wmPtr->container = (Tk_Window)containerPtr;
	3806	}
	3807	ApplyContainerOverrideChanges(winPtr, NULL);
3688	3808	return TCL_OK;
3689	3809	}
3690	3810

3693	3813	*
3694	3814	* RemoveTransient --
3695	3815	*
3696		* Clears the transient's master record and removes the transient from the
3697		* master's list.
	3816	* Clears the transient's container record and removes the transient from the
	3817	* container's list.
3698	3818	*
3699	3819	* Results:
3700	3820	* None
3701	3821	*
3702	3822	* Side effects:
3703		* References to a master are removed from the transient's wmInfo
3704		* structure and references to the transient are removed from its master's
	3823	* References to a container are removed from the transient's wmInfo
	3824	* structure and references to the transient are removed from its container's
3705	3825	* wmInfo.
3706	3826	*
3707	3827	*----------------------------------------------------------------------

3712	3832	TkWindow *winPtr)
3713	3833	{
3714	3834	WmInfo wmPtr = winPtr->wmInfoPtr, wmPtr2;
3715		TkWindow *masterPtr;
	3835	TkWindow *containerPtr;
3716	3836	Transient transPtr, temp;
3717	3837
3718		if (wmPtr == NULL \|\| wmPtr->master == NULL) {
	3838	if (wmPtr == NULL \|\| wmPtr->container == NULL) {
3719	3839	return;
3720	3840	}
3721		masterPtr = (TkWindow*)wmPtr->master;
3722		wmPtr2 = masterPtr->wmInfoPtr;
	3841	containerPtr = (TkWindow *)wmPtr->container;
	3842	wmPtr2 = containerPtr->wmInfoPtr;
3723	3843	if (wmPtr2 == NULL) {
3724	3844	return;
3725	3845	}
3726		wmPtr->master = NULL;
	3846	wmPtr->container= NULL;
3727	3847	transPtr = wmPtr2->transientPtr;
3728	3848	while (transPtr != NULL) {
3729	3849	if (transPtr->winPtr != winPtr) {

3764	3884
3765	3885	static int
3766	3886	WmWithdrawCmd(
3767		Tk_Window tkwin, /* Main window of the application. */
	3887	TCL_UNUSED(Tk_Window), /* Main window of the application. */
3768	3888	TkWindow winPtr, / Toplevel to work with */
3769	3889	Tcl_Interp interp, / Current interpreter. */
3770	3890	int objc, /* Number of arguments. */
3771	3891	Tcl_Obj const objv[]) / Argument objects. */
3772	3892	{
3773		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	3893	WmInfo *wmPtr = winPtr->wmInfoPtr;
3774	3894
3775	3895	if (objc != 3) {
3776	3896	Tcl_WrongNumArgs(interp, 2, objv, "window");

3787	3907
3788	3908	TkpWmSetState(winPtr, WithdrawnState);
3789	3909
3790		NSWindow *win = TkMacOSXDrawableWindow(winPtr->window);
3791		[win orderOut:nil];
3792		[win setExcludedFromWindowsMenu:YES];
3793
3794	3910	/*
3795	3911	* If this window has a transient, the transient must also be withdrawn.
3796	3912	*/

3798	3914	for (Transient *transientPtr = wmPtr->transientPtr;
3799	3915	transientPtr != NULL; transientPtr = transientPtr->nextPtr) {
3800	3916	TkWindow *winPtr2 = transientPtr->winPtr;
3801		TkWindow masterPtr = (TkWindow ) TkGetTransientMaster(winPtr2);
3802
3803		if (masterPtr == winPtr &&
	3917	TkWindow containerPtr = (TkWindow )TkMacOSXGetContainer(winPtr2);
	3918
	3919	if (containerPtr == winPtr &&
3804	3920	winPtr2->wmInfoPtr->hints.initial_state != WithdrawnState) {
3805	3921	TkpWmSetState(winPtr2, WithdrawnState);
3806		transientPtr->flags \|= WITHDRAWN_BY_MASTER;
	3922	transientPtr->flags \|= WITHDRAWN_BY_CONTAINER;
3807	3923	}
3808	3924	}
3809	3925

3860	3976	int widthInc, int heightInc)/* Pixel increments corresponding to a change
3861	3977	* of one grid unit. */
3862	3978	{
3863		TkWindow winPtr = (TkWindow ) tkwin;
	3979	TkWindow winPtr = (TkWindow )tkwin;
3864	3980	WmInfo *wmPtr;
3865	3981
3866	3982	/*

3954	4070	Tk_Window tkwin) /* Token for window that is currently
3955	4071	* controlling gridding. */
3956	4072	{
3957		TkWindow winPtr = (TkWindow ) tkwin;
	4073	TkWindow winPtr = (TkWindow )tkwin;
3958	4074	WmInfo *wmPtr;
3959	4075
3960	4076	/*

4027	4143	Tk_ErrorHandler handler = Tk_CreateErrorHandler(winPtr->display,
4028	4144	-1, -1, -1, NULL, NULL);
4029	4145
4030		Tk_DestroyWindow((Tk_Window) winPtr);
	4146	Tk_DestroyWindow((Tk_Window)winPtr);
4031	4147	Tk_DeleteErrorHandler(handler);
4032	4148	}
4033	4149	if (wmTracing) {
4034	4150	TkMacOSXDbgMsg("TopLevelEventProc: %s deleted", winPtr->pathName);
4035	4151	}
4036	4152	} else if (eventPtr->type == ReparentNotify) {
4037		Tcl_Panic("recieved unwanted reparent event");
	4153	Tcl_Panic("received unwanted reparent event");
4038	4154	}
4039	4155	}
4040	4156

4056	4172	*----------------------------------------------------------------------
4057	4173	*/
4058	4174
4059		/* ARGSUSED */
4060	4175	static void
4061	4176	TopLevelReqProc(
4062		ClientData dummy, /* Not used. */
	4177	TCL_UNUSED(void ), / Not used. */
4063	4178	Tk_Window tkwin) /* Information about window. */
4064	4179	{
4065		TkWindow winPtr = (TkWindow ) tkwin;
	4180	TkWindow winPtr = (TkWindow )tkwin;
4066	4181	WmInfo *wmPtr;
4067	4182
4068	4183	wmPtr = winPtr->wmInfoPtr;

4242	4357
4243	4358	wmPtr->x = wmPtr->y = 0;
4244	4359	wmPtr->flags &= ~(WM_NEGATIVE_X\|WM_NEGATIVE_Y);
4245		Tk_GeometryRequest((Tk_Window) contWinPtr, width, height);
	4360	Tk_GeometryRequest((Tk_Window)contWinPtr, width, height);
4246	4361	}
4247	4362	return;
4248	4363	}

4495	4610	int yPtr) / Where to store y-displacement of (0,0). */
4496	4611	{
4497	4612	int x, y;
4498		TkWindow winPtr = (TkWindow ) tkwin;
	4613	TkWindow winPtr = (TkWindow )tkwin;
4499	4614
4500	4615	/*
4501	4616	* Search back through this window's parents all the way to a top-level

4522	4637
4523	4638	/*
4524	4639	* We do not require that the changes.x & changes.y for a
4525		* non-Tk master window be kept up to date. So we first
4526		* subtract off the possibly bogus values that have been
4527		* added on at the top of this pass through the loop, and
4528		* then call out to the getOffsetProc to give us the
4529		* correct offset.
	4640	* non-Tk container window be kept up to date. So we
	4641	* first subtract off the possibly bogus values that have
	4642	* been added on at the top of this pass through the
	4643	* loop, and then call out to the getOffsetProc to give
	4644	* us the correct offset.
4530	4645	*/
4531	4646
4532	4647	x -= winPtr->changes.x + winPtr->changes.border_width;
4533	4648	y -= winPtr->changes.y + winPtr->changes.border_width;
4534	4649
4535		tkMacOSXEmbedHandler->getOffsetProc((Tk_Window) winPtr,
	4650	tkMacOSXEmbedHandler->getOffsetProc((Tk_Window)winPtr,
4536	4651	&theOffset);
4537	4652
4538	4653	x += theOffset.h;

4659	4774	}
4660	4775	winPtr = nextPtr;
4661	4776	}
4662		if (winPtr->mainPtr != ((TkWindow *) tkwin)->mainPtr) {
	4777	if (winPtr->mainPtr != ((TkWindow *)tkwin)->mainPtr) {
4663	4778	return NULL;
4664	4779	}
4665		return (Tk_Window) winPtr;
	4780	return (Tk_Window)winPtr;
4666	4781	}
4667	4782
4668	4783	/*

4702	4817	int x, y; /* Coordinates in winPtr. */
4703	4818	Window children; / Children of winPtr, or NULL. */
4704	4819
4705		winPtr = (TkWindow *) tkwin;
	4820	winPtr = (TkWindow *)tkwin;
4706	4821	x = rootX;
4707	4822	y = rootY;
4708	4823	while (1) {

4755	4870	}
4756	4871	*newX = x;
4757	4872	*newY = y;
4758		return (Tk_Window) winPtr;
	4873	return (Tk_Window)winPtr;
4759	4874	}
4760	4875
4761	4876	/*

4856	4971	int *heightPtr)
4857	4972	{
4858	4973	WmInfo *wmPtr;
4859		TkWindow winPtr = (TkWindow ) tkwin;
	4974	TkWindow winPtr = (TkWindow )tkwin;
4860	4975
4861	4976	/*
4862	4977	* Find the top-level window for tkwin, and locate the window manager

4907	5022	Tk_Window tkwin, /* Window to move. */
4908	5023	int x, int y) /* New location for window (within parent). */
4909	5024	{
4910		TkWindow winPtr = (TkWindow ) tkwin;
	5025	TkWindow winPtr = (TkWindow )tkwin;
4911	5026	WmInfo *wmPtr = winPtr->wmInfoPtr;
4912	5027
4913	5028	if (!(winPtr->flags & TK_TOP_LEVEL)) {

4977	5092	wmPtr->hints.initial_state == WithdrawnState) {
4978	5093	return;
4979	5094	}
4980		macWindow = TkMacOSXDrawableWindow(winPtr->window);
	5095	macWindow = TkMacOSXGetNSWindowForDrawable(winPtr->window);
4981	5096	if (macWindow == nil) {
4982	5097	return;
4983	5098	}

4993	5108	otherWmPtr->hints.initial_state == WithdrawnState) {
4994	5109	return;
4995	5110	}
4996		otherMacWindow = TkMacOSXDrawableWindow(otherPtr->window);
	5111	otherMacWindow = TkMacOSXGetNSWindowForDrawable(otherPtr->window);
4997	5112	if (otherMacWindow == nil) {
4998	5113	return;
4999	5114	}

5082	5197	* add the toplevel itself as the last element of the list.
5083	5198	*/
5084	5199
5085		newPtr = ckalloc((count+2) * sizeof(TkWindow *));
	5200	newPtr = (TkWindow *)ckalloc((count+2) sizeof(TkWindow *));
5086	5201	if (count > 0) {
5087	5202	memcpy(newPtr, oldPtr, count * sizeof(TkWindow *));
5088	5203	}

5099	5214	topPtr->wmInfoPtr->cmapCount = count+1;
5100	5215
5101	5216	/*
5102		* On the Macintosh all of this is just an excercise in compatability as
	5217	* On the Macintosh all of this is just an excercise in compatibility as
5103	5218	* we don't support colormaps. If we did they would be installed here.
5104	5219	*/
5105	5220	}

5194	5309
5195	5310	void
5196	5311	TkGetPointerCoords(
5197		Tk_Window tkwin, /* Toplevel window that identifies screen on
	5312	TCL_UNUSED(Tk_Window), /* Toplevel window that identifies screen on
5198	5313	* which lookup is to be done. */
5199	5314	int xPtr, int yPtr) /* Store pointer coordinates here. */
5200	5315	{

5302	5417
5303	5418	int
5304	5419	TkMacOSXGrowToplevel(
5305		void *whichWindow,
5306		XPoint start)
	5420	TCL_UNUSED(void *),
	5421	TCL_UNUSED(XPoint))
5307	5422	{
5308	5423	return false;
5309	5424	}

5335	5450	}
5336	5451
5337	5452	NSString *title = [[NSString alloc] initWithUTF8String:titleUid];
5338		[TkMacOSXDrawableWindow(winPtr->window) setTitle:title];
	5453	[TkMacOSXGetNSWindowForDrawable(winPtr->window) setTitle:title];
5339	5454	[title release];
5340	5455	}
5341	5456
5342	5457	/*
5343	5458	*----------------------------------------------------------------------
5344	5459	*
5345		* TkGetTransientMaster --
	5460	* TkMacOSXGetContainer --
5346	5461	*
5347	5462	* If the passed window has the TRANSIENT_FOR property set this will
5348		* return the master window. Otherwise it will return None.
5349		*
5350		* Results:
5351		* The master window or None.
	5463	* return the container window. Otherwise it will return None.
	5464	*
	5465	* Results:
	5466	* The container window or None.
5352	5467	*
5353	5468	* Side effects:
5354	5469	* None.

5357	5472	*/
5358	5473
5359	5474	Tk_Window
5360		TkGetTransientMaster(
	5475	TkMacOSXGetContainer(
5361	5476	TkWindow *winPtr)
5362	5477	{
5363	5478	if (winPtr->wmInfoPtr != NULL) {
5364		return (Tk_Window)winPtr->wmInfoPtr->master;
	5479	return (Tk_Window)winPtr->wmInfoPtr->container;
5365	5480	}
5366	5481	return NULL;
5367	5482	}

5371	5486	*
5372	5487	* TkMacOSXGetXWindow --
5373	5488	*
5374		* Returns the X window Id associated with the given NSWindow*.
	5489	* Stub function that returns the X window Id associated with the
	5490	* given NSWindow*.
5375	5491	*
5376	5492	* Results:
5377	5493	* The window id is returned. None is returned if not a Tk window.

5386	5502	TkMacOSXGetXWindow(
5387	5503	void *macWinPtr)
5388	5504	{
5389		Tcl_HashEntry *hPtr;
5390
5391		if (!macWinPtr \|\| !windowHashInit) {
5392		return None;
5393		}
5394		hPtr = Tcl_FindHashEntry(&windowTable, macWinPtr);
5395		if (hPtr == NULL) {
5396		return None;
5397		}
5398		return (Window) Tcl_GetHashValue(hPtr);
5399		}
5400
5401		/*
5402		*----------------------------------------------------------------------
5403		*
5404		* TkMacOSXGetTkWindow --
5405		*
5406		* Returns the TkWindow* associated with the given NSWindow*.
5407		*
5408		* Results:
5409		* The TkWindow* returned. NULL is returned if not a Tk window.
	5505	Window window = None;
	5506	TKWindow w = (TKWindow )macWinPtr;
	5507	if ([w respondsToSelector: @selector (tkWindow)]) {
	5508	window = [w tkWindow];
	5509	}
	5510	return window ? window : None;
	5511	}
	5512
	5513	/*
	5514	*----------------------------------------------------------------------
	5515	*
	5516	* Tk_MacOSXGetTkWindow --
	5517	*
	5518	* Returns the Tk_Window associated with the given NSWindow*. This
	5519	* function is a stub, so the NSWindow* parameter must be declared as
	5520	* void*.
	5521	*
	5522	* Results:
	5523	* A Tk_Window, or NULL if the NSWindow is not associated with
	5524	* any Tk window.
5410	5525	*
5411	5526	* Side effects:
5412	5527	* None.

5414	5529	*----------------------------------------------------------------------
5415	5530	*/
5416	5531
5417		TkWindow*
5418		TkMacOSXGetTkWindow(
5419		NSWindow *w)
5420		{
5421		Window window = TkMacOSXGetXWindow(w);
	5532	Tk_Window
	5533	Tk_MacOSXGetTkWindow(
	5534	void *w)
	5535	{
	5536	Window window = None;
5422	5537	TkDisplay *dispPtr = TkGetDisplayList();
5423
	5538	if ([(NSWindow *)w respondsToSelector: @selector (tkWindow)]) {
	5539	window = [(TKWindow *)w tkWindow];
	5540	}
5424	5541	return (window != None ?
5425		(TkWindow *)Tk_IdToWindow(dispPtr->display, window) : NULL);
	5542	Tk_IdToWindow(dispPtr->display, window) : NULL);
5426	5543	}
5427	5544
5428	5545	/*

5447	5564	TkMacOSXIsWindowZoomed(
5448	5565	TkWindow *winPtr)
5449	5566	{
5450		NSWindow *macWindow = TkMacOSXDrawableWindow(winPtr->window);
	5567	NSWindow *macWindow = TkMacOSXGetNSWindowForDrawable(winPtr->window);
5451	5568	return [macWindow isZoomed];
5452	5569	}
5453	5570

5520	5637	*----------------------------------------------------------------------
5521	5638	*/
5522	5639
5523		/* ARGSUSED */
5524	5640	int
5525	5641	TkUnsupported1ObjCmd(
5526	5642	ClientData clientData, /* Main window associated with interpreter. */

5567	5683	}
5568	5684	return WmWinStyle(interp, winPtr, objc, objv);
5569	5685	case TKMWS_TABID:
5570		if ([NSApp macMinorVersion] < 12) {
	5686	if ([NSApp macOSVersion] < 101200) {
5571	5687	Tcl_SetObjResult(interp, Tcl_NewStringObj(
5572	5688	"Tabbing identifiers did not exist until OSX 10.12.", -1));
5573	5689	Tcl_SetErrorCode(interp, "TK", "WINDOWSTYLE", "TABBINGID", NULL);

5579	5695	}
5580	5696	return WmWinTabbingId(interp, winPtr, objc, objv);
5581	5697	case TKMWS_APPEARANCE:
5582		if ([NSApp macMinorVersion] < 9) {
	5698	if ([NSApp macOSVersion] < 100900) {
5583	5699	Tcl_SetObjResult(interp, Tcl_NewStringObj(
5584	5700	"Window appearances did not exist until OSX 10.9.", -1));
5585	5701	Tcl_SetErrorCode(interp, "TK", "WINDOWSTYLE", "APPEARANCE", NULL);

5589	5705	Tcl_WrongNumArgs(interp, 2, objv, "window ?appearancename?");
5590	5706	return TCL_ERROR;
5591	5707	}
5592		if (objc == 4 && [NSApp macMinorVersion] < 14) {
	5708	if (objc == 4 && [NSApp macOSVersion] < 101400) {
5593	5709	Tcl_SetObjResult(interp, Tcl_NewStringObj(
5594	5710	"Window appearances cannot be changed before OSX 10.14.",
5595	5711	-1));

5603	5719	return TCL_ERROR;
5604	5720	}
5605	5721	Tcl_SetObjResult(interp, Tcl_NewBooleanObj(
5606		TkMacOSXInDarkMode((Tk_Window) winPtr)));
	5722	TkMacOSXInDarkMode((Tk_Window)winPtr)));
5607	5723	return TCL_OK;
5608	5724	default:
5609	5725	return TCL_ERROR;

5656	5772	{ "altPlain", kAltPlainWindowClass },
5657	5773	{ "simple", kSimpleWindowClass },
5658	5774	{ "drawer", kDrawerWindowClass },
5659		{ NULL }
	5775	{ NULL, 0 }
5660	5776	};
5661	5777	static const struct StrIntMap compositeAttrMap[] = {
5662	5778	{ "none", kWindowNoAttributes },
5663	5779	{ "standardDocument", kWindowStandardDocumentAttributes },
5664	5780	{ "standardFloating", kWindowStandardFloatingAttributes },
5665	5781	{ "fullZoom", kWindowFullZoomAttribute },
5666		{ NULL }
	5782	{ NULL, 0 }
5667	5783	};
5668	5784
5669	5785	/*

5700	5816	{ "moveToActiveSpace", tkMoveToActiveSpaceAttribute },
5701	5817	{ "nonActivating", tkNonactivatingPanelAttribute },
5702	5818	{ "hud", tkHUDWindowAttribute },
5703		{ NULL }
	5819	{ NULL, 0 }
5704	5820	};
5705	5821
5706	5822	int index, i;

5830	5946	#if !(MAC_OS_X_VERSION_MAX_ALLOWED < 101200)
5831	5947	Tcl_Obj *result = NULL;
5832	5948	NSString *idString;
5833		NSWindow *win = TkMacOSXDrawableWindow(winPtr->window);
	5949	NSWindow *win = TkMacOSXGetNSWindowForDrawable(winPtr->window);
5834	5950	if (win) {
5835	5951	idString = win.tabbingIdentifier;
5836	5952	result = Tcl_NewStringObj(idString.UTF8String, [idString length]);
5837	5953	}
5838	5954	if (result == NULL) {
5839		NSLog(@"Failed to read tabbing identifier; try calling update idletasks before getting/setting the tabbing identifier of the window.");
	5955	NSLog(@"Failed to read tabbing identifier; try calling update idletasks"
	5956	" before getting/setting the tabbing identifier of the window.");
5840	5957	return TCL_OK;
5841	5958	}
5842	5959	Tcl_SetObjResult(interp, result);

5920	6037	#endif // MAC_OS_X_VERSION_MAX_ALLOWED >= 101300
5921	6038
5922	6039	const char *resultString = "unrecognized";
5923		NSWindow *win = TkMacOSXDrawableWindow(winPtr->window);
	6040	NSWindow *win = TkMacOSXGetNSWindowForDrawable(winPtr->window);
5924	6041	if (win) {
5925	6042	appearance = win.appearance.name;
5926	6043	if (appearance == nil) {

5995	6112	* is always visible, e.g. as a floating
5996	6113	* menu. */
5997	6114	{
5998		TkWindow winPtr = (TkWindow ) tkwin;
	6115	TkWindow winPtr = (TkWindow )tkwin;
5999	6116
6000	6117	if (transient) {
6001	6118	winPtr->wmInfoPtr->macClass = kSimpleWindowClass;

6032	6149	WmInfo *wmPtr = winPtr->wmInfoPtr;
6033	6150	MacDrawable *macWin;
6034	6151	WindowClass macClass;
6035		Bool overrideRedirect = Tk_Attributes((Tk_Window) winPtr)->override_redirect;
	6152	Bool overrideRedirect = Tk_Attributes((Tk_Window)winPtr)->override_redirect;
6036	6153
6037	6154	if (TkMacOSXHostToplevelExists(winPtr)) {
6038	6155	return;
6039	6156	}
6040	6157
6041		macWin = (MacDrawable *) winPtr->window;
	6158	macWin = (MacDrawable *)winPtr->window;
6042	6159
6043	6160	/*
6044	6161	* If this is embedded, make sure its container's toplevel exists, then

6059	6176	Tcl_Panic("TkMacOSXMakeRealWindowExist could not find container");
6060	6177	}
6061	6178	if (tkMacOSXEmbedHandler->containerExistProc &&
6062		tkMacOSXEmbedHandler->containerExistProc((Tk_Window) winPtr)
	6179	tkMacOSXEmbedHandler->containerExistProc((Tk_Window)winPtr)
6063	6180	!= TCL_OK) {
6064	6181	Tcl_Panic("ContainerExistProc could not make container");
6065	6182	}

6099	6216	NSUnifiedTitleAndToolbarWindowMask : 0) \|
6100	6217	((attributes & kWindowSideTitlebarAttribute) ? 1 << 9 : 0) \|
6101	6218	(attributes >> WM_NSMASK_SHIFT);
6102		Class winClass = (macClass == kDrawerWindowClass ? [NSDrawerWindow class] :
	6219	Class winClass = (macClass == kDrawerWindowClass ? [TKDrawerWindow class] :
6103	6220	(styleMask & (NSUtilityWindowMask\|NSDocModalWindowMask\|
6104		NSNonactivatingPanelMask\|NSHUDWindowMask)) ? [NSPanel class] :
	6221	NSNonactivatingPanelMask\|NSHUDWindowMask)) ? [TKPanel class] :
6105	6222	[TKWindow class]);
6106	6223	NSRect structureRect = [winClass frameRectForContentRect:NSZeroRect
6107	6224	styleMask:styleMask];
6108	6225	NSRect contentRect = NSMakeRect(5 - structureRect.origin.x,
6109	6226	TkMacOSXZeroScreenHeight() - (TkMacOSXZeroScreenTop() + 5 +
6110	6227	structureRect.origin.y + structureRect.size.height + 200), 200, 200);
6111		NSWindow *window = [[winClass alloc] initWithContentRect:contentRect
	6228	if (wmPtr->hints.initial_state == WithdrawnState) {
	6229	}
	6230	TKWindow *window = [[winClass alloc] initWithContentRect:contentRect
6112	6231	styleMask:styleMask backing:NSBackingStoreBuffered defer:YES];
6113	6232	if (!window) {
6114	6233	Tcl_Panic("couldn't allocate new Mac window");

6121	6240	[window setAcceptsMouseMovedEvents:YES];
6122	6241	[window setReleasedWhenClosed:NO];
6123	6242	if (styleMask & NSUtilityWindowMask) {
6124		[(NSPanel*)window setFloatingPanel:YES];
	6243	[(TKPanel*)window setFloatingPanel:YES];
6125	6244	}
6126	6245	if ((styleMask & (NSTexturedBackgroundWindowMask\|NSHUDWindowMask)) &&
6127	6246	!(styleMask & NSDocModalWindowMask)) {

6141	6260	geometry.origin.y = TkMacOSXZeroScreenHeight() - (geometry.origin.y +
6142	6261	geometry.size.height);
6143	6262	[window setFrame:geometry display:YES];
6144		TkMacOSXRegisterOffScreenWindow((Window) macWin, window);
	6263	[window setTkWindow: (Window) macWin];
6145	6264
6146	6265	macWin->flags \|= TK_HOST_EXISTS;
6147	6266	if (overrideRedirect) {
6148	6267	XSetWindowAttributes atts;
6149	6268
6150	6269	atts.override_redirect = True;
6151		Tk_ChangeWindowAttributes((Tk_Window) winPtr, CWOverrideRedirect, &atts);
6152		ApplyMasterOverrideChanges(winPtr, NULL);
6153		}
6154		}
6155
6156		/*
6157		*----------------------------------------------------------------------
6158		*
6159		* TkpDisplayWindow --
6160		*
6161		* Mark the contentView of this window as needing display so the window
6162		* will be drawn by the window manager. If this is called within the
6163		* drawRect method, do nothing.
	6270	Tk_ChangeWindowAttributes((Tk_Window)winPtr, CWOverrideRedirect, &atts);
	6271	ApplyContainerOverrideChanges(winPtr, NULL);
	6272	}
	6273	}
	6274
	6275	/*
	6276	*----------------------------------------------------------------------
	6277	*
	6278	* TkpRedrawWidget --
	6279	*
	6280	* Mark the bounding rectangle of this widget as needing display so the
	6281	* widget will be drawn by [NSView drawRect:]. If this is called within
	6282	* the drawRect method, do nothing.
6164	6283	*
6165	6284	* Results:
6166	6285	* None.
6167	6286	*
6168	6287	* Side effects:
6169		* The window's contentView is marked as needing display.
6170		*
6171		*----------------------------------------------------------------------
6172		*/
6173
6174		MODULE_SCOPE void
6175		TkpDisplayWindow(Tk_Window tkwin) {
6176		if (![NSApp isDrawing]) {
6177		TkWindow winPtr = (TkWindow ) tkwin;
6178		NSWindow *w = TkMacOSXDrawableWindow(winPtr->window);
6179
6180		[[w contentView] setNeedsDisplay: YES];
6181		}
6182		}
6183
6184		/*
6185		*----------------------------------------------------------------------
6186		*
6187		* TkMacOSXRegisterOffScreenWindow --
6188		*
6189		* This function adds the passed in Off Screen Port to the hash table that
6190		* maps Mac windows to root X windows.
6191		*
6192		* Results:
6193		* None.
6194		*
6195		* Side effects:
6196		* An entry is added to the windowTable hash table.
	6288	* The widget's bounding rectangle is marked as dirty.
6197	6289	*
6198	6290	*----------------------------------------------------------------------
6199	6291	*/
6200	6292
6201	6293	void
6202		TkMacOSXRegisterOffScreenWindow(
6203		Window window, /* Window structure. */
6204		void portPtr) / Pointer to a Mac Window. */
6205		{
6206		Tcl_HashEntry *valueHashPtr;
6207		int isNew;
6208
6209		if (!windowHashInit) {
6210		Tcl_InitHashTable(&windowTable, TCL_ONE_WORD_KEYS);
6211		windowHashInit = true;
6212		}
6213		valueHashPtr = Tcl_CreateHashEntry(&windowTable, (char *) portPtr, &isNew);
6214		if (!isNew) {
6215		Tcl_Panic("Same macintosh window allocated twice!");
6216		}
6217		Tcl_SetHashValue(valueHashPtr, window);
6218		}
6219
6220		/*
6221		*----------------------------------------------------------------------
6222		*
6223		* TkMacOSXUnregisterMacWindow --
6224		*
6225		* Given a macintosh port window, this function removes the association
6226		* between this window and the root X window that Tk cares about.
6227		*
6228		* Results:
6229		* None.
6230		*
6231		* Side effects:
6232		* An entry is removed from the windowTable hash table.
6233		*
6234		*----------------------------------------------------------------------
6235		*/
6236
6237		void
6238		TkMacOSXUnregisterMacWindow(
6239		void macWinPtr) / Reference to a Mac Window */
6240		{
6241		Tcl_HashEntry *entryPtr;
6242
6243		if (!windowHashInit) {
6244		Tcl_Panic("TkMacOSXUnregisterMacWindow: unmapping before inited");
6245		}
6246		entryPtr = Tcl_FindHashEntry(&windowTable, macWinPtr);
6247		if (!entryPtr) {
6248		TkMacOSXDbgMsg("Failed to find window %p", macWinPtr);
6249		} else {
6250		Tcl_DeleteHashEntry(entryPtr);
6251		}
6252		}
	6294	TkpRedrawWidget(Tk_Window tkwin) {
	6295	TkWindow winPtr = (TkWindow )tkwin;
	6296	NSWindow *w;
	6297	Rect tkBounds;
	6298	NSRect bounds;
	6299
	6300	if ([NSApp isDrawing]) {
	6301	return;
	6302	}
	6303	w = TkMacOSXGetNSWindowForDrawable(winPtr->window);
	6304	if (w) {
	6305	TKContentView *view = [w contentView];
	6306	TkMacOSXWinBounds(winPtr, &tkBounds);
	6307	bounds = NSMakeRect(tkBounds.left,
	6308	[view bounds].size.height - tkBounds.bottom,
	6309	tkBounds.right - tkBounds.left,
	6310	tkBounds.bottom - tkBounds.top);
	6311	[view setTkNeedsDisplay:YES];
	6312	[view setTkDirtyRect:bounds];
	6313	}
	6314	}
	6315
6253	6316
6254	6317	/*
6255	6318	*----------------------------------------------------------------------

6377	6440	return;
6378	6441	}
6379	6442
6380		macWin = TkMacOSXDrawableWindow(winPtr->window);
	6443	macWin = TkMacOSXGetNSWindowForDrawable(winPtr->window);
6381	6444
6382	6445	if (state == WithdrawnState) {
6383		Tk_UnmapWindow((Tk_Window) winPtr);
	6446	Tk_UnmapWindow((Tk_Window)winPtr);
6384	6447	} else if (state == IconicState) {
	6448
6385	6449	/*
6386	6450	* The window always gets unmapped. If we can show the icon version of
6387	6451	* the window we also collapse it.

6391	6455	![macWin isMiniaturized]) {
6392	6456	[macWin miniaturize:NSApp];
6393	6457	}
6394		Tk_UnmapWindow((Tk_Window) winPtr);
	6458	Tk_UnmapWindow((Tk_Window)winPtr);
6395	6459	} else if (state == NormalState \|\| state == ZoomState) {
6396		Tk_MapWindow((Tk_Window) winPtr);
6397		if (macWin && ([macWin styleMask] & NSMiniaturizableWindowMask) &&
6398		[macWin isMiniaturized]) {
6399		[macWin deminiaturize:NSApp];
6400		}
6401		TkMacOSXZoomToplevel(macWin, state == NormalState ? inZoomIn :
6402		inZoomOut);
6403		}
	6460	Tk_MapWindow((Tk_Window)winPtr);
	6461	[macWin deminiaturize:NSApp];
	6462	[macWin orderFront:NSApp];
	6463	TkMacOSXZoomToplevel(macWin, state == NormalState ? inZoomIn : inZoomOut);
	6464	}
	6465	/*
	6466	* Make sure windows are updated after the state change.
	6467	*/
	6468
	6469	while (Tcl_DoOneEvent(TCL_IDLE_EVENTS)){}
6404	6470	}
6405	6471
6406	6472	/*

6424	6490	void *wRef)
6425	6491	{
6426	6492	return [(NSWindow *)wRef level] == kCGFloatingWindowLevel;
6427		}
6428
6429		/*
6430		*----------------------------------------------------------------------
6431		*
6432		* TkMacOSXWindowClass --
6433		*
6434		* Returns OS X window class of window
6435		*
6436		* Results:
6437		* 1 or 0 depending on window's floating attribute.
6438		*
6439		* Side effects:
6440		* None.
6441		*
6442		*----------------------------------------------------------------------
6443		*/
6444
6445		MODULE_SCOPE WindowClass
6446		TkMacOSXWindowClass(
6447		TkWindow *winPtr)
6448		{
6449		return winPtr->wmInfoPtr->macClass;
6450	6493	}
6451	6494
6452	6495	/*

6528	6571
6529	6572	int
6530	6573	XSetInputFocus(
6531		Display* display,
6532		Window focus,
6533		int revert_to,
6534		Time time)
	6574	TCL_UNUSED(Display *),
	6575	TCL_UNUSED(Window),
	6576	TCL_UNUSED(int),
	6577	TCL_UNUSED(Time))
6535	6578	{
6536	6579	/*
6537	6580	* Don't need to do a thing. Tk manages the focus for us.

6573	6616	}
6574	6617
6575	6618	if (Tk_IsTopLevel(winPtr) && !Tk_IsEmbedded(winPtr)) {
6576		NSWindow *win = TkMacOSXDrawableWindow(winPtr->window);
	6619	NSWindow *win = TkMacOSXGetNSWindowForDrawable(winPtr->window);
6577	6620
6578	6621	TkWmRestackToplevel(winPtr, Above, NULL);
6579	6622	if (force) {

6628	6671	if (Tk_IsMapped(winPtr) && Tk_IsTopLevel(winPtr) && !Tk_IsEmbedded(winPtr)
6629	6672	&& (winPtr->display == display)) {
6630	6673	hPtr = Tcl_CreateHashEntry(table,
6631		(char*) TkMacOSXDrawableWindow(winPtr->window), &newEntry);
	6674	(void *)TkMacOSXGetNSWindowForDrawable(winPtr->window), &newEntry);
6632	6675	Tcl_SetHashValue(hPtr, winPtr);
6633	6676	}
6634	6677

6666	6709	NSArray* backToFront = [[macWindows reverseObjectEnumerator] allObjects];
6667	6710	NSInteger windowCount = [macWindows count];
6668	6711
6669		windows = windowPtr = ckalloc((windowCount + 1) * sizeof(TkWindow *));
	6712	windows = windowPtr = (TkWindow *)ckalloc((windowCount + 1) sizeof(TkWindow *));
6670	6713	if (windows != NULL) {
6671	6714	Tcl_InitHashTable(&table, TCL_ONE_WORD_KEYS);
6672	6715	WmStackorderToplevelWrapperMap(parentPtr, parentPtr->display, &table);

6707	6750	WmInfo *wmPtr = winPtr->wmInfoPtr;
6708	6751
6709	6752	ApplyWindowAttributeFlagChanges(winPtr, macWindow, 0, 0, 0, 1);
6710		if (wmPtr->master != NULL \|\| winPtr->atts.override_redirect) {
6711		ApplyMasterOverrideChanges(winPtr, macWindow);
	6753	if (wmPtr->container != NULL \|\| winPtr->atts.override_redirect) {
	6754	ApplyContainerOverrideChanges(winPtr, macWindow);
6712	6755	}
6713	6756	}
6714	6757

6748	6791	if (!create) {
6749	6792	return;
6750	6793	}
6751		Tk_MakeWindowExist((Tk_Window) winPtr);
	6794	Tk_MakeWindowExist((Tk_Window)winPtr);
6752	6795	}
6753	6796	if (!TkMacOSXHostToplevelExists(winPtr)) {
6754	6797	if (!create) {

6756	6799	}
6757	6800	TkMacOSXMakeRealWindowExist(winPtr);
6758	6801	}
6759		macWindow = TkMacOSXDrawableWindow(winPtr->window);
	6802	macWindow = TkMacOSXGetNSWindowForDrawable(winPtr->window);
6760	6803	}
6761	6804	if ((changedAttributes & kWindowCloseBoxAttribute) \|\| initial) {
6762	6805	[[macWindow standardWindowButton:NSWindowCloseButton]

6833	6876	* after 10.10.
6834	6877	*/
6835	6878
6836		#if !(MAC_OS_X_VERSION_MAX_ALLOWED < 101000)
	6879	#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101100
6837	6880	if (!(macWindow.styleMask & NSUtilityWindowMask)) {
6838	6881	/*
6839	6882	* Exclude overrideredirect, transient, and "help"-styled

6841	6884	*/
6842	6885
6843	6886	if ((winPtr->atts.override_redirect) \|\|
6844		(wmPtr->master != NULL) \|\|
	6887	(wmPtr->container != NULL) \|\|
6845	6888	(winPtr->wmInfoPtr->macClass == kHelpWindowClass)) {
6846	6889	b \|= (NSWindowCollectionBehaviorCanJoinAllSpaces \|
6847	6890	NSWindowCollectionBehaviorFullScreenAuxiliary);
6848	6891	} else {
6849		NSSize screenSize = [[macWindow screen] frame].size;
6850	6892	b \|= NSWindowCollectionBehaviorFullScreenPrimary;
6851	6893
6852	6894	/*

6856	6898	* window. To work around this we make the max size equal
6857	6899	* to the screen size. (For 10.11 and up, only)
6858	6900	*/
6859		if ([NSApp macMinorVersion] > 10) {
	6901
	6902	if ([NSApp macOSVersion] >= 101100) {
	6903	NSSize screenSize = [[macWindow screen] frame].size;
6860	6904	[macWindow setMaxFullScreenContentSize:screenSize];
6861	6905	}
6862	6906	}

6878	6922	if ((wmPtr->flags & WM_TOPMOST) != (oldFlags & WM_TOPMOST)) {
6879	6923	[macWindow setLevel:(wmPtr->flags & WM_TOPMOST) ?
6880	6924	kCGUtilityWindowLevel : ([macWindow isKindOfClass:
6881		[NSPanel class]] && [macWindow isFloatingPanel] ?
	6925	[TKPanel class]] && [macWindow isFloatingPanel] ?
6882	6926	kCGFloatingWindowLevel : kCGNormalWindowLevel)];
6883	6927	}
6884	6928

6899	6943	/*
6900	6944	*----------------------------------------------------------------------
6901	6945	*
6902		* ApplyMasterOverrideChanges --
6903		*
6904		* This procedure applies changes to override_redirect or master.
	6946	* ApplyContainerOverrideChanges --
	6947	*
	6948	* This procedure applies changes to override_redirect or container.
6905	6949	*
6906	6950	* Results:
6907	6951	* None.

6913	6957	*/
6914	6958
6915	6959	static void
6916		ApplyMasterOverrideChanges(
	6960	ApplyContainerOverrideChanges(
6917	6961	TkWindow *winPtr,
6918	6962	NSWindow *macWindow)
6919	6963	{

6926	6970
6927	6971	if (!macWindow && winPtr->window != None &&
6928	6972	TkMacOSXHostToplevelExists(winPtr)) {
6929		macWindow = TkMacOSXDrawableWindow(winPtr->window);
	6973	macWindow = TkMacOSXGetNSWindowForDrawable(winPtr->window);
6930	6974	}
6931	6975	styleMask = [macWindow styleMask];
6932	6976

6940	6984	wmPtr->attributes = macClassAttrs[kSimpleWindowClass].defaultAttrs;
6941	6985	}
6942	6986	wmPtr->attributes \|= kWindowNoActivatesAttribute;
6943		if ([NSApp macMinorVersion] == 6) {
	6987	if ([NSApp macOSVersion] == 100600) {
6944	6988	styleMask = 0;
6945	6989	} else {
6946	6990	styleMask &= ~NSTitledWindowMask;
6947	6991	}
6948	6992	} else {
6949	6993	if (wmPtr->macClass == kSimpleWindowClass &&
6950		oldAttributes == kWindowNoActivatesAttribute) {
	6994	(oldAttributes & kWindowNoActivatesAttribute)) {
6951	6995	wmPtr->macClass = kDocumentWindowClass;
6952	6996	wmPtr->attributes =
6953	6997	macClassAttrs[kDocumentWindowClass].defaultAttrs;
6954	6998	}
6955	6999	wmPtr->attributes &= ~kWindowNoActivatesAttribute;
6956		if ([NSApp macMinorVersion] == 6) {
	7000	if ([NSApp macOSVersion] == 100600) {
6957	7001	styleMask = NSTitledWindowMask \|
6958	7002	NSClosableWindowMask \|
6959	7003	NSMiniaturizableWindowMask \|

6979	7023	[macWindow setExcludedFromWindowsMenu:YES];
6980	7024	[macWindow setStyleMask:styleMask];
6981	7025	if (wmPtr->hints.initial_state == NormalState) {
6982		[macWindow orderFront:nil];
	7026	[macWindow orderFront:NSApp];
6983	7027	}
6984		if (wmPtr->master != NULL) {
	7028	if (wmPtr->container != NULL) {
6985	7029	wmPtr->flags \|= WM_TOPMOST;
6986	7030	} else {
6987	7031	wmPtr->flags &= ~WM_TOPMOST;

6997	7041	[macWindow setExcludedFromWindowsMenu:NO];
6998	7042	wmPtr->flags &= ~WM_TOPMOST;
6999	7043	}
7000		if (wmPtr->master != None) {
7001		TkWindow masterWinPtr = (TkWindow ) wmPtr->master;
7002
7003		if (masterWinPtr && (masterWinPtr->window != None)
7004		&& TkMacOSXHostToplevelExists(masterWinPtr)) {
7005		NSWindow *masterMacWin = TkMacOSXDrawableWindow(
7006		masterWinPtr->window);
	7044	if (wmPtr->container != None) {
	7045	TkWindow containerWinPtr = (TkWindow )wmPtr->container;
	7046
	7047	if (containerWinPtr && (containerWinPtr->window != None)
	7048	&& TkMacOSXHostToplevelExists(containerWinPtr)) {
	7049	NSWindow *containerMacWin = TkMacOSXGetNSWindowForDrawable(
	7050	containerWinPtr->window);
7007	7051
7008	7052	/*
7009	7053	* Try to add the transient window as a child window of the
7010		* master. A child NSWindow retains its relative position with
7011		* respect to the parent when the parent is moved. This is
7012		* pointless if the parent is offscreen, and adding a child to
7013		* an offscreen window causes the parent to be displayed as a
7014		* zombie. So we only do this if the parent is visible.
	7054	* container. A child NSWindow retains its relative position
	7055	* with respect to the parent when the parent is moved. This
	7056	* is pointless if the parent is offscreen, and adding a child
	7057	* to an offscreen window causes the parent to be displayed as
	7058	* a zombie. So we only do this if the parent is visible.
7015	7059	*/
7016	7060
7017		if (masterMacWin && [masterMacWin isVisible]
	7061	if (containerMacWin && [containerMacWin isVisible]
7018	7062	&& (winPtr->flags & TK_MAPPED)) {
7019	7063	/*
7020	7064	* If the transient is already a child of some other window,

7022	7066	*/
7023	7067
7024	7068	parentWindow = [macWindow parentWindow];
7025		if (parentWindow && parentWindow != masterMacWin) {
	7069	if (parentWindow && parentWindow != containerMacWin) {
7026	7070	[parentWindow removeChildWindow:macWindow];
7027	7071	}
7028
7029		[masterMacWin addChildWindow:macWindow
7030		ordered:NSWindowAbove];
	7072	[macWindow orderFront:NSApp];
	7073	[containerMacWin addChildWindow:macWindow
	7074	ordered:NSWindowAbove];
7031	7075	}
7032	7076	}
7033	7077	} else {

7226	7270	*/
7227	7271
7228	7272	if (winPtr->window != None) {
7229		MacDrawable macWin = (MacDrawable ) winPtr->window;
	7273	MacDrawable macWin = (MacDrawable )winPtr->window;
7230	7274
7231	7275	macWin->toplevel->referenceCount--;
7232	7276	macWin->toplevel = parentWin->toplevel;

7243	7287
7244	7288	for (childPtr = winPtr->childList; childPtr != NULL;
7245	7289	childPtr = childPtr->nextPtr) {
7246		RemapWindows(childPtr, (MacDrawable *) winPtr->window);
	7290	RemapWindows(childPtr, (MacDrawable *)winPtr->window);
7247	7291	}
7248	7292	}
7249	7293

+4

-3

macosx/tkMacOSXWm.h less more

36	36	} ProtocolHandler;
37	37
38	38	/* The following data structure is used in the TkWmInfo to maintain a list of all of the
39		* transient windows belonging to a given master.
	39	* transient windows belonging to a given container.
40	40	*/
41	41
42	42	typedef struct Transient {

45	45	struct Transient *nextPtr;
46	46	} Transient;
47	47
	48	#define WITHDRAWN_BY_CONTAINER 0x1
48	49	#define WITHDRAWN_BY_MASTER 0x1
49	50
50	51	/*

64	65	Tk_Uid titleUid; /* Title to display in window caption. If NULL,
65	66	* use name of widget. */
66	67	char iconName; / Name to display in icon. */
67		Tk_Window master; /* Master window for TRANSIENT_FOR property, or
68		* None. */
	68	Tk_Window container; /* Container window for TRANSIENT_FOR property,
	69	* or None. */
69	70	XWMHints hints; /* Various pieces of information for window
70	71	* manager. */
71	72	char leaderName; / Path name of leader of window group

+132

-174

macosx/tkMacOSXXStubs.c less more

200	200	}
201	201	}
202	202
203		display = ckalloc(sizeof(Display));
204		screen = ckalloc(sizeof(Screen));
	203	display = (Display *)ckalloc(sizeof(Display));
	204	screen = (Screen *)ckalloc(sizeof(Screen));
205	205	bzero(display, sizeof(Display));
206	206	bzero(screen, sizeof(Screen));
207	207

249	249	*/
250	250	screen->root = ROOT_ID;
251	251	screen->display = display;
252		screen->black_pixel = 0x00000000 \| PIXEL_MAGIC << 24;
253		screen->white_pixel = 0x00FFFFFF \| PIXEL_MAGIC << 24;
	252	screen->black_pixel = 0x00000000;
	253	screen->white_pixel = 0x00FFFFFF;
254	254	screen->ext_data = (XExtData *) &maxBounds;
255	255
256		screen->root_visual = ckalloc(sizeof(Visual));
	256	screen->root_visual = (Visual *)ckalloc(sizeof(Visual));
257	257	screen->root_visual->visualid = 0;
258	258	screen->root_visual->c_class = TrueColor;
259	259	screen->root_visual->red_mask = 0x00FF0000;

268	268
269	269	TkMacOSXDisplayChanged(display);
270	270
271		gMacDisplay = ckalloc(sizeof(TkDisplay));
	271	gMacDisplay = (TkDisplay *)ckalloc(sizeof(TkDisplay));
272	272
273	273	/*
274	274	* This is the quickest way to make sure that all the *Init flags get

386	386
387	387	static XID
388	388	MacXIdAlloc(
389		Display display) / Display for which to allocate. */
	389	TCL_UNUSED(Display )) / Display for which to allocate. */
390	390	{
391	391	static long int cur_id = 100;
392	392	/*

416	416
417	417	static int
418	418	DefaultErrorHandler(
419		Display* display,
420		XErrorEvent* err_evt)
	419	TCL_UNUSED(Display *),
	420	TCL_UNUSED(XErrorEvent *))
421	421	{
422	422	/*
423	423	* This call should never be called. Tk replaces it with its own error

430	430
431	431	char *
432	432	XGetAtomName(
433		Display * display,
434		Atom atom)
	433	Display *display,
	434	TCL_UNUSED(Atom))
435	435	{
436	436	display->request++;
437	437	return NULL;

439	439
440	440	XErrorHandler
441	441	XSetErrorHandler(
442		XErrorHandler handler)
	442	TCL_UNUSED(XErrorHandler))
443	443	{
444	444	return DefaultErrorHandler;
445	445	}

447	447	Window
448	448	XRootWindow(
449	449	Display *display,
450		int screen_number)
	450	TCL_UNUSED(int))
451	451	{
452	452	display->request++;
453	453	return ROOT_ID;

465	465	unsigned int *border_width_return,
466	466	unsigned int *depth_return)
467	467	{
468		TkWindow winPtr = ((MacDrawable ) d)->winPtr;
	468	TkWindow winPtr = ((MacDrawable )d)->winPtr;
469	469
470	470	display->request++;
471	471	*root_return = ROOT_ID;

477	477	*border_width_return = winPtr->changes.border_width;
478	478	*depth_return = Tk_Depth(winPtr);
479	479	} else {
480		CGSize size = ((MacDrawable *) d)->size;
	480	CGSize size = ((MacDrawable *)d)->size;
481	481	*x_return = 0;
482	482	*y_return = 0;
483	483	*width_return = size.width;

490	490
491	491	int
492	492	XChangeProperty(
493		Display* display,
494		Window w,
495		Atom property,
496		Atom type,
497		int format,
498		int mode,
499		_Xconst unsigned char* data,
500		int nelements)
	493	TCL_UNUSED(Display *),
	494	TCL_UNUSED(Window),
	495	TCL_UNUSED(Atom),
	496	TCL_UNUSED(Atom),
	497	TCL_UNUSED(int),
	498	TCL_UNUSED(int),
	499	TCL_UNUSED(_Xconst unsigned char *),
	500	TCL_UNUSED(int))
501	501	{
502	502	Debugger();
503	503	return Success;

505	505
506	506	int
507	507	XSelectInput(
508		Display* display,
509		Window w,
510		long event_mask)
	508	TCL_UNUSED(Display *),
	509	TCL_UNUSED(Window),
	510	TCL_UNUSED(long))
511	511	{
512	512	Debugger();
513	513	return Success;

515	515
516	516	int
517	517	XBell(
518		Display* display,
519		int percent)
	518	TCL_UNUSED(Display *),
	519	TCL_UNUSED(int))
520	520	{
521	521	NSBeep();
522	522	return Success;
523	523	}
524
525		#if 0
526		void
527		XSetWMNormalHints(
528		Display* display,
529		Window w,
530		XSizeHints* hints)
531		{
532		/*
533		* Do nothing. Shouldn't even be called.
534		*/
535		}
536
537		XSizeHints *
538		XAllocSizeHints(void)
539		{
540		/*
541		* Always return NULL. Tk code checks to see if NULL is returned & does
542		* nothing if it is.
543		*/
544
545		return NULL;
546		}
547		#endif
548	524
549	525	GContext
550	526	XGContextFromGC(
551		GC gc)
	527	TCL_UNUSED(GC))
552	528	{
553	529	/*
554	530	* TODO: currently a no-op

559	535
560	536	Status
561	537	XSendEvent(
562		Display* display,
563		Window w,
564		Bool propagate,
565		long event_mask,
566		XEvent* event_send)
	538	TCL_UNUSED(Display *),
	539	TCL_UNUSED(Window),
	540	TCL_UNUSED(Bool),
	541	TCL_UNUSED(long),
	542	TCL_UNUSED(XEvent *))
567	543	{
568	544	Debugger();
569	545	return 0;

571	547
572	548	int
573	549	XClearWindow(
574		Display* display,
575		Window w)
576		{
577		return Success;
578		}
579
580		/*
581		int
582		XDrawPoint(
583		Display* display,
584		Drawable d,
585		GC gc,
586		int x,
587		int y)
588		{
589		return Success;
590		}
591
592		int
593		XDrawPoints(
594		Display* display,
595		Drawable d,
596		GC gc,
597		XPoint* points,
598		int npoints,
599		int mode)
600		{
601		return Success;
602		}
603		*/
	550	TCL_UNUSED(Display *),
	551	TCL_UNUSED(Window))
	552	{
	553	return Success;
	554	}
604	555
605	556	int
606	557	XWarpPointer(
607		Display* display,
608		Window src_w,
609		Window dest_w,
610		int src_x,
611		int src_y,
612		unsigned int src_width,
613		unsigned int src_height,
614		int dest_x,
615		int dest_y)
	558	TCL_UNUSED(Display *),
	559	TCL_UNUSED(Window),
	560	TCL_UNUSED(Window),
	561	TCL_UNUSED(int),
	562	TCL_UNUSED(int),
	563	TCL_UNUSED(unsigned int),
	564	TCL_UNUSED(unsigned int),
	565	TCL_UNUSED(int),
	566	TCL_UNUSED(int))
616	567	{
617	568	return Success;
618	569	}
619	570
620	571	int
621	572	XQueryColor(
622		Display* display,
623		Colormap colormap,
	573	TCL_UNUSED(Display *),
	574	TCL_UNUSED(Colormap),
624	575	XColor* def_in_out)
625	576	{
626	577	unsigned long p;

641	592
642	593	int
643	594	XQueryColors(
644		Display* display,
645		Colormap colormap,
	595	TCL_UNUSED(Display *),
	596	TCL_UNUSED(Colormap),
646	597	XColor* defs_in_out,
647	598	int ncolors)
648	599	{

666	617	}
667	618
668	619	int
669		XQueryTree(display, w, root_return, parent_return, children_return,
670		nchildren_return)
671		Display* display;
672		Window w;
673		Window* root_return;
674		Window* parent_return;
675		Window** children_return;
676		unsigned int* nchildren_return;
	620	XQueryTree(
	621	TCL_UNUSED(Display *),
	622	TCL_UNUSED(Window),
	623	TCL_UNUSED(Window *),
	624	TCL_UNUSED(Window *),
	625	TCL_UNUSED(Window **),
	626	TCL_UNUSED(unsigned int *))
677	627	{
678	628	return 0;
679	629	}

682	632	int
683	633	XGetWindowProperty(
684	634	Display *display,
685		Window w,
686		Atom property,
687		long long_offset,
688		long long_length,
689		Bool delete,
690		Atom req_type,
	635	TCL_UNUSED(Window),
	636	TCL_UNUSED(Atom),
	637	TCL_UNUSED(long),
	638	TCL_UNUSED(long),
	639	TCL_UNUSED(Bool),
	640	TCL_UNUSED(Atom),
691	641	Atom *actual_type_return,
692	642	int *actual_format_return,
693	643	unsigned long *nitems_return,
694	644	unsigned long *bytes_after_return,
695		unsigned char ** prop_return)
	645	TCL_UNUSED(unsigned char **))
696	646	{
697	647	display->request++;
698	648	*actual_type_return = None;

703	653
704	654	int
705	655	XRefreshKeyboardMapping(
706		XMappingEvent *x)
	656	TCL_UNUSED(XMappingEvent *))
707	657	{
708	658	/* used by tkXEvent.c */
709	659	Debugger();

713	663	int
714	664	XSetIconName(
715	665	Display* display,
716		Window w,
717		const char *icon_name)
	666	TCL_UNUSED(Window),
	667	TCL_UNUSED(const char *))
718	668	{
719	669	/*
720	670	* This is a no-op, no icon name for Macs.

726	676	int
727	677	XForceScreenSaver(
728	678	Display* display,
729		int mode)
	679	TCL_UNUSED(int))
730	680	{
731	681	/*
732	682	* This function is just a no-op. It is defined to reset the screen saver.

740	690
741	691	void
742	692	Tk_FreeXId(
743		Display *display,
744		XID xid)
	693	TCL_UNUSED(Display *),
	694	TCL_UNUSED(XID))
745	695	{
746	696	/* no-op function needed for stubs implementation. */
747	697	}

749	699	int
750	700	XSync(
751	701	Display *display,
752		Bool discard)
753		{
754		TkMacOSXFlushWindows();
	702	TCL_UNUSED(Bool))
	703	{
	704	/*
	705	* The main use of XSync is by the update command, which alternates
	706	* between running an event loop to process all events without waiting and
	707	* calling XSync on all displays until no events are left. There is
	708	* nothing for the mac to do with respect to syncing its one display but
	709	* it can (and, during regression testing, frequently does) happen that
	710	* timer events fire during the event loop. Processing those here seems
	711	* to make the update command work in a way that is more consistent with
	712	* its behavior on other platforms.
	713	*/
	714
	715	while (Tcl_DoOneEvent(TCL_TIMER_EVENTS\|TCL_DONT_WAIT)){}
755	716	display->request++;
756	717	return 0;
757	718	}
758	719
759		#if 0
760	720	int
761	721	XSetClipRectangles(
762	722	Display *d,

770	730	TkRegion clipRgn = TkCreateRegion();
771	731
772	732	while (n--) {
773		XRectangle rect = *rectangles;
774
775		rect.x += clip_x_origin;
776		rect.y += clip_y_origin;
777		TkUnionRectWithRegion(&rect, clipRgn, clipRgn);
778		rectangles++;
	733	XRectangle rect = *rectangles;
	734
	735	rect.x += clip_x_origin;
	736	rect.y += clip_y_origin;
	737	TkUnionRectWithRegion(&rect, clipRgn, clipRgn);
	738	rectangles++;
779	739	}
780	740	TkSetRegion(d, gc, clipRgn);
781	741	TkDestroyRegion(clipRgn);
782	742	return 1;
783	743	}
784		#endif
785
786	744	/*
787	745	*----------------------------------------------------------------------
788	746	*

841	799
842	800	int
843	801	XChangeWindowAttributes(
844		Display *display,
845		Window w,
846		unsigned long value_mask,
847		XSetWindowAttributes *attributes)
	802	TCL_UNUSED(Display *),
	803	TCL_UNUSED(Window),
	804	TCL_UNUSED(unsigned long),
	805	TCL_UNUSED(XSetWindowAttributes *))
848	806	{
849	807	return Success;
850	808	}
851	809
852	810	int
853	811	XSetWindowBackground(
854		Display *display,
855		Window window,
856		unsigned long value)
	812	TCL_UNUSED(Display *),
	813	TCL_UNUSED(Window),
	814	TCL_UNUSED(unsigned long))
857	815	{
858	816	return Success;
859	817	}
860	818
861	819	int
862	820	XSetWindowBackgroundPixmap(
863		Display *display,
864		Window w,
865		Pixmap background_pixmap)
	821	TCL_UNUSED(Display *),
	822	TCL_UNUSED(Window),
	823	TCL_UNUSED(Pixmap))
866	824	{
867	825	return Success;
868	826	}
869	827
870	828	int
871	829	XSetWindowBorder(
872		Display *display,
873		Window w,
874		unsigned long border_pixel)
	830	TCL_UNUSED(Display *),
	831	TCL_UNUSED(Window),
	832	TCL_UNUSED(unsigned long))
875	833	{
876	834	return Success;
877	835	}
878	836
879	837	int
880	838	XSetWindowBorderPixmap(
881		Display *display,
882		Window w,
883		Pixmap border_pixmap)
	839	TCL_UNUSED(Display *),
	840	TCL_UNUSED(Window),
	841	TCL_UNUSED(Pixmap))
884	842	{
885	843	return Success;
886	844	}
887	845
888	846	int
889	847	XSetWindowBorderWidth(
890		Display *display,
891		Window w,
892		unsigned int width)
	848	TCL_UNUSED(Display *),
	849	TCL_UNUSED(Window),
	850	TCL_UNUSED(unsigned int))
893	851	{
894	852	return Success;
895	853	}
896	854
897	855	int
898	856	XSetWindowColormap(
899		Display *display,
900		Window w,
901		Colormap colormap)
	857	TCL_UNUSED(Display *),
	858	TCL_UNUSED(Window),
	859	TCL_UNUSED(Colormap))
902	860	{
903	861	Debugger();
904	862	return Success;

906	864
907	865	Status
908	866	XStringListToTextProperty(
909		char **list,
910		int count,
911		XTextProperty *text_prop_return)
	867	TCL_UNUSED(char **),
	868	TCL_UNUSED(int),
	869	TCL_UNUSED(XTextProperty *))
912	870	{
913	871	Debugger();
914		return (Status) 0;
	872	return Success;
915	873	}
916	874
917	875	void
918	876	XSetWMClientMachine(
919		Display *display,
920		Window w,
921		XTextProperty *text_prop)
	877	TCL_UNUSED(Display *),
	878	TCL_UNUSED(Window),
	879	TCL_UNUSED(XTextProperty *))
922	880	{
923	881	Debugger();
924	882	}
925	883
926	884	XIC
927		XCreateIC(XIM xim, ...)
	885	XCreateIC(TCL_UNUSED(XIM), ...)
928	886	{
929	887	Debugger();
930	888	return (XIC) 0;

942	900	XAfterFunction
943	901	XSynchronize(
944	902	Display *display,
945		Bool onoff)
946		{
947		display->request++;
	903	TCL_UNUSED(Bool))
	904	{
	905	display->request++;
948	906	return NULL;
949	907	}
950	908
951	909	#undef XUngrabServer
952	910	int
953	911	XUngrabServer(
954		Display *display)
	912	TCL_UNUSED(Display *))
955	913	{
956	914	return 0;
957	915	}

968	926	#undef XGrabServer
969	927	int
970	928	XGrabServer(
971		Display *display)
	929	TCL_UNUSED(Display *))
972	930	{
973	931	return 0;
974	932	}

986	944	#undef XFlush
987	945	int
988	946	XFlush(
989		Display *display)
	947	TCL_UNUSED(Display *))
990	948	{
991	949	return 0;
992	950	}

1010	968
1011	969	const char *
1012	970	TkGetDefaultScreenName(
1013		Tcl_Interp interp, / Not used. */
	971	TCL_UNUSED(Tcl_Interp *),
1014	972	const char screenName) / If NULL, use default string. */
1015	973	{
1016	974	if ((screenName == NULL) \|\| (screenName[0] == '\0')) {

1037	995
1038	996	long
1039	997	Tk_GetUserInactiveTime(
1040		Display *dpy)
	998	TCL_UNUSED(Display *))
1041	999	{
1042	1000	io_registry_entry_t regEntry;
1043	1001	CFMutableDictionaryRef props = NULL;

1046	1004	uint64_t time;
1047	1005	IOReturn result;
1048	1006
1049		regEntry = IOServiceGetMatchingService(kIOMasterPortDefault,
	1007	regEntry = IOServiceGetMatchingService(0,
1050	1008	IOServiceMatching("IOHIDSystem"));
1051	1009
1052	1010	if (regEntry == 0) {

1103	1061
1104	1062	void
1105	1063	Tk_ResetUserInactiveTime(
1106		Display *dpy)
	1064	TCL_UNUSED(Display *))
1107	1065	{
1108	1066	lastInactivityReset = TkpGetMS();
1109	1067	}

+347

-250

macosx/ttkMacOSXTheme.c less more

30	30
31	31	#include "tkMacOSXPrivate.h"
32	32	#include "ttk/ttkTheme.h"
33		#include <math.h>
34	33
35	34	/*
36	35	* Macros for handling drawing contexts.

38	37
39	38	#define BEGIN_DRAWING(d) { \
40	39	TkMacOSXDrawingContext dc; \
41		if (!TkMacOSXSetupDrawingContext((d), NULL, 1, &dc)) {return;}
	40	if (!TkMacOSXSetupDrawingContext((d), NULL, &dc)) {return;}
42	41	#define END_DRAWING \
43	42	TkMacOSXRestoreDrawingContext(&dc);}
44	43

152	151	Drawable d,
153	152	Ttk_Box b)
154	153	{
155		MacDrawable md = (MacDrawable ) d;
	154	MacDrawable md = (MacDrawable )d;
156	155	CGRect rect;
157	156
158	157	rect.origin.y = b.y + md->yOff;

168	167	*/
169	168
170	169	static Ttk_StateTable ThemeStateTable[] = {
171		{kThemeStateActive, TTK_STATE_ALTERNATE \| TTK_STATE_BACKGROUND},
	170	{kThemeStateActive, TTK_STATE_ALTERNATE \| TTK_STATE_BACKGROUND, 0},
172	171	{kThemeStateUnavailable, TTK_STATE_DISABLED, 0},
173	172	{kThemeStatePressed, TTK_STATE_PRESSED, 0},
174	173	{kThemeStateInactive, TTK_STATE_BACKGROUND, 0},

231	230	* support Dark Mode anyway.
232	231	*/
233	232
234		static CGFloat windowBackground[4] = {
	233	static const CGFloat WINDOWBACKGROUND[4] = {
235	234	235.0 / 255, 235.0 / 255, 235.0 / 255, 1.0
236	235	};
237		static CGFloat whiteRGBA[4] = {1.0, 1.0, 1.0, 1.0};
238		static CGFloat blackRGBA[4] = {0.0, 0.0, 0.0, 1.0};
	236	static const CGFloat WHITERGBA[4] = {1.0, 1.0, 1.0, 1.0};
	237	static const CGFloat BLACKRGBA[4] = {0.0, 0.0, 0.0, 1.0};
239	238
240	239	/*----------------------------------------------------------------------
241	240	* GetBackgroundColor --
242	241	*
243	242	* Fills the array rgba with the color coordinates for a background color.
244		* Start with the background color of a window's geometry master, or the
245		* standard ttk window background if there is no master. If the contrast
246		* parameter is nonzero, modify this color to be darker, for the aqua
247		* appearance, or lighter for the DarkAqua appearance. This is primarily
248		* used by the Fill and Background elements.
	243	* Start with the background color of a window's geometry container, or
	244	* the standard ttk window background if there is no container. If the
	245	* contrast parameter is nonzero, modify this color to be darker, for the
	246	* aqua appearance, or lighter for the DarkAqua appearance. This is
	247	* primarily used by the Fill and Background elements.
249	248	*/
250	249
251	250	static void GetBackgroundColor(
252		CGContextRef context,
	251	TCL_UNUSED(CGContextRef),
253	252	Tk_Window tkwin,
254	253	int contrast,
255	254	CGFloat *rgba)
256	255	{
257		TkWindow winPtr = (TkWindow ) tkwin;
258		TkWindow masterPtr = (TkWindow ) TkGetGeomMaster(tkwin);
259
260		while (masterPtr && masterPtr->privatePtr) {
261		if (masterPtr->privatePtr->flags & TTK_HAS_CONTRASTING_BG) {
	256	TkWindow winPtr = (TkWindow )tkwin;
	257	TkWindow containerPtr = (TkWindow )TkGetContainer(tkwin);
	258
	259	while (containerPtr && containerPtr->privatePtr) {
	260	if (containerPtr->privatePtr->flags & TTK_HAS_CONTRASTING_BG) {
262	261	break;
263	262	}
264		masterPtr = (TkWindow *) TkGetGeomMaster(masterPtr);
265		}
266		if (masterPtr && masterPtr->privatePtr) {
	263	containerPtr = (TkWindow *)TkGetContainer(containerPtr);
	264	}
	265	if (containerPtr && containerPtr->privatePtr) {
267	266	for (int i = 0; i < 4; i++) {
268		rgba[i] = masterPtr->privatePtr->fillRGBA[i];
	267	rgba[i] = containerPtr->privatePtr->fillRGBA[i];
269	268	}
270	269	} else {
271		if ([NSApp macMinorVersion] > 13) {
	270	if ([NSApp macOSVersion] > 101300) {
272	271	NSColorSpace *deviceRGB = [NSColorSpace deviceRGBColorSpace];
273	272	NSColor *windowColor = [[NSColor windowBackgroundColor]
274	273	colorUsingColorSpace: deviceRGB];
275	274	[windowColor getComponents: rgba];
276	275	} else {
277	276	for (int i = 0; i < 4; i++) {
278		rgba[i] = windowBackground[i];
	277	rgba[i] = WINDOWBACKGROUND[i];
279	278	}
280	279	}
281	280	}

302	301
303	302
304	303	/*----------------------------------------------------------------------
305		* +++ Single Arrow Buttons --
306		*
307		* Used in ListHeaders and Comboboxes.
	304	* +++ Single Arrow Images --
	305	*
	306	* Used in ListHeaders and Comboboxes as well as disclosure triangles in
	307	* macOS 11.
308	308	*/
309	309
310	310	static void DrawDownArrow(

312	312	CGRect bounds,
313	313	CGFloat inset,
314	314	CGFloat size,
315		CGFloat *rgba)
	315	const CGFloat *rgba)
316	316	{
317	317	CGFloat x, y;
318	318

334	334	CGRect bounds,
335	335	CGFloat inset,
336	336	CGFloat size,
337		CGFloat *rgba)
	337	const CGFloat *rgba)
338	338	{
339	339	CGFloat x, y;
340	340

351	351	CGContextStrokePath(context);
352	352	}
353	353
	354	static void DrawClosedDisclosure(
	355	CGContextRef context,
	356	CGRect bounds,
	357	CGFloat inset,
	358	CGFloat size,
	359	CGFloat *rgba)
	360	{
	361	CGFloat x, y;
	362
	363	CGContextSetRGBStrokeColor(context, rgba[0], rgba[1], rgba[2], rgba[3]);
	364	CGContextSetLineWidth(context, 1.5);
	365	x = bounds.origin.x + inset;
	366	y = bounds.origin.y + trunc(bounds.size.height / 2);
	367	CGContextBeginPath(context);
	368	CGPoint arrow[3] = {
	369	{x, y - size / 4 - 1}, {x + size / 2, y}, {x, y + size / 4 + 1}
	370	};
	371	CGContextAddLines(context, arrow, 3);
	372	CGContextStrokePath(context);
	373	}
	374
	375	static void DrawOpenDisclosure(
	376	CGContextRef context,
	377	CGRect bounds,
	378	CGFloat inset,
	379	CGFloat size,
	380	CGFloat *rgba)
	381	{
	382	CGFloat x, y;
	383
	384	CGContextSetRGBStrokeColor(context, rgba[0], rgba[1], rgba[2], rgba[3]);
	385	CGContextSetLineWidth(context, 1.5);
	386	x = bounds.origin.x + inset;
	387	y = bounds.origin.y + trunc(bounds.size.height / 2);
	388	CGContextBeginPath(context);
	389	CGPoint arrow[3] = {
	390	{x, y - size / 4}, {x + size / 2, y + size / 2}, {x + size, y - size / 4}
	391	};
	392	CGContextAddLines(context, arrow, 3);
	393	CGContextStrokePath(context);
	394	}
	395
354	396	/*----------------------------------------------------------------------
355	397	* +++ Double Arrow Buttons --
356	398	*

362	404	CGRect bounds,
363	405	CGFloat inset,
364	406	CGFloat size,
365		CGFloat *rgba)
	407	const CGFloat *rgba)
366	408	{
367	409	CGFloat x, y;
368	410

500	542	NSColor *color)
501	543	{
502	544	CGPathRef path;
	545
503	546	CHECK_RADIUS(radius, bounds)
504
	547	path = CGPathCreateWithRoundedRect(bounds, radius, radius, NULL);
	548	if (!path) {
	549	return;
	550	}
505	551	CGContextSetFillColorWithColor(context, CGCOLOR(color));
506		path = CGPathCreateWithRoundedRect(bounds, radius, radius, NULL);
507	552	CGContextBeginPath(context);
508	553	CGContextAddPath(context, path);
509	554	CGContextFillPath(context);

546	591	* So we have to query the Apple window manager.
547	592	*/
548	593
549		NSWindow *win = TkMacOSXDrawableWindow(Tk_WindowId(tkwin));
	594	NSWindow *win = TkMacOSXGetNSWindowForDrawable(Tk_WindowId(tkwin));
550	595	CGFloat *bgRGBA = [win isKeyWindow] ? activeBgRGBA : inactiveBgRGBA;
551	596	CGFloat x = bounds.origin.x, y = bounds.origin.y;
552	597	CGFloat w = bounds.size.width, h = bounds.size.height;

586	631	arrowBounds.origin.x = bounds.origin.x + bounds.size.width - 16;
587	632	arrowBounds.size.width = 16;
588	633	if (state & TTK_STATE_ALTERNATE) {
589		DrawUpArrow(context, arrowBounds, 3, 8, blackRGBA);
	634	DrawUpArrow(context, arrowBounds, 3, 8, BLACKRGBA);
590	635	} else if (state & TTK_STATE_SELECTED) {
591		DrawDownArrow(context, arrowBounds, 3, 8, blackRGBA);
	636	DrawDownArrow(context, arrowBounds, 3, 8, BLACKRGBA);
592	637	}
593	638	}
594	639	}

710	755	darkSelectedGradient, 2);
711	756	}
712	757	if (kind == kThemePopupButton) {
713		DrawUpDownArrows(context, arrowBounds, 3, 7, whiteRGBA);
	758	DrawUpDownArrows(context, arrowBounds, 3, 7, WHITERGBA);
714	759	} else {
715		DrawDownArrow(context, arrowBounds, 4, 8, whiteRGBA);
	760	DrawDownArrow(context, arrowBounds, 4, 8, WHITERGBA);
716	761	}
717	762	}
718	763

771	816	darkSelectedGradient, 2);
772	817	CGContextRestoreGState(context);
773	818	}
774		DrawUpDownArrows(context, bounds, 3, 5, whiteRGBA);
	819	DrawUpDownArrows(context, bounds, 3, 5, WHITERGBA);
775	820	HighlightButtonBorder(context, bounds);
776	821	}
777	822

1038	1083	static void DrawDarkSeparator(
1039	1084	CGRect bounds,
1040	1085	CGContextRef context,
1041		Tk_Window tkwin)
	1086	TCL_UNUSED(Tk_Window))
1042	1087	{
1043	1088	static CGFloat fill[4] = {1.0, 1.0, 1.0, 0.3};
1044	1089	NSColorSpace *deviceRGB = [NSColorSpace deviceRGBColorSpace];

1164	1209	static void DrawDarkListHeader(
1165	1210	CGRect bounds,
1166	1211	CGContextRef context,
1167		Tk_Window tkwin,
	1212	TCL_UNUSED(Tk_Window),
1168	1213	int state)
1169	1214	{
1170	1215	NSColorSpace *deviceRGB = [NSColorSpace deviceRGBColorSpace];

1173	1218	CGContextSetStrokeColorSpace(context, deviceRGB.CGColorSpace);
1174	1219	CGFloat x = bounds.origin.x, y = bounds.origin.y;
1175	1220	CGFloat w = bounds.size.width, h = bounds.size.height;
1176		CGPoint top[2] = {{x, y}, {x + w, y}};
	1221
	1222	CGPoint top[2] = {{x, y + 1}, {x + w, y + 1}};
1177	1223	CGPoint bottom[2] = {{x, y + h}, {x + w, y + h}};
1178		CGPoint separator[2] = {{x + w, y + 3}, {x + w, y + h - 3}};
1179
	1224	CGPoint separator[2] = {{x + w - 1, y + 3}, {x + w - 1, y + h - 3}};
1180	1225	CGContextSaveGState(context);
1181	1226	CGContextSetShouldAntialias(context, false);
1182	1227	stroke = [NSColor colorWithColorSpace: deviceRGB

1198	1243	arrowBounds.origin.x = bounds.origin.x + bounds.size.width - 16;
1199	1244	arrowBounds.size.width = 16;
1200	1245	if (state & TTK_STATE_ALTERNATE) {
1201		DrawUpArrow(context, arrowBounds, 3, 8, whiteRGBA);
	1246	DrawUpArrow(context, arrowBounds, 3, 8, WHITERGBA);
1202	1247	} else if (state & TTK_STATE_SELECTED) {
1203		DrawDownArrow(context, arrowBounds, 3, 8, whiteRGBA);
	1248	DrawDownArrow(context, arrowBounds, 3, 8, WHITERGBA);
1204	1249	}
1205	1250	}
1206	1251	}

1230	1275	ListHeaderParams =
1231	1276	{kThemeListHeaderButton, kThemeMetricListHeaderHeight};
1232	1277	static Ttk_StateTable ButtonValueTable[] = {
1233		{kThemeButtonOff, TTK_STATE_ALTERNATE \| TTK_STATE_BACKGROUND},
	1278	{kThemeButtonOff, TTK_STATE_ALTERNATE \| TTK_STATE_BACKGROUND, 0},
1234	1279	{kThemeButtonMixed, TTK_STATE_ALTERNATE, 0},
1235	1280	{kThemeButtonOn, TTK_STATE_SELECTED, 0},
1236	1281	{kThemeButtonOff, 0, 0}

1259	1304	static inline HIThemeButtonDrawInfo computeButtonDrawInfo(
1260	1305	ThemeButtonParams *params,
1261	1306	Ttk_State state,
1262		Tk_Window tkwin)
	1307	TCL_UNUSED(Tk_Window))
1263	1308	{
1264	1309
1265	1310	/*

1295	1340
1296	1341	static void ButtonElementMinSize(
1297	1342	void *clientData,
1298		void *elementRecord,
1299		Tk_Window tkwin,
	1343	TCL_UNUSED(void *),
	1344	TCL_UNUSED(Tk_Window),
1300	1345	int *minWidth,
1301	1346	int *minHeight,
1302		Ttk_Padding *paddingPtr)
1303		{
1304		ThemeButtonParams *params = clientData;
	1347	TCL_UNUSED(Ttk_Padding *))
	1348	{
	1349	ThemeButtonParams params = (ThemeButtonParams )clientData;
1305	1350
1306	1351	if (params->heightMetric != NoThemeMetric) {
1307		ChkErr(GetThemeMetric, params->heightMetric, minHeight);
	1352	ChkErr(GetThemeMetric, params->heightMetric, (SInt *) minHeight);
1308	1353
1309	1354	/*
1310	1355	* The theme height does not include the 1-pixel border around

1373	1418
1374	1419	static void ButtonElementDraw(
1375	1420	void *clientData,
1376		void *elementRecord,
	1421	TCL_UNUSED(void *),
1377	1422	Tk_Window tkwin,
1378	1423	Drawable d,
1379	1424	Ttk_Box b,

1408	1453	} else if (info.kind == kThemePushButton &&
1409	1454	(state & TTK_STATE_PRESSED)) {
1410	1455	bounds.size.height += 2;
1411		if ([NSApp macMinorVersion] > 8) {
	1456	if ([NSApp macOSVersion] > 100800) {
1412	1457	GradientFillRoundedRectangle(dc.context, bounds, 4,
1413	1458	pressedPushButtonGradient, 2);
1414	1459	}

1463	1508
1464	1509	/* Tab position logic, c.f. ttkNotebook.c TabState() */
1465	1510	static Ttk_StateTable TabStyleTable[] = {
1466		{kThemeTabFrontInactive, TTK_STATE_SELECTED \| TTK_STATE_BACKGROUND},
1467		{kThemeTabNonFrontInactive, TTK_STATE_BACKGROUND},
1468		{kThemeTabFrontUnavailable, TTK_STATE_DISABLED \| TTK_STATE_SELECTED},
1469		{kThemeTabNonFrontUnavailable, TTK_STATE_DISABLED},
1470		{kThemeTabFront, TTK_STATE_SELECTED},
1471		{kThemeTabNonFrontPressed, TTK_STATE_PRESSED},
1472		{kThemeTabNonFront, 0}
	1511	{kThemeTabFrontInactive, TTK_STATE_SELECTED \| TTK_STATE_BACKGROUND, 0},
	1512	{kThemeTabNonFrontInactive, TTK_STATE_BACKGROUND, 0},
	1513	{kThemeTabFrontUnavailable, TTK_STATE_DISABLED \| TTK_STATE_SELECTED, 0},
	1514	{kThemeTabNonFrontUnavailable, TTK_STATE_DISABLED, 0},
	1515	{kThemeTabFront, TTK_STATE_SELECTED, 0},
	1516	{kThemeTabNonFrontPressed, TTK_STATE_PRESSED, 0},
	1517	{kThemeTabNonFront, 0, 0}
1473	1518	};
1474	1519	static Ttk_StateTable TabAdornmentTable[] = {
1475		{kHIThemeTabAdornmentNone, TTK_STATE_FIRST_TAB \| TTK_STATE_LAST_TAB},
1476		{kHIThemeTabAdornmentTrailingSeparator, TTK_STATE_FIRST_TAB},
1477		{kHIThemeTabAdornmentNone, TTK_STATE_LAST_TAB},
1478		{kHIThemeTabAdornmentTrailingSeparator, 0},
	1520	{kHIThemeTabAdornmentNone, TTK_STATE_FIRST_TAB \| TTK_STATE_LAST_TAB, 0},
	1521	{kHIThemeTabAdornmentTrailingSeparator, TTK_STATE_FIRST_TAB, 0},
	1522	{kHIThemeTabAdornmentNone, TTK_STATE_LAST_TAB, 0},
	1523	{kHIThemeTabAdornmentTrailingSeparator, 0, 0},
1479	1524	};
1480	1525	static Ttk_StateTable TabPositionTable[] = {
1481		{kHIThemeTabPositionOnly, TTK_STATE_FIRST_TAB \| TTK_STATE_LAST_TAB},
1482		{kHIThemeTabPositionFirst, TTK_STATE_FIRST_TAB},
1483		{kHIThemeTabPositionLast, TTK_STATE_LAST_TAB},
1484		{kHIThemeTabPositionMiddle, 0},
	1526	{kHIThemeTabPositionOnly, TTK_STATE_FIRST_TAB \| TTK_STATE_LAST_TAB, 0},
	1527	{kHIThemeTabPositionFirst, TTK_STATE_FIRST_TAB, 0},
	1528	{kHIThemeTabPositionLast, TTK_STATE_LAST_TAB, 0},
	1529	{kHIThemeTabPositionMiddle, 0, 0},
1485	1530	};
1486	1531
1487	1532	/*

1525	1570	*/
1526	1571
1527	1572	static void TabElementSize(
1528		void *clientData,
1529		void *elementRecord,
1530		Tk_Window tkwin,
1531		int *minWidth,
	1573	TCL_UNUSED(void *),
	1574	TCL_UNUSED(void *),
	1575	TCL_UNUSED(Tk_Window),
	1576	TCL_UNUSED(int *),
1532	1577	int *minHeight,
1533	1578	Ttk_Padding *paddingPtr)
1534	1579	{

1538	1583	}
1539	1584
1540	1585	static void TabElementDraw(
1541		void *clientData,
1542		void *elementRecord,
	1586	TCL_UNUSED(void *),
	1587	TCL_UNUSED(void *),
1543	1588	Tk_Window tkwin,
1544	1589	Drawable d,
1545	1590	Ttk_Box b,

1579	1624	*/
1580	1625
1581	1626	static void PaneElementSize(
1582		void *clientData,
1583		void *elementRecord,
1584		Tk_Window tkwin,
1585		int *minWidth,
1586		int *minHeight,
	1627	TCL_UNUSED(void *),
	1628	TCL_UNUSED(void *),
	1629	TCL_UNUSED(Tk_Window),
	1630	TCL_UNUSED(int *),
	1631	TCL_UNUSED(int *),
1587	1632	Ttk_Padding *paddingPtr)
1588	1633	{
1589	1634	*paddingPtr = Ttk_MakePadding(9, 5, 9, 9);
1590	1635	}
1591	1636
1592	1637	static void PaneElementDraw(
1593		void *clientData,
1594		void *elementRecord,
	1638	TCL_UNUSED(void *),
	1639	TCL_UNUSED(void *),
1595	1640	Tk_Window tkwin,
1596	1641	Drawable d,
1597	1642	Ttk_Box b,

1602	1647	bounds.origin.y -= kThemeMetricTabFrameOverlap;
1603	1648	bounds.size.height += kThemeMetricTabFrameOverlap;
1604	1649	BEGIN_DRAWING(d)
1605		if ([NSApp macMinorVersion] > 8) {
	1650	if ([NSApp macOSVersion] > 100800) {
1606	1651	DrawGroupBox(bounds, dc.context, tkwin);
1607	1652	} else {
1608	1653	HIThemeTabPaneDrawInfo info = {

1640	1685	*/
1641	1686
1642	1687	static void GroupElementSize(
1643		void *clientData,
1644		void *elementRecord,
1645		Tk_Window tkwin,
1646		int *minWidth,
1647		int *minHeight,
	1688	TCL_UNUSED(void *),
	1689	TCL_UNUSED(void *),
	1690	TCL_UNUSED(Tk_Window),
	1691	TCL_UNUSED(int *),
	1692	TCL_UNUSED(int *),
1648	1693	Ttk_Padding *paddingPtr)
1649	1694	{
1650	1695	*paddingPtr = Ttk_UniformPadding(4);
1651	1696	}
1652	1697
1653	1698	static void GroupElementDraw(
1654		void *clientData,
1655		void *elementRecord,
	1699	TCL_UNUSED(void *),
	1700	TCL_UNUSED(void *),
1656	1701	Tk_Window tkwin,
1657	1702	Drawable d,
1658	1703	Ttk_Box b,

1661	1706	CGRect bounds = BoxToRect(d, b);
1662	1707
1663	1708	BEGIN_DRAWING(d)
1664		if ([NSApp macMinorVersion] > 8) {
	1709	if ([NSApp macOSVersion] > 100800) {
1665	1710	DrawGroupBox(bounds, dc.context, tkwin);
1666	1711	} else {
1667	1712	const HIThemeGroupBoxDrawInfo info = {

1701	1746	Tk_Offset(EntryElement, backgroundObj), ENTRY_DEFAULT_BACKGROUND},
1702	1747	{"-fieldbackground", TK_OPTION_BORDER,
1703	1748	Tk_Offset(EntryElement, fieldbackgroundObj), ENTRY_DEFAULT_BACKGROUND},
1704		{0}
	1749	{NULL, TK_OPTION_BOOLEAN, 0, NULL}
1705	1750	};
1706	1751
1707	1752	static void EntryElementSize(
1708		void *clientData,
1709		void *elementRecord,
1710		Tk_Window tkwin,
1711		int *minWidth,
1712		int *minHeight,
	1753	TCL_UNUSED(void *),
	1754	TCL_UNUSED(void *),
	1755	TCL_UNUSED(Tk_Window),
	1756	TCL_UNUSED(int *),
	1757	TCL_UNUSED(int *),
1713	1758	Ttk_Padding *paddingPtr)
1714	1759	{
1715	1760	*paddingPtr = Ttk_MakePadding(7, 5, 7, 6);
1716	1761	}
1717	1762
1718	1763	static void EntryElementDraw(
1719		void *clientData,
	1764	TCL_UNUSED(void *),
1720	1765	void *elementRecord,
1721	1766	Tk_Window tkwin,
1722	1767	Drawable d,

1784	1829	}
1785	1830	BEGIN_DRAWING(d)
1786	1831	if (backgroundPtr == NULL) {
1787		if ([NSApp macMinorVersion] > 8) {
	1832	if ([NSApp macOSVersion] > 100800) {
1788	1833	background = [NSColor textBackgroundColor];
1789	1834	CGContextSetFillColorWithColor(dc.context, CGCOLOR(background));
1790	1835	} else {

1825	1870	* 1 pixel to account for the fact that the button is not centered.
1826	1871	*/
1827	1872
1828		static Ttk_Padding ComboboxPadding = {4, 2, 20, 2};
	1873	static Ttk_Padding ComboboxPadding = {4, 4, 20, 4};
	1874	static Ttk_Padding DarkComboboxPadding = {6, 6, 22, 6};
1829	1875
1830	1876	static void ComboboxElementSize(
1831		void *clientData,
1832		void *elementRecord,
	1877	TCL_UNUSED(void *),
	1878	TCL_UNUSED(void *),
1833	1879	Tk_Window tkwin,
1834	1880	int *minWidth,
1835	1881	int *minHeight,

1837	1883	{
1838	1884	*minWidth = 24;
1839	1885	*minHeight = 23;
1840		*paddingPtr = ComboboxPadding;
	1886	if (TkMacOSXInDarkMode(tkwin)) {
	1887	*paddingPtr = DarkComboboxPadding;
	1888	} else {
	1889	*paddingPtr = ComboboxPadding;
	1890	}
1841	1891	}
1842	1892
1843	1893	static void ComboboxElementDraw(
1844		void *clientData,
1845		void *elementRecord,
	1894	TCL_UNUSED(void *),
	1895	TCL_UNUSED(void *),
1846	1896	Tk_Window tkwin,
1847	1897	Drawable d,
1848	1898	Ttk_Box b,

1858	1908	};
1859	1909
1860	1910	BEGIN_DRAWING(d)
1861		bounds.origin.y += 1;
1862	1911	if (TkMacOSXInDarkMode(tkwin)) {
1863		bounds.size.height += 1;
	1912	bounds = CGRectInset(bounds, 3, 3);
	1913	if (state & TTK_STATE_FOCUS) {
	1914	DrawDarkFocusRing(bounds, dc.context);
	1915	}
1864	1916	DrawDarkButton(bounds, info.kind, state, dc.context);
1865		} else if ([NSApp macMinorVersion] > 8) {
1866		if ((state & TTK_STATE_BACKGROUND) &&
1867		!(state & TTK_STATE_DISABLED)) {
1868		NSColor *background = [NSColor textBackgroundColor];
1869		CGRect innerBounds = CGRectInset(bounds, 1, 2);
1870		SolidFillRoundedRectangle(dc.context, innerBounds, 4, background);
1871		}
1872		}
1873		ChkErr(HIThemeDrawButton, &bounds, &info, dc.context, HIOrientation, NULL);
	1917	} else {
	1918	if ([NSApp macOSVersion] > 100800) {
	1919	if ((state & TTK_STATE_BACKGROUND) &&
	1920	!(state & TTK_STATE_DISABLED)) {
	1921	NSColor *background = [NSColor textBackgroundColor];
	1922	CGRect innerBounds = CGRectInset(bounds, 1, 4);
	1923	bounds.origin.y += 1;
	1924	SolidFillRoundedRectangle(dc.context, innerBounds, 4, background);
	1925	}
	1926	}
	1927	ChkErr(HIThemeDrawButton, &bounds, &info, dc.context, HIOrientation, NULL);
	1928	}
1874	1929	END_DRAWING
1875	1930	}
1876	1931

1906	1961	static Ttk_Padding SpinbuttonMargins = {0, 0, 2, 0};
1907	1962
1908	1963	static void SpinButtonUpElementSize(
1909		void *clientData,
1910		void *elementRecord,
1911		Tk_Window tkwin,
	1964	TCL_UNUSED(void *),
	1965	TCL_UNUSED(void *),
	1966	TCL_UNUSED(Tk_Window),
1912	1967	int *minWidth,
1913	1968	int *minHeight,
1914		Ttk_Padding *paddingPtr)
	1969	TCL_UNUSED(Ttk_Padding *))
1915	1970	{
1916	1971	SInt32 s;
1917	1972

1922	1977	}
1923	1978
1924	1979	static void SpinButtonUpElementDraw(
1925		void *clientData,
1926		void *elementRecord,
	1980	TCL_UNUSED(void *),
	1981	TCL_UNUSED(void *),
1927	1982	Tk_Window tkwin,
1928	1983	Drawable d,
1929	1984	Ttk_Box b,

1963	2018	SpinButtonUpElementDraw
1964	2019	};
1965	2020	static void SpinButtonDownElementSize(
1966		void *clientData,
1967		void *elementRecord,
1968		Tk_Window tkwin,
	2021	TCL_UNUSED(void *),
	2022	TCL_UNUSED(void *),
	2023	TCL_UNUSED(Tk_Window),
1969	2024	int *minWidth,
1970	2025	int *minHeight,
1971		Ttk_Padding *paddingPtr)
	2026	TCL_UNUSED(Ttk_Padding *))
1972	2027	{
1973	2028	SInt32 s;
1974	2029

1979	2034	}
1980	2035
1981	2036	static void SpinButtonDownElementDraw(
1982		void *clientData,
1983		void *elementRecord,
	2037	TCL_UNUSED(void *),
	2038	TCL_UNUSED(void *),
1984	2039	Tk_Window tkwin,
1985	2040	Drawable d,
1986	2041	Ttk_Box b,

2057	2112	} TrackElement;
2058	2113
2059	2114	static Ttk_ElementOptionSpec TrackElementOptions[] = {
2060		{"-from", TK_OPTION_DOUBLE, Tk_Offset(TrackElement, fromObj)},
2061		{"-to", TK_OPTION_DOUBLE, Tk_Offset(TrackElement, toObj)},
2062		{"-value", TK_OPTION_DOUBLE, Tk_Offset(TrackElement, valueObj)},
2063		{"-orient", TK_OPTION_STRING, Tk_Offset(TrackElement, orientObj)},
2064		{0, 0, 0}
	2115	{"-from", TK_OPTION_DOUBLE, Tk_Offset(TrackElement, fromObj), NULL},
	2116	{"-to", TK_OPTION_DOUBLE, Tk_Offset(TrackElement, toObj), NULL},
	2117	{"-value", TK_OPTION_DOUBLE, Tk_Offset(TrackElement, valueObj), NULL},
	2118	{"-orient", TK_OPTION_STRING, Tk_Offset(TrackElement, orientObj), NULL},
	2119	{NULL, TK_OPTION_BOOLEAN, 0, NULL}
2065	2120	};
2066	2121	static void TrackElementSize(
2067	2122	void *clientData,
2068		void *elementRecord,
2069		Tk_Window tkwin,
	2123	TCL_UNUSED(void *),
	2124	TCL_UNUSED(Tk_Window),
2070	2125	int *minWidth,
2071	2126	int *minHeight,
2072		Ttk_Padding *paddingPtr)
2073		{
2074		TrackElementData *data = clientData;
	2127	TCL_UNUSED(Ttk_Padding *))
	2128	{
	2129	TrackElementData data = (TrackElementData )clientData;
2075	2130	SInt32 size = 24; /* reasonable default ... */
2076	2131
2077	2132	ChkErr(GetThemeMetric, data->thicknessMetric, &size);

2090	2145	TrackElement *elem = elementRecord;
2091	2146	int orientation = TTK_ORIENT_HORIZONTAL;
2092	2147	double from = 0, to = 100, value = 0, factor;
	2148	CGRect bounds;
2093	2149
2094	2150	Ttk_GetOrientFromObj(NULL, elem->orientObj, &orientation);
2095	2151	Tcl_GetDoubleFromObj(NULL, elem->fromObj, &from);

2097	2153	Tcl_GetDoubleFromObj(NULL, elem->valueObj, &value);
2098	2154	factor = RangeToFactor(to);
2099	2155
	2156	/*
	2157	* HIThemeTrackDrawInfo uses 2-byte alignment; assigning to a separate
	2158	* bounds variable avoids UBSan (-fsanitize=alignment) complaints.
	2159	*/
	2160
	2161	bounds = BoxToRect(d, b);
2100	2162	HIThemeTrackDrawInfo info = {
2101	2163	.version = 0,
2102	2164	.kind = data->kind,
2103		.bounds = BoxToRect(d, b),
	2165	.bounds = bounds,
2104	2166	.min = from * factor,
2105	2167	.max = to * factor,
2106	2168	.value = value * factor,

2122	2184	}
2123	2185	BEGIN_DRAWING(d)
2124	2186	if (TkMacOSXInDarkMode(tkwin)) {
2125		CGRect bounds = BoxToRect(d, b);
	2187	bounds = BoxToRect(d, b);
2126	2188	NSColorSpace *deviceRGB = [NSColorSpace deviceRGBColorSpace];
2127	2189	NSColor *trackColor = [NSColor colorWithColorSpace: deviceRGB
2128	2190	components: darkTrack

2156	2218	*/
2157	2219
2158	2220	static void SliderElementSize(
2159		void *clientData,
2160		void *elementRecord,
2161		Tk_Window tkwin,
	2221	TCL_UNUSED(void *),
	2222	TCL_UNUSED(void *),
	2223	TCL_UNUSED(Tk_Window),
2162	2224	int *minWidth,
2163	2225	int *minHeight,
2164		Ttk_Padding *paddingPtr)
	2226	TCL_UNUSED(Ttk_Padding *))
2165	2227	{
2166	2228	minWidth = minHeight = 24;
2167	2229	}

2201	2263	Tk_Offset(PbarElement, phaseObj), "0"},
2202	2264	{"-mode", TK_OPTION_STRING,
2203	2265	Tk_Offset(PbarElement, modeObj), "determinate"},
2204		{0, 0, 0, 0}
	2266	{NULL, TK_OPTION_BOOLEAN, 0, NULL}
2205	2267	};
2206	2268	static void PbarElementSize(
2207		void *clientData,
2208		void *elementRecord,
2209		Tk_Window tkwin,
	2269	TCL_UNUSED(void *),
	2270	TCL_UNUSED(void *),
	2271	TCL_UNUSED(Tk_Window),
2210	2272	int *minWidth,
2211	2273	int *minHeight,
2212		Ttk_Padding *paddingPtr)
	2274	TCL_UNUSED(Ttk_Padding *))
2213	2275	{
2214	2276	SInt32 size = 24; /* @@@ Check HIG for correct default */
2215	2277

2218	2280	}
2219	2281
2220	2282	static void PbarElementDraw(
2221		void *clientData,
	2283	TCL_UNUSED(void *),
2222	2284	void *elementRecord,
2223	2285	Tk_Window tkwin,
2224	2286	Drawable d,

2226	2288	Ttk_State state)
2227	2289	{
2228	2290	PbarElement *pbar = elementRecord;
2229		int orientation = TTK_ORIENT_HORIZONTAL, phase = 0;
2230		double value = 0, maximum = 100, factor;
	2291	int orientation = TTK_ORIENT_HORIZONTAL, phase = 0, kind;
	2292
	2293	/*
	2294	* Using 1000 as the maximum should give better than 1 pixel
	2295	* resolution for most progress bars.
	2296	*/
	2297
	2298	int ivalue, imaximum = 1000;
	2299	CGRect bounds;
2231	2300
2232	2301	Ttk_GetOrientFromObj(NULL, pbar->orientObj, &orientation);
2233		Tcl_GetDoubleFromObj(NULL, pbar->valueObj, &value);
2234		Tcl_GetDoubleFromObj(NULL, pbar->maximumObj, &maximum);
2235		Tcl_GetIntFromObj(NULL, pbar->phaseObj, &phase);
2236		factor = RangeToFactor(maximum);
2237
	2302	kind = !strcmp("indeterminate", Tcl_GetString(pbar->modeObj)) ?
	2303	kThemeIndeterminateBar : kThemeProgressBar;
	2304	if (kind == kThemeIndeterminateBar) {
	2305	Tcl_GetIntFromObj(NULL, pbar->phaseObj, &phase);
	2306
	2307	/*
	2308	* On macOS 11 the fraction of an indeterminate progress bar which is
	2309	* traversed by the oscillating thumb is value / maximum. The phase
	2310	* determines the position of the moving thumb in that range and is
	2311	* apparently expected to vary between 0 and 120. On earlier systems
	2312	* it is unclear how the phase is used in generating the animation.
	2313	*/
	2314
	2315	ivalue = imaximum;
	2316	} else {
	2317	double value, maximum;
	2318	Tcl_GetDoubleFromObj(NULL, pbar->valueObj, &value);
	2319	Tcl_GetDoubleFromObj(NULL, pbar->maximumObj, &maximum);
	2320	ivalue = (value / maximum)*1000;
	2321	}
	2322
	2323	/*
	2324	* HIThemeTrackDrawInfo uses 2-byte alignment; assigning to a separate
	2325	* bounds variable avoids UBSan (-fsanitize=alignment) complaints.
	2326	*/
	2327
	2328	bounds = BoxToRect(d, b);
2238	2329	HIThemeTrackDrawInfo info = {
2239	2330	.version = 0,
2240		.kind =
2241		(!strcmp("indeterminate",
2242		Tcl_GetString(pbar->modeObj)) && value) ?
2243		kThemeIndeterminateBar : kThemeProgressBar,
2244		.bounds = BoxToRect(d, b),
	2331	.kind = kind,
	2332	.bounds = bounds,
2245	2333	.min = 0,
2246		.max = maximum * factor,
2247		.value = value * factor,
	2334	.max = imaximum,
	2335	.value = ivalue,
2248	2336	.attributes = kThemeTrackShowThumb \|
2249		(orientation == TTK_ORIENT_HORIZONTAL ?
2250		kThemeTrackHorizontal : 0),
	2337	(orientation == TTK_ORIENT_HORIZONTAL ? kThemeTrackHorizontal : 0),
2251	2338	.enableState = Ttk_StateTableLookup(ThemeTrackEnableTable, state),
2252		.trackInfo.progress.phase = phase,
	2339	.trackInfo.progress.phase = phase
2253	2340	};
2254
2255	2341	BEGIN_DRAWING(d)
2256	2342	if (TkMacOSXInDarkMode(tkwin)) {
2257		CGRect bounds = BoxToRect(d, b);
	2343	bounds = BoxToRect(d, b);
2258	2344	NSColorSpace *deviceRGB = [NSColorSpace deviceRGBColorSpace];
2259	2345	NSColor *trackColor = [NSColor colorWithColorSpace: deviceRGB
2260	2346	components: darkTrack

2290	2376	static Ttk_ElementOptionSpec ScrollbarElementOptions[] = {
2291	2377	{"-orient", TK_OPTION_STRING,
2292	2378	Tk_Offset(ScrollbarElement, orientObj), "horizontal"},
2293		{0, 0, 0, 0}
	2379	{NULL, TK_OPTION_BOOLEAN, 0, NULL}
2294	2380	};
2295	2381	static void TroughElementSize(
2296		void *clientData,
	2382	TCL_UNUSED(void *),
2297	2383	void *elementRecord,
2298		Tk_Window tkwin,
	2384	TCL_UNUSED(Tk_Window),
2299	2385	int *minWidth,
2300	2386	int *minHeight,
2301	2387	Ttk_Padding *paddingPtr)

2308	2394	ChkErr(GetThemeMetric, kThemeMetricScrollBarWidth, &thickness);
2309	2395	if (orientation == TTK_ORIENT_HORIZONTAL) {
2310	2396	*minHeight = thickness;
2311		if ([NSApp macMinorVersion] > 7) {
	2397	if ([NSApp macOSVersion] > 100700) {
2312	2398	*paddingPtr = Ttk_MakePadding(4, 4, 4, 3);
2313	2399	}
2314	2400	} else {
2315	2401	*minWidth = thickness;
2316		if ([NSApp macMinorVersion] > 7) {
	2402	if ([NSApp macOSVersion] > 100700) {
2317	2403	*paddingPtr = Ttk_MakePadding(4, 4, 3, 4);
2318	2404	}
2319	2405	}

2334	2420	158.0 / 255, 158.0 / 255, 159.0 / 255, 1.0
2335	2421	};
2336	2422	static void TroughElementDraw(
2337		void *clientData,
	2423	TCL_UNUSED(void *),
2338	2424	void *elementRecord,
2339	2425	Tk_Window tkwin,
2340	2426	Drawable d,
2341	2427	Ttk_Box b,
2342		Ttk_State state)
	2428	TCL_UNUSED(Ttk_State))
2343	2429	{
2344	2430	ScrollbarElement *scrollbar = elementRecord;
2345	2431	int orientation = TTK_ORIENT_HORIZONTAL;

2358	2444	components: rgba
2359	2445	count: 4];
2360	2446	BEGIN_DRAWING(d)
2361		if ([NSApp macMinorVersion] > 8) {
	2447	if ([NSApp macOSVersion] > 100800) {
2362	2448	CGContextSetFillColorWithColor(dc.context, CGCOLOR(troughColor));
2363	2449	} else {
2364	2450	ChkErr(HIThemeSetFill, kThemeBrushDocumentWindowBackground, NULL,

2376	2462	TroughElementDraw
2377	2463	};
2378	2464	static void ThumbElementSize(
2379		void *clientData,
	2465	TCL_UNUSED(void *),
2380	2466	void *elementRecord,
2381		Tk_Window tkwin,
	2467	TCL_UNUSED(Tk_Window),
2382	2468	int *minWidth,
2383	2469	int *minHeight,
2384		Ttk_Padding *paddingPtr)
	2470	TCL_UNUSED(Ttk_Padding *))
2385	2471	{
2386	2472	ScrollbarElement *scrollbar = elementRecord;
2387	2473	int orientation = TTK_ORIENT_HORIZONTAL;

2397	2483	}
2398	2484
2399	2485	static void ThumbElementDraw(
2400		void *clientData,
	2486	TCL_UNUSED(void *),
2401	2487	void *elementRecord,
2402	2488	Tk_Window tkwin,
2403	2489	Drawable d,

2421	2507	* draw the thumb directly.
2422	2508	*/
2423	2509
2424		if ([NSApp macMinorVersion] > 8) {
	2510	if ([NSApp macOSVersion] > 100800) {
2425	2511	CGRect thumbBounds = BoxToRect(d, b);
2426	2512	NSColorSpace *deviceRGB = [NSColorSpace deviceRGBColorSpace];
2427	2513	NSColor *thumbColor;

2447	2533	END_DRAWING
2448	2534	} else {
2449	2535	double thumbSize, trackSize, visibleSize, factor, fraction;
2450		MacDrawable macWin = (MacDrawable ) Tk_WindowId(tkwin);
	2536	MacDrawable macWin = (MacDrawable )Tk_WindowId(tkwin);
2451	2537	CGRect troughBounds = {{macWin->xOff, macWin->yOff},
2452	2538	{Tk_Width(tkwin), Tk_Height(tkwin)}};
2453	2539

2481	2567	visibleSize = (thumbSize / trackSize) * factor;
2482	2568	info.max = factor - visibleSize;
2483	2569	info.trackInfo.scrollbar.viewsize = visibleSize;
2484		if ([NSApp macMinorVersion] < 8 \|\|
	2570	if ([NSApp macOSVersion] < 100800 \|\|
2485	2571	orientation == TTK_ORIENT_HORIZONTAL) {
2486	2572	info.value = factor * fraction;
2487	2573	} else {

2512	2598	ThumbElementDraw
2513	2599	};
2514	2600	static void ArrowElementSize(
2515		void *clientData,
2516		void *elementRecord,
2517		Tk_Window tkwin,
	2601	TCL_UNUSED(void *),
	2602	TCL_UNUSED(void *),
	2603	TCL_UNUSED(Tk_Window),
2518	2604	int *minWidth,
2519	2605	int *minHeight,
2520		Ttk_Padding *paddingPtr)
2521		{
2522		if ([NSApp macMinorVersion] < 8) {
	2606	TCL_UNUSED(Ttk_Padding *))
	2607	{
	2608	if ([NSApp macOSVersion] < 100800) {
2523	2609	minHeight = minWidth = 14;
2524	2610	} else {
2525	2611	minHeight = minWidth = -1;

2543	2629	*/
2544	2630
2545	2631	static void SeparatorElementSize(
2546		void *clientData,
2547		void *elementRecord,
2548		Tk_Window tkwin,
	2632	TCL_UNUSED(void *),
	2633	TCL_UNUSED(void *),
	2634	TCL_UNUSED(Tk_Window),
2549	2635	int *minWidth,
2550	2636	int *minHeight,
2551		Ttk_Padding *paddingPtr)
	2637	TCL_UNUSED(Ttk_Padding *))
2552	2638	{
2553	2639	minWidth = minHeight = 1;
2554	2640	}
2555	2641
2556	2642	static void SeparatorElementDraw(
2557		void *clientData,
2558		void *elementRecord,
	2643	TCL_UNUSED(void *),
	2644	TCL_UNUSED(void *),
2559	2645	Tk_Window tkwin,
2560	2646	Drawable d,
2561	2647	Ttk_Box b,

2595	2681	= kThemeGrowRight \| kThemeGrowDown;
2596	2682
2597	2683	static void SizegripElementSize(
2598		void *clientData,
2599		void *elementRecord,
2600		Tk_Window tkwin,
	2684	TCL_UNUSED(void *),
	2685	TCL_UNUSED(void *),
	2686	TCL_UNUSED(Tk_Window),
2601	2687	int *minWidth,
2602	2688	int *minHeight,
2603		Ttk_Padding *paddingPtr)
	2689	TCL_UNUSED(Ttk_Padding *))
2604	2690	{
2605	2691	HIThemeGrowBoxDrawInfo info = {
2606	2692	.version = 0,

2617	2703	}
2618	2704
2619	2705	static void SizegripElementDraw(
2620		void *clientData,
2621		void *elementRecord,
2622		Tk_Window tkwin,
	2706	TCL_UNUSED(void *),
	2707	TCL_UNUSED(void *),
	2708	TCL_UNUSED(Tk_Window),
2623	2709	Drawable d,
2624	2710	Ttk_Box b,
2625	2711	unsigned int state)

2694	2780	*/
2695	2781
2696	2782	static void FillElementDraw(
2697		void *clientData,
2698		void *elementRecord,
	2783	TCL_UNUSED(void *),
	2784	TCL_UNUSED(void *),
2699	2785	Tk_Window tkwin,
2700	2786	Drawable d,
2701	2787	Ttk_Box b,

2703	2789	{
2704	2790	CGRect bounds = BoxToRect(d, b);
2705	2791
2706		if ([NSApp macMinorVersion] > 8) {
	2792	if ([NSApp macOSVersion] > 100800) {
2707	2793	NSColorSpace *deviceRGB = [NSColorSpace deviceRGBColorSpace];
2708	2794	NSColor *bgColor;
2709	2795	CGFloat fill[4];

2732	2818	void *elementRecord,
2733	2819	Tk_Window tkwin,
2734	2820	Drawable d,
2735		Ttk_Box b,
	2821	TCL_UNUSED(Ttk_Box),
2736	2822	unsigned int state)
2737	2823	{
2738	2824	FillElementDraw(clientData, elementRecord, tkwin, d, Ttk_WinBox(tkwin),

2769	2855	*/
2770	2856
2771	2857	static void ToolbarBackgroundElementDraw(
2772		void *clientData,
2773		void *elementRecord,
	2858	TCL_UNUSED(void *),
	2859	TCL_UNUSED(void *),
2774	2860	Tk_Window tkwin,
2775	2861	Drawable d,
2776		Ttk_Box b,
2777		Ttk_State state)
	2862	TCL_UNUSED(Ttk_Box),
	2863	TCL_UNUSED(Ttk_State))
2778	2864	{
2779	2865	ThemeBrush brush = kThemeBrushToolbarBackground;
2780	2866	CGRect bounds = BoxToRect(d, Ttk_WinBox(tkwin));

2798	2884	* +++ Field elements --
2799	2885	*
2800	2886	* Used for the Treeview widget. This is like the BackgroundElement
2801		* except that the fieldbackground color is configureable.
	2887	* except that the fieldbackground color is configurable.
2802	2888	*/
2803	2889
2804	2890	typedef struct {

2808	2894	static Ttk_ElementOptionSpec FieldElementOptions[] = {
2809	2895	{"-fieldbackground", TK_OPTION_BORDER,
2810	2896	Tk_Offset(FieldElement, backgroundObj), "white"},
2811		{NULL, 0, 0, NULL}
	2897	{NULL, TK_OPTION_BOOLEAN, 0, NULL}
2812	2898	};
2813	2899
2814	2900	static void FieldElementDraw(
2815		void *clientData,
	2901	TCL_UNUSED(void *),
2816	2902	void *elementRecord,
2817	2903	Tk_Window tkwin,
2818	2904	Drawable d,
2819	2905	Ttk_Box b,
2820		Ttk_State state)
	2906	TCL_UNUSED(Ttk_State))
2821	2907	{
2822	2908	FieldElement *e = elementRecord;
2823	2909	Tk_3DBorder backgroundPtr =

2845	2931	*/
2846	2932
2847	2933	static Ttk_StateTable TreeHeaderValueTable[] = {
2848		{kThemeButtonOn, TTK_STATE_ALTERNATE},
2849		{kThemeButtonOn, TTK_STATE_SELECTED},
2850		{kThemeButtonOff, 0}
	2934	{kThemeButtonOn, TTK_STATE_ALTERNATE, 0},
	2935	{kThemeButtonOn, TTK_STATE_SELECTED, 0},
	2936	{kThemeButtonOff, 0, 0}
2851	2937	};
2852	2938
2853	2939	static Ttk_StateTable TreeHeaderAdornmentTable[] = {
2854	2940	{kThemeAdornmentHeaderButtonSortUp,
2855		TTK_STATE_ALTERNATE \| TTK_TREEVIEW_STATE_SORTARROW},
	2941	TTK_STATE_ALTERNATE \| TTK_TREEVIEW_STATE_SORTARROW, 0},
2856	2942	{kThemeAdornmentDefault,
2857		TTK_STATE_SELECTED \| TTK_TREEVIEW_STATE_SORTARROW},
2858		{kThemeAdornmentHeaderButtonNoSortArrow, TTK_STATE_ALTERNATE},
2859		{kThemeAdornmentHeaderButtonNoSortArrow, TTK_STATE_SELECTED},
2860		{kThemeAdornmentFocus, TTK_STATE_FOCUS},
2861		{kThemeAdornmentNone, 0}
	2943	TTK_STATE_SELECTED \| TTK_TREEVIEW_STATE_SORTARROW, 0},
	2944	{kThemeAdornmentHeaderButtonNoSortArrow, TTK_STATE_ALTERNATE, 0},
	2945	{kThemeAdornmentHeaderButtonNoSortArrow, TTK_STATE_SELECTED, 0},
	2946	{kThemeAdornmentFocus, TTK_STATE_FOCUS, 0},
	2947	{kThemeAdornmentNone, 0, 0}
2862	2948	};
2863	2949
2864	2950	static void TreeAreaElementSize (
2865		void *clientData,
2866		void *elementRecord,
2867		Tk_Window tkwin,
2868		int *minWidth,
2869		int *minHeight,
	2951	TCL_UNUSED(void *),
	2952	TCL_UNUSED(void *),
	2953	TCL_UNUSED(Tk_Window),
	2954	TCL_UNUSED(int *),
	2955	TCL_UNUSED(int *),
2870	2956	Ttk_Padding *paddingPtr)
2871	2957	{
2872	2958

2875	2961	* widget expects the heading to be the same height as a row.
2876	2962	*/
2877	2963
2878		if ([NSApp macMinorVersion] > 8) {
	2964	if ([NSApp macOSVersion] > 100800) {
2879	2965	paddingPtr->top = 4;
2880	2966	}
2881	2967	}

2895	2981	int *minHeight,
2896	2982	Ttk_Padding *paddingPtr)
2897	2983	{
2898		if ([NSApp macMinorVersion] > 8) {
	2984	if ([NSApp macOSVersion] > 100800) {
2899	2985	*minHeight = 24;
2900	2986	} else {
2901	2987	ButtonElementSize(clientData, elementRecord, tkwin, minWidth,

2905	2991
2906	2992	static void TreeHeaderElementDraw(
2907	2993	void *clientData,
2908		void *elementRecord,
	2994	TCL_UNUSED(void *),
2909	2995	Tk_Window tkwin,
2910	2996	Drawable d,
2911	2997	Ttk_Box b,

2922	3008	};
2923	3009
2924	3010	BEGIN_DRAWING(d)
2925		if ([NSApp macMinorVersion] > 8) {
	3011	if ([NSApp macOSVersion] > 100800) {
2926	3012
2927	3013	/*
2928	3014	* Compensate for the padding added in TreeHeaderElementSize, so

2961	3047	{kThemeDisclosureRight, 0, 0},
2962	3048	};
2963	3049	static void DisclosureElementSize(
2964		void *clientData,
2965		void *elementRecord,
2966		Tk_Window tkwin,
	3050	TCL_UNUSED(void *),
	3051	TCL_UNUSED(void *),
	3052	TCL_UNUSED(Tk_Window),
2967	3053	int *minWidth,
2968	3054	int *minHeight,
2969		Ttk_Padding *paddingPtr)
	3055	TCL_UNUSED(Ttk_Padding *))
2970	3056	{
2971	3057	SInt32 s;
2972	3058

2977	3063	}
2978	3064
2979	3065	static void DisclosureElementDraw(
2980		void *clientData,
2981		void *elementRecord,
	3066	TCL_UNUSED(void *),
	3067	TCL_UNUSED(void *),
2982	3068	Tk_Window tkwin,
2983	3069	Drawable d,
2984	3070	Ttk_Box b,

2997	3083	};
2998	3084
2999	3085	BEGIN_DRAWING(d)
3000		ChkErr(HIThemeDrawButton, &bounds, &info, dc.context, HIOrientation,
	3086	if ([NSApp macOSVersion] >= 110000) {
	3087	CGFloat rgba[4];
	3088	NSColorSpace *deviceRGB = [NSColorSpace deviceRGBColorSpace];
	3089	NSColor *stroke = [[NSColor textColor]
	3090	colorUsingColorSpace: deviceRGB];
	3091	[stroke getComponents: rgba];
	3092	if (state & TTK_TREEVIEW_STATE_OPEN) {
	3093	DrawOpenDisclosure(dc.context, bounds, 2, 8, rgba);
	3094	} else {
	3095	DrawClosedDisclosure(dc.context, bounds, 2, 12, rgba);
	3096	}
	3097	} else {
	3098	ChkErr(HIThemeDrawButton, &bounds, &info, dc.context, HIOrientation,
3001	3099	NULL);
	3100	}
3002	3101	END_DRAWING
3003	3102	}
3004	3103	}

3048	3147	/* Notebook tabs -- no focus ring */
3049	3148	TTK_LAYOUT("Tab",
3050	3149	TTK_GROUP("Notebook.tab", TTK_FILL_BOTH,
3051		TTK_GROUP("Notebook.padding", TTK_EXPAND \| TTK_FILL_BOTH,
3052		TTK_NODE("Notebook.label", TTK_EXPAND \| TTK_FILL_BOTH))))
	3150	TTK_GROUP("Notebook.padding", TTK_FILL_BOTH,
	3151	TTK_NODE("Notebook.label", TTK_FILL_BOTH))))
3053	3152
3054	3153	/* Spinbox -- buttons 2px to the right of the field. */
3055	3154	TTK_LAYOUT("TSpinbox",
3056	3155	TTK_GROUP("Spinbox.buttons", TTK_PACK_RIGHT,
3057	3156	TTK_NODE("Spinbox.uparrow", TTK_PACK_TOP \| TTK_STICK_E)
3058	3157	TTK_NODE("Spinbox.downarrow", TTK_PACK_BOTTOM \| TTK_STICK_E))
3059		TTK_GROUP("Spinbox.field", TTK_EXPAND \| TTK_FILL_X,
3060		TTK_NODE("Spinbox.textarea", TTK_EXPAND \| TTK_FILL_X)))
	3158	TTK_GROUP("Spinbox.field", TTK_FILL_X,
	3159	TTK_NODE("Spinbox.textarea", TTK_FILL_X)))
3061	3160
3062	3161	/* Progress bars -- track only */
3063	3162	TTK_LAYOUT("TProgressbar",
3064		TTK_NODE("Progressbar.track", TTK_EXPAND \| TTK_FILL_BOTH))
	3163	TTK_NODE("Progressbar.track", TTK_FILL_BOTH))
3065	3164
3066	3165	/* Treeview -- no border. */
3067	3166	TTK_LAYOUT("Treeview",

3086	3185
3087	3186	TTK_LAYOUT("Vertical.TScrollbar",
3088	3187	TTK_GROUP("Vertical.Scrollbar.trough", TTK_FILL_Y,
3089		TTK_NODE("Vertical.Scrollbar.thumb",
3090		TTK_PACK_TOP \| TTK_EXPAND \| TTK_FILL_BOTH)
	3188	TTK_NODE("Vertical.Scrollbar.thumb", TTK_FILL_BOTH)
3091	3189	TTK_NODE("Vertical.Scrollbar.downarrow", TTK_PACK_BOTTOM)
3092	3190	TTK_NODE("Vertical.Scrollbar.uparrow", TTK_PACK_BOTTOM)))
3093	3191
3094	3192	TTK_LAYOUT("Horizontal.TScrollbar",
3095	3193	TTK_GROUP("Horizontal.Scrollbar.trough", TTK_FILL_X,
3096		TTK_NODE("Horizontal.Scrollbar.thumb",
3097		TTK_PACK_LEFT \| TTK_EXPAND \| TTK_FILL_BOTH)
	3194	TTK_NODE("Horizontal.Scrollbar.thumb", TTK_FILL_BOTH)
3098	3195	TTK_NODE("Horizontal.Scrollbar.rightarrow", TTK_PACK_RIGHT)
3099	3196	TTK_NODE("Horizontal.Scrollbar.leftarrow", TTK_PACK_RIGHT)))
3100	3197

+1

-0

manifest.uuid less more

0

e5018b5568fabd6185794db597c53676ae54dc1fa79125233f262b582883bb12

+5

-3

tests/all.tcl less more

3	3	# tests. Execute it by invoking "source all.tcl" when running tktest
4	4	# in this directory.
5	5	#
6		# Copyright (c) 1998-1999 by Scriptics Corporation.
	6	# Copyright © 1998-1999 by Scriptics Corporation.
7	7	#
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.

13	13	tcltest::configure {*}$argv
14	14	tcltest::configure -testdir [file normalize [file dirname [info script]]]
15	15	tcltest::configure -loadfile \
16		[file join [tcltest::testsDirectory] constraints.tcl]
	16	[file join [tcltest::testsDirectory] constraints.tcl]
17	17	tcltest::configure -singleproc 1
18		tcltest::runAllTests
	18	set ErrorOnFailures [info exists env(ERROR_ON_FAILURES)]
	19	encoding system utf-8
	20	if {[tcltest::runAllTests] && $ErrorOnFailures} {exit 1}

+1

-1

tests/bell.test less more

14	14	} -returnCodes {error} -result {bad option "a": must be -displayof or -nice}
15	15
16	16	test bell-1.2 {bell command} -body {
17		bell a b
	17	bell a b
18	18	} -returnCodes {error} -result {bad option "a": must be -displayof or -nice}
19	19
20	20	test bell-1.3 {bell command} -body {

+311

-14

tests/bind.test less more

35	35
36	36	# move the mouse pointer away of the testing area
37	37	# otherwise some spurious events may pollute the tests
38		toplevel .top
39		wm geometry .top 50x50-50-50
40		update
41		event generate .top <Button-1> -warp 1
42		update
43		destroy .top
	38	# also, this will procure a known grab state at startup
	39	# for tests mixing grabs and pointer warps
	40	proc pointerAway {} {
	41	toplevel .top
	42	wm geometry .top 50x50-50-50
	43	update
	44	# On KDE/Plasma _with_the_Aurorae_theme_ (at least), setting up the toplevel
	45	# will not be finished right after the above 'update'. The WM still
	46	# needs some time before the window is fully ready. For me 50 ms is enough,
	47	# but let's wait more (it depends on computer performance).
	48	after 100 ; update
	49	event generate .top <Button-1> -warp 1
	50	update
	51	destroy .top
	52	}
	53	pointerAway
44	54
45	55	test bind-1.1 {bind command} -body {
46	56	bind

6623	6633	# because both bindings are homogeneous equal, so the most recently defined
6624	6634	# must be preferred.
6625	6635	} -result {last}
	6636	test bind-33.16 {simulate use of the keyboard to trigger a pattern sequence with modifier - bug [16ef161925]} -setup {
	6637	pack [frame .t.f]
	6638	focus -force .t.f
	6639	update
	6640	set x {}
	6641	} -body {
	6642	bind .t.f <Escape><Control-c> { lappend x "Esc_Control-c" }
	6643	event generate .t.f <Escape>
	6644	event generate .t.f <Control_L>
	6645	event generate .t.f <Control_L>
	6646	event generate .t.f <Control_L>
	6647	event generate .t.f <Control-c>
	6648	set x
	6649	} -cleanup {
	6650	destroy .t.f
	6651	} -result {Esc_Control-c}
	6652	test bind-33.17 {simulate use of the keyboard to trigger a pattern sequence with modifier - bug [16ef161925]} -setup {
	6653	pack [frame .t.f]
	6654	focus -force .t.f
	6655	update
	6656	set x {}
	6657	} -body {
	6658	bind .t.f <Escape><Control-c> { lappend x "Esc_Control-c" }
	6659	bind .t.f <Escape><Control_L><Control-c> { lappend x "Esc_Ctrl_L_Control-c" }
	6660	event generate .t.f <Escape>
	6661	event generate .t.f <Control_L>
	6662	event generate .t.f <Control_L>
	6663	event generate .t.f <Control_L>
	6664	event generate .t.f <Control-c>
	6665	set x
	6666	} -cleanup {
	6667	destroy .t.f
	6668	} -result {Esc_Ctrl_L_Control-c}
	6669	test bind-33.18 {simulate use of the keyboard to trigger a pattern sequence with modifier - bug [16ef161925]} -setup {
	6670	pack [frame .t.f]
	6671	focus -force .t.f
	6672	update
	6673	set x {}
	6674	} -body {
	6675	bind .t.f <Escape><Control-c> { lappend x "Esc_Control-c" }
	6676	bind .t.f <Escape><Control_L><Control-c> { lappend x "Esc_Ctrl_L_Control-c" }
	6677	bind .t.f <Escape><Control_L><Control_L><Control-c> { lappend x "Esc_Ctrl_L(2)_Control-c" }
	6678	event generate .t.f <Escape>
	6679	event generate .t.f <Control_L>
	6680	event generate .t.f <Control_L>
	6681	event generate .t.f <Control_L>
	6682	event generate .t.f <Control-c>
	6683	set x
	6684	} -cleanup {
	6685	destroy .t.f
	6686	} -result {Esc_Ctrl_L(2)_Control-c}
	6687	test bind-33.19 {simulate use of the keyboard to trigger a pattern sequence with modifier - bug [16ef161925]} -setup {
	6688	pack [frame .t.f]
	6689	focus -force .t.f
	6690	update
	6691	set x {}
	6692	} -body {
	6693	bind .t.f <Escape><Control-c> { lappend x "Esc_Control-c" }
	6694	bind .t.f <Escape><KeyPress><KeyPress><Control-c> { lappend x "Esc_Key(2)_Control-c" }
	6695	event generate .t.f <Escape>
	6696	event generate .t.f <Alt_L>
	6697	event generate .t.f <Control_L>
	6698	event generate .t.f <Control-c>
	6699	set x
	6700	} -cleanup {
	6701	destroy .t.f
	6702	} -result {Esc_Key(2)_Control-c}
	6703	test bind-33.20 {simulate use of the keyboard to trigger a pattern sequence with mixed Key and Button types - bug [16ef161925]} -setup {
	6704	pack [frame .t.f]
	6705	focus -force .t.f
	6706	update
	6707	set x {}
	6708	} -body {
	6709	bind .t.f <Key-1><Button-1> { lappend x "1_Button1" }
	6710	event generate .t.f <Key-1>
	6711	event generate .t.f <KeyRelease-1>
	6712	event generate .t.f <Button-1>
	6713	set x
	6714	} -cleanup {
	6715	destroy .t.f
	6716	} -result {1_Button1}
	6717	test bind-33.21 {simulate use of the keyboard to trigger a pattern sequence with mixed Key and Button types - bug [16ef161925]} -setup {
	6718	pack [frame .t.f]
	6719	focus -force .t.f
	6720	update
	6721	set x {}
	6722	} -body {
	6723	bind .t.f <Key-1><Button-1> { lappend x "1_Button1" }
	6724	bind .t.f <Key-1><Button-1><Key-2> { lappend x "1_Button1_2" }
	6725	event generate .t.f <Key-1>
	6726	event generate .t.f <KeyRelease-1>
	6727	event generate .t.f <Button-1>
	6728	event generate .t.f <Key-2>
	6729	event generate .t.f <KeyRelease-2>
	6730	set x
	6731	} -cleanup {
	6732	destroy .t.f
	6733	} -result {1_Button1 1_Button1_2}
6626	6734
6627	6735	test bind-34.1 {-warp works relatively to a window} -setup {
6628	6736	toplevel .top
	6737	wm geometry .top +100+100
	6738	update
6629	6739	} -body {
6630	6740	# In order to avoid platform-dependent coordinate results due to
6631		# decorations and borders, this test warps the pointer twice
	6741	# decorations and borders, this test warps the pointer twice
6632	6742	# relatively to a window that moved in the meantime, and checks
6633	6743	# how much the pointer moved
6634	6744	wm geometry .top +200+200

6636	6746	event generate .top <Motion> -x 20 -y 20 -warp 1
6637	6747	update idletasks ; # DoWarp is an idle callback
6638	6748	after 50 ; # Win specific - wait for SendInput to be executed
6639		set pointerPos1 [winfo pointerxy .t]
	6749	set pointerPos1 [winfo pointerxy .top]
6640	6750	wm geometry .top +600+600
6641	6751	update
6642	6752	event generate .top <Motion> -x 20 -y 20 -warp 1
6643	6753	update idletasks ; # DoWarp is an idle callback
6644	6754	after 50 ; # Win specific - wait for SendInput to be executed
6645		set pointerPos2 [winfo pointerxy .t]
	6755	set pointerPos2 [winfo pointerxy .top]
6646	6756	# from the first warped position to the second one, the mouse
6647	6757	# pointer should have moved the same amount as the window moved
6648	6758	set res 1

6669	6779	} -cleanup {
6670	6780	} -result {20 20 200 200}
6671	6781	test bind-34.3 {-warp works with null or negative coordinates} -setup {
	6782	# On some OS/WM, at least Linux with KDE, the "Screen edges" feature
	6783	# provides hot spots that can be associated with some action.
	6784	# When activated, the WM will not allow warping to happen on top of
	6785	# a hot spot (which would trigger the corresponding action as an
	6786	# unwanted effect) but will warp the pointer to the hot spot limit only.
	6787	if {[tk windowingsystem] eq "x11"} {
	6788	set halo 1
	6789	} else {
	6790	set halo 0
	6791	}
	6792	set res {}
6672	6793	} -body {
6673	6794	event generate {} <Motion> -x 0 -y 0 -warp 1
6674	6795	update idletasks ; # DoWarp is an idle callback
6675	6796	after 50 ; # Win specific - wait for SendInput to be executed
6676		set res [winfo pointerxy .]
	6797	foreach dim [winfo pointerxy .] {
	6798	if {$dim <= $halo} {
	6799	lappend res ok
	6800	} else {
	6801	lappend res $dim
	6802	}
	6803	}
	6804	event generate {} <Motion> -x 100 -y 100 -warp 1
	6805	update idletasks ; after 50
6677	6806	event generate {} <Motion> -x -1 -y -1 -warp 1
6678		update idletasks ; # DoWarp is an idle callback
6679		after 50 ; # Win specific - wait for SendInput to be executed
	6807	update idletasks ; after 50
6680	6808	foreach dim [winfo pointerxy .] {
6681		if {$dim <= 0} {
	6809	if {$dim <= $halo} {
6682	6810	lappend res ok
6683	6811	} else {
6684	6812	lappend res $dim

6686	6814	}
6687	6815	set res
6688	6816	} -cleanup {
6689		} -result {0 0 ok ok}
	6817	} -result {ok ok ok ok}
	6818
	6819	set keyInfo {}
	6820	set numericKeysym {}
	6821	proc testKey {window event type mods} {
	6822	global keyInfo numericKeysym
	6823	set keyInfo {}
	6824	set numericKeysym {}
	6825	bind $window <KeyPress> {
	6826	set keyInfo [format "%K,0x%%X,0x%%X,%A" %N %k]
	6827	set numericKeysym %N
	6828	}
	6829	focus -force $window
	6830	update
	6831	event generate $window $event
	6832	if {$keyInfo == {}} {
	6833	vwait keyInfo
	6834	}
	6835	set save $keyInfo
	6836	set keyInfo {}
	6837	set injectcmd [list injectkeyevent $type $numericKeysym]
	6838	foreach {option} $mods {
	6839	lappend injectcmd $option
	6840	}
	6841	eval $injectcmd
	6842	if {$keyInfo == {}} {
	6843	vwait keyInfo
	6844	}
	6845	if {$save != $keyInfo} {
	6846	return "[format "0x%x" $numericKeysym] ($mods): $save != $keyInfo"
	6847	}
	6848	return pass
	6849	}
	6850	proc testKeyWithMods {window keysym type} {
	6851	set result [testKey $window "<$keysym>" $type {}]
	6852	if {$result != {pass}} {
	6853	return $result
	6854	}
	6855	set result [testKey $window "<Shift-$keysym>" $type {-shift}]
	6856	if {$result != {pass}} {
	6857	return $result
	6858	}
	6859	set result [testKey $window "<Option-$keysym>" $type {-option}]
	6860	if {$result != {pass}} {
	6861	return $result
	6862	}
	6863	set result [testKey $window "<Shift-Option-$keysym>" $type {-shift -option}]
	6864	if {$result != {pass}} {
	6865	return $result
	6866	}
	6867	return pass
	6868	}
	6869	test bind-35.0 {Generated and real key events agree} -constraints {aqua} -body {
	6870	foreach k {o O F2 Home Right Greek_sigma Greek_ALPHA} {
	6871	set result [testKeyWithMods . $k press]
	6872	if {$result != "pass"} {
	6873	return $result
	6874	}
	6875	}
	6876	return pass
	6877	} -cleanup {
	6878	} -result pass
	6879
	6880	test bind-35.1 {Key events agree for entry widgets} -constraints {aqua} -setup {
	6881	toplevel .new
	6882	entry .new.e
	6883	pack .new.e
	6884	} -body {
	6885	foreach k {o O F2 Home Right Greek_sigma Greek_ALPHA Menu} {
	6886	set result [testKeyWithMods .new.e $k press]
	6887	if {$result != "pass"} {
	6888	return $result
	6889	}
	6890	}
	6891	return pass
	6892	} -cleanup {
	6893	destroy .new.e
	6894	destroy .new
	6895	} -result pass
	6896
	6897	test bind-35.2 {Can bind to function keys} -constraints {aqua} -body {
	6898	global keyInfo numericKeysym
	6899	bind . <KeyPress> {}
	6900	bind . <KeyPress> {
	6901	lappend keyInfo %K
	6902	set numericKeysym %N
	6903	}
	6904	set keyInfo {}
	6905	set numericKeysym {}
	6906	focus -force .
	6907	event generate . <F2>
	6908	injectkeyevent press $numericKeysym -function
	6909	vwait keyInfo
	6910	return $keyInfo
	6911	} -cleanup {
	6912	} -result {F2 F2}
	6913
	6914	test bind-35.3 {Events agree for modifier keys} -constraints {aqua} -setup {
	6915	} -body {
	6916	global keyInfo numericalKeysym
	6917	set result {}
	6918	bind . <KeyPress> {
	6919	set keyInfo [format "%K,0x%%X,0x%%X,%A" %N %k]
	6920	set numericalKeysym [format "0x%x" %N]
	6921	}
	6922	foreach event {
	6923	{<Control_L> -control}
	6924	{<Control_R> -control}
	6925	{<Alt_L> -option}
	6926	{<Alt_R> -option}
	6927	{<Meta_L> -command}
	6928	{<Meta_R> -command}
	6929	{<Shift_L> -shift}
	6930	{<Shift_R> -shift}
	6931	} {
	6932	set keyInfo {}
	6933	event generate . [lindex $event 0]
	6934	if {$keyInfo == {}} {
	6935	vwait keyInfo
	6936	}
	6937	set save $keyInfo
	6938	injectkeyevent flagschanged $numericKeysym [lindex $event 1]
	6939	if {$keyInfo == {}} {
	6940	vwait keyInfo
	6941	}
	6942	if {$save != $keyInfo} {
	6943	return "$save != $keyInfo"
	6944	}
	6945	}
	6946	return pass
	6947	} -cleanup {
	6948	} -result pass
	6949
	6950	test bind-36.1 {pointer warp with grab on toplevel, bug [e3888d5820]} -setup {
	6951	pointerAway
	6952	toplevel .top
	6953	grab release .top
	6954	wm geometry .top 200x200+300+300
	6955	label .top.l -height 5 -width 20 -highlightthickness 2 \
	6956	-highlightbackground black -bg yellow -text "My label"
	6957	pack .top.l -side bottom
	6958	update
	6959	# On KDE/Plasma _with_the_Aurorae_theme_ (at least), setting up the toplevel
	6960	# and the label will not be finished after the above 'update'. The WM still
	6961	# needs some time before the window is fully ready. For me 50 ms is enough,
	6962	# but let's wait more (it depends on computer performance).
	6963	after 100 ; update
	6964	} -body {
	6965	grab .top ; # this will queue events
	6966	after 50
	6967	update
	6968	event generate .top.l <Motion> -warp 1 -x 10 -y 10
	6969	update idletasks ; after 50
	6970	foreach {x1 y1} [winfo pointerxy .top.l] {}
	6971	event generate {} <Motion> -warp 1 -x 50 -y 50
	6972	update idletasks ; after 50
	6973	grab release .top ; # this will queue events
	6974	after 50
	6975	update
	6976	event generate .top.l <Motion> -warp 1 -x 10 -y 10
	6977	update idletasks ; after 50
	6978	foreach {x2 y2} [winfo pointerxy .top.l] {}
	6979	# success if the coords are the same with or without the grab, and if they
	6980	# are at (10,10) inside the label widget as requested by the warping
	6981	expr {$x1==$x2 && $y1==$y2 && $x1==[winfo rootx .top.l]+10 \
	6982	&& $y1==[winfo rooty .top.l]+10}
	6983	} -cleanup {
	6984	destroy .top
	6985	unset x1 y1 x2 y2
	6986	} -result {1}
6690	6987
6691	6988	# cleanup
6692	6989	cleanupTests

+3

-3

tests/bitmap.test less more

14	14	testbitmap
15	15	} -body {
16	16	set x gray25
17		lindex $x 0
	17	lindex $x 0
18	18	button .b -bitmap $x
19	19	lindex $x 0
20	20	testbitmap gray25

53	53	test bitmap-2.1 {Tk_GetBitmap procedure} -body {
54	54	button .b1 -bitmap bad_name
55	55	} -cleanup {
56		destroy .b1
	56	destroy .b1
57	57	} -returnCodes error -result {bitmap "bad_name" not defined}
58	58	test bitmap-2.2 {Tk_GetBitmap procedure} -body {
59	59	button .b1 -bitmap @xyzzy
60	60	} -cleanup {
61		destroy .b1
	61	destroy .b1
62	62	} -returnCodes error -result {error reading bitmap file "xyzzy"}
63	63
64	64	test bitmap-3.1 {Tk_FreeBitmapFromObj - reference counts} -constraints {

+11

-11

tests/border.test less more

9	9	eval tcltest::configure $argv
10	10	tcltest::loadTestedCommands
11	11
12		test border-1.1 {Tk_AllocBorderFromObj - converting internal reps} -constraints {
13		testborder
	12	test border-1.1 {Tk_AllocBorderFromObj - converting internal reps} -constraints {
	13	testborder
14	14	} -body {
15	15	set x orange
16	16	lindex $x 0

20	20	} -cleanup {
21	21	destroy .b1
22	22	} -result {{1 0}}
23		test border-1.2 {Tk_AllocBorderFromObj - discard stale border} -constraints {
24		testborder
	23	test border-1.2 {Tk_AllocBorderFromObj - discard stale border} -constraints {
	24	testborder
25	25	} -setup {
26	26	set result {}
27	27	} -body {

34	34	} -cleanup {
35	35	destroy .b1 .b2
36	36	} -result {{} {{1 1}}}
37		test border-1.3 {Tk_AllocBorderFromObj - reuse existing border} -constraints {
38		testborder
	37	test border-1.3 {Tk_AllocBorderFromObj - reuse existing border} -constraints {
	38	testborder
39	39	} -setup {
40	40	set result {}
41	41	} -body {

48	48	} -cleanup {
49	49	destroy .b1 .b2
50	50	} -result {{{1 1}} {{2 1}}}
51		test border-1.4 {Tk_AllocBorderFromObj - try other borders in list} -constraints {
	51	test border-1.4 {Tk_AllocBorderFromObj - try other borders in list} -constraints {
52	52	testborder pseudocolor8
53	53	} -setup {
54	54	toplevel .t -visual {pseudocolor 8} -colormap new

69	69	destroy .b1 .b2 .t
70	70	} -result {{{1 1}} {{1 1} {1 0}} {{1 0} {2 1}}}
71	71
72		test border-2.1 {Tk_Free3DBorder - reference counts} -constraints {
	72	test border-2.1 {Tk_Free3DBorder - reference counts} -constraints {
73	73	testborder pseudocolor8
74	74	} -setup {
75	75	toplevel .t -visual {pseudocolor 8} -colormap new

93	93	} -cleanup {
94	94	destroy .b1 .b2 .t
95	95	} -result {{{1 0} {2 1}} {{1 0} {1 1}} {{1 0}} {}}
96		test border-2.2 {Tk_Free3DBorder - unlinking from list} -constraints {
	96	test border-2.2 {Tk_Free3DBorder - unlinking from list} -constraints {
97	97	testborder pseudocolor8
98	98	} -setup {
99	99	toplevel .t -visual {pseudocolor 8} -colormap new

126	126	destroy .b .t2 .t3 .t
127	127	} -result {{{4 1} {3 0} {2 0} {1 0}} {{4 1} {2 0} {1 0}} {{4 1} {2 0}} {{2 0}} {}}
128	128
129		test border-3.1 {FreeBorderObjProc} -constraints {
130		testborder
	129	test border-3.1 {FreeBorderObjProc} -constraints {
	130	testborder
131	131	} -setup {
132	132	set result {}
133	133	proc copy {s} {return [string index $s 0][string range $s 1 end]}

+1

-1

tests/busy.test less more

5	5	#
6	6	# Copyright (c) 1998-2000 by Jos Decoster. All rights reserved.
7	7
8		package require tcltest 2.1
	8	package require tcltest 2.2
9	9	tcltest::configure {*}$argv
10	10	tcltest::loadTestedCommands
11	11	namespace import -force tcltest::test

+1

-1

tests/butGeom2.tcl less more

7	7	wm geom .t +0+0
8	8	wm minsize .t 1 1
9	9
10		label .t.l -text {This screen exercises the color options for various flavors of buttons. Select display options below, and they will be applied to the appropiate button widgets.} -wraplength 5i
	10	label .t.l -text {This screen exercises the color options for various flavors of buttons. Select display options below, and they will be applied to the appropriate button widgets.} -wraplength 5i
11	11	pack .t.l -side top -fill both
12	12
13	13	button .t.quit -text Quit -command {destroy .t}

+93

-93

tests/button.test less more

561	561	update
562	562	} -body {
563	563	.l configure -borderwidth 1.3
564		.l cget -borderwidth
	564	.l cget -borderwidth
565	565	} -cleanup {
566	566	destroy .l
567	567	} -result {1.3}

580	580	update
581	581	} -body {
582	582	.b configure -borderwidth 1.3
583		.b cget -borderwidth
	583	.b cget -borderwidth
584	584	} -cleanup {
585	585	destroy .b
586	586	} -result {1.3}

599	599	update
600	600	} -body {
601	601	.c configure -borderwidth 1.3
602		.c cget -borderwidth
	602	.c cget -borderwidth
603	603	} -cleanup {
604	604	destroy .c
605	605	} -result {1.3}

618	618	update
619	619	} -body {
620	620	.r configure -borderwidth 1.3
621		.r cget -borderwidth
	621	.r cget -borderwidth
622	622	} -cleanup {
623	623	destroy .r
624	624	} -result {1.3}

1002	1002	} -returnCodes {error} -result {unknown color name "non-existent"}
1003	1003
1004	1004	test button-1.103 {configuration option: "font" for label} -setup {
1005		label .l -borderwidth 2 -highlightthickness 2
	1005	label .l -borderwidth 2 -highlightthickness 2
1006	1006	pack .l
1007	1007	update
1008	1008	} -body {

1012	1012	destroy .l
1013	1013	} -result {Helvetica -12}
1014	1014	test button-1.104 {configuration option: "activebackground" for label} -setup {
1015		label .l -borderwidth 2 -highlightthickness 2
	1015	label .l -borderwidth 2 -highlightthickness 2
1016	1016	pack .l
1017	1017	update
1018	1018	} -body {

1021	1021	destroy .l
1022	1022	} -returnCodes {error} -result {font "" doesn't exist}
1023	1023	test button-1.105 {configuration option: "font" for button} -setup {
1024		button .b -borderwidth 2 -highlightthickness 2
	1024	button .b -borderwidth 2 -highlightthickness 2
1025	1025	pack .b
1026	1026	update
1027	1027	} -body {

1031	1031	destroy .b
1032	1032	} -result {Helvetica -12}
1033	1033	test button-1.106 {configuration option: "activebackground" for button} -setup {
1034		button .b -borderwidth 2 -highlightthickness 2
	1034	button .b -borderwidth 2 -highlightthickness 2
1035	1035	pack .b
1036	1036	update
1037	1037	} -body {

1040	1040	destroy .b
1041	1041	} -returnCodes {error} -result {font "" doesn't exist}
1042	1042	test button-1.107 {configuration option: "font" for checkbutton} -setup {
1043		checkbutton .c -borderwidth 2 -highlightthickness 2
	1043	checkbutton .c -borderwidth 2 -highlightthickness 2
1044	1044	pack .c
1045	1045	update
1046	1046	} -body {

1050	1050	destroy .c
1051	1051	} -result {Helvetica -12}
1052	1052	test button-1.108 {configuration option: "activebackground" for checkbutton} -setup {
1053		checkbutton .c -borderwidth 2 -highlightthickness 2
	1053	checkbutton .c -borderwidth 2 -highlightthickness 2
1054	1054	pack .c
1055	1055	update
1056	1056	} -body {

1059	1059	destroy .c
1060	1060	} -returnCodes {error} -result {font "" doesn't exist}
1061	1061	test button-1.109 {configuration option: "font" for radiobutton} -setup {
1062		radiobutton .r -borderwidth 2 -highlightthickness 2
	1062	radiobutton .r -borderwidth 2 -highlightthickness 2
1063	1063	pack .r
1064	1064	update
1065	1065	} -body {

1069	1069	destroy .r
1070	1070	} -result {Helvetica -12}
1071	1071	test button-1.110 {configuration option: "activebackground" for radiobutton} -setup {
1072		radiobutton .r -borderwidth 2 -highlightthickness 2
	1072	radiobutton .r -borderwidth 2 -highlightthickness 2
1073	1073	pack .r
1074	1074	update
1075	1075	} -body {

2668	2668	} -result {}
2669	2669
2670	2670	# ex-tests 3.*
2671		test button-2.1 {ButtonCreate - not enough arguments} -body {
	2671	test button-2.1 {ButtonCreate - not enough arguments} -body {
2672	2672	button
2673	2673	} -returnCodes {error} -result {wrong # args: should be "button pathName ?-option value ...?"}
2674	2674

2708	2708	test button-2.7 {ButtonCreate - bad window name} -body {
2709	2709	button foo
2710	2710	} -cleanup {
2711		destroy foo
	2711	destroy foo
2712	2712	} -returnCodes {error} -result {bad window path name "foo"}
2713		######### test ex 3.8
2714		test button-2.8 {ButtonCreate procedure - error in default option value} -body {
	2713	######### test ex 3.8
	2714	test button-2.8 {ButtonCreate procedure - error in default option value} -body {
2715	2715	option add *funny.background bogus
2716	2716	button .funny
2717	2717	} -cleanup {
2718	2718	option clear
2719	2719	destroy .funny
2720		} -returnCodes {error} -result {unknown color name "bogus"}
	2720	} -returnCodes {error} -result {unknown color name "bogus"}
2721	2721	test button-2.9 {ButtonCreate procedure - error in default option value} -body {
2722	2722	option add *funny.background bogus
2723	2723	catch {button .funny}

2730	2730	invoked from within
2731	2731	"button .funny"}
2732	2732
2733		test button-2.10 {ButtonCreate procedure - option error} -body {
	2733	test button-2.10 {ButtonCreate procedure - option error} -body {
2734	2734	button .x -gorp foo
2735	2735	} -cleanup {
2736	2736	destroy .x
2737		} -returnCodes {error} -result {unknown option "-gorp"}
	2737	} -returnCodes {error} -result {unknown option "-gorp"}
2738	2738	test button-2.11 {ButtonCreate procedure - option error} -body {
2739		catch {button .x -gorp foo}
	2739	catch {button .x -gorp foo}
2740	2740	winfo exists .x
2741	2741	} -cleanup {
2742	2742	destroy .x

2787	2787	.l cget -disabledforeground
2788	2788	} -cleanup {
2789	2789	destroy .l
2790		} -returnCodes {ok} -match {glob} -result {*}
	2790	} -returnCodes {ok} -match {glob} -result {*}
2791	2791	test button-3.7 {ButtonWidgetCmd procedure, "cget" option} -body {
2792	2792	button .b
2793	2793	.b cget -disabledforeground
2794	2794	} -cleanup {
2795	2795	destroy .b
2796		} -returnCodes {ok} -match {glob} -result {*}
	2796	} -returnCodes {ok} -match {glob} -result {*}
2797	2797	test button-3.8 {ButtonWidgetCmd procedure, "cget" option} -body {
2798	2798	button .b
2799	2799	.b cget -variable

2806	2806	.c cget -variable
2807	2807	} -cleanup {
2808	2808	destroy .c
2809		} -returnCodes {ok} -match {glob} -result {*}
	2809	} -returnCodes {ok} -match {glob} -result {*}
2810	2810	test button-3.10 {ButtonWidgetCmd procedure, "cget" option} -body {
2811	2811	checkbutton .c
2812	2812	.c cget -value

2819	2819	.r cget -value
2820	2820	} -cleanup {
2821	2821	destroy .r
2822		} -returnCodes {ok} -match {glob} -result {*}
	2822	} -returnCodes {ok} -match {glob} -result {*}
2823	2823	test button-3.12 {ButtonWidgetCmd procedure, "cget" option} -body {
2824	2824	radiobutton .r
2825	2825	.r cget -onvalue

2839	2839	llength [.c configure]
2840	2840	} -cleanup {
2841	2841	destroy .c
2842		} -result {41}
	2842	} -result {41}
2843	2843	test button-3.15 {ButtonWidgetCmd procedure, "configure" option} -body {
2844	2844	button .b
2845	2845	.b configure -gorp

2888	2888	return $checkvar
2889	2889	} -cleanup {
2890	2890	destroy .c
2891		} -result {0}
	2891	} -result {0}
2892	2892	test button-3.22 {ButtonWidgetCmd procedure, "deselect" option} -body {
2893	2893	radiobutton .r -variable radiovar -value red
2894	2894	set radiovar green

2896	2896	return $radiovar
2897	2897	} -cleanup {
2898	2898	destroy .r
2899		} -result {green}
	2899	} -result {green}
2900	2900	test button-3.23 {ButtonWidgetCmd procedure, "deselect" option} -body {
2901	2901	radiobutton .r -variable radiovar -value red
2902	2902	set radiovar red

2904	2904	return $radiovar
2905	2905	} -cleanup {
2906	2906	destroy .r
2907		} -result {}
2908
2909		test button-3.24 {ButtonWidgetCmd procedure, "deselect" option} -body {
	2907	} -result {}
	2908
	2909	test button-3.24 {ButtonWidgetCmd procedure, "deselect" option} -body {
2910	2910	checkbutton .c -variable checkvar -onvalue 1 -offvalue 0
2911	2911	set checkvar 1
2912	2912	trace variable checkvar w bogusTrace

2914	2914	} -cleanup {
2915	2915	destroy .c
2916	2916	trace vdelete checkvar w bogusTrace
2917		} -returnCodes {error} -result {can't set "checkvar": trace aborted}
	2917	} -returnCodes {error} -result {can't set "checkvar": trace aborted}
2918	2918	test button-3.25 {ButtonWidgetCmd procedure, "deselect" option} -body {
2919	2919	checkbutton .c -variable checkvar -onvalue 1 -offvalue 0
2920	2920	set checkvar 1

2936	2936	} -cleanup {
2937	2937	destroy .r
2938	2938	trace vdelete radiovar w bogusTrace
2939		} -match {glob} -returnCodes {error} -result {can't set "radiovar": trace aborted}
	2939	} -match {glob} -returnCodes {error} -result {can't set "radiovar": trace aborted}
2940	2940	test button-3.27 {ButtonWidgetCmd procedure, "deselect" option} -body {
2941	2941	radiobutton .r -variable radiovar -value red
2942	2942	set radiovar red

2963	2963	} -cleanup {
2964	2964	destroy .l
2965	2965	} -returnCodes {error} -result {bad option "flash": must be cget or configure}
2966		test button-3.30 {ButtonWidgetCmd procedure, "flash" option} -body {
	2966	test button-3.30 {ButtonWidgetCmd procedure, "flash" option} -body {
2967	2967	button .b
2968	2968	catch {.b flash}
2969	2969	} -cleanup {
2970	2970	destroy .b
2971	2971	} -returnCodes {ok} -match {glob} -result {*}
2972		test button-3.31 {ButtonWidgetCmd procedure, "flash" option} -body {
	2972	test button-3.31 {ButtonWidgetCmd procedure, "flash" option} -body {
2973	2973	checkbutton .c
2974	2974	catch {.c flash}
2975	2975	} -cleanup {
2976	2976	destroy .c
2977	2977	} -returnCodes {ok} -match {glob} -result {*}
2978		test button-3.32 {ButtonWidgetCmd procedure, "flash" option} -body {
	2978	test button-3.32 {ButtonWidgetCmd procedure, "flash" option} -body {
2979	2979	radiobutton .r
2980	2980	catch {.r f}
2981	2981	} -cleanup {

3059	3059	destroy .c
3060	3060	} -result {lovely}
3061	3061	test button-3.43 {ButtonWidgetCmd procedure, "select" option} -body {
3062		radiobutton .r -variable radiovar -value red
	3062	radiobutton .r -variable radiovar -value red
3063	3063	set radiovar green
3064	3064	.r select
3065	3065	return $radiovar
3066	3066	} -cleanup {
3067	3067	destroy .r
3068	3068	} -result {red}
3069		test button-3.44 {ButtonWidgetCmd procedure, "select" option} -body {
	3069	test button-3.44 {ButtonWidgetCmd procedure, "select" option} -body {
3070	3070	radiobutton .r -variable radiovar -value red
3071	3071	set radiovar yellow
3072	3072	trace variable radiovar w bogusTrace

3074	3074	} -cleanup {
3075	3075	destroy .r
3076	3076	trace vdelete radiovar w bogusTrace
3077		} -returnCodes {error} -result {can't set "radiovar": trace aborted}
	3077	} -returnCodes {error} -result {can't set "radiovar": trace aborted}
3078	3078	test button-3.45 {ButtonWidgetCmd procedure, "select" option} -body {
3079	3079	radiobutton .r -variable radiovar -value red
3080	3080	set radiovar yellow

3127	3127	} -cleanup {
3128	3128	destroy .c
3129	3129	} -result {sunshine rain sunshine}
3130		test button-3.51 {ButtonWidgetCmd procedure, "toggle" option} -body {
	3130	test button-3.51 {ButtonWidgetCmd procedure, "toggle" option} -body {
3131	3131	checkbutton .c -variable checkvar -onvalue xyz -offvalue abc
3132	3132	set checkvar xyz
3133	3133	trace variable checkvar w bogusTrace

3135	3135	} -cleanup {
3136	3136	destroy .c
3137	3137	trace vdelete checkvar w bogusTrace
3138		} -returnCodes {error} -result {can't set "checkvar": trace aborted}
	3138	} -returnCodes {error} -result {can't set "checkvar": trace aborted}
3139	3139	test button-3.52 {ButtonWidgetCmd procedure, "toggle" option} -body {
3140	3140	checkbutton .c -variable checkvar -onvalue xyz -offvalue abc
3141	3141	set checkvar xyz
3142	3142	trace variable checkvar w bogusTrace
3143		catch {.c toggle}
	3143	catch {.c toggle}
3144	3144	list $errorInfo $checkvar
3145	3145	} -cleanup {
3146	3146	trace vdelete checkvar w bogusTrace

3149	3149	while executing
3150	3150	*
3151	3151	".c toggle"} abc}
3152		test button-3.53 {ButtonWidgetCmd procedure, "toggle" option} -body {
	3152	test button-3.53 {ButtonWidgetCmd procedure, "toggle" option} -body {
3153	3153	checkbutton .c -variable checkvar -onvalue xyz -offvalue abc
3154	3154	set checkvar abc
3155	3155	trace variable checkvar w bogusTrace

3157	3157	} -cleanup {
3158	3158	trace vdelete checkvar w bogusTrace
3159	3159	destroy .c
3160		} -returnCodes {error} -result {can't set "checkvar": trace aborted}
	3160	} -returnCodes {error} -result {can't set "checkvar": trace aborted}
3161	3161	test button-3.54 {ButtonWidgetCmd procedure, "toggle" option} -body {
3162	3162	checkbutton .c -variable checkvar -onvalue xyz -offvalue abc
3163	3163	set checkvar abc
3164	3164	trace variable checkvar w bogusTrace
3165		catch {.c toggle}
	3165	catch {.c toggle}
3166	3166	list $errorInfo $checkvar
3167	3167	} -cleanup {
3168	3168	trace vdelete checkvar w bogusTrace

3173	3173	".c toggle"} xyz}
3174	3174	test button-3.55 {ButtonWidgetCmd procedure, "toggle" option} -setup {
3175	3175	unset -nocomplain checkvar
3176		} -body {
	3176	} -body {
3177	3177	checkbutton .c -variable checkvar -onvalue xyz -offvalue abc
3178	3178	unset checkvar
3179	3179	set checkvar(1) 1
3180	3180	.c toggle
3181	3181	} -cleanup {
3182	3182	destroy .c
3183		} -returnCodes {error} -result {can't set "checkvar": variable is array}
	3183	} -returnCodes {error} -result {can't set "checkvar": variable is array}
3184	3184	test button-3.56 {ButtonWidgetCmd procedure, "toggle" option} -setup {
3185	3185	unset -nocomplain checkvar
3186		} -body {
	3186	} -body {
3187	3187	checkbutton .c -variable checkvar -onvalue xyz -offvalue abc
3188	3188	unset checkvar
3189	3189	set checkvar(1) 1

3208	3208	checkbutton .b5 -variable x -text "Checkbutton 5"
3209	3209	set x 1
3210	3210	pack .b1 .b2 .b3 .b4 .b5
3211		update
3212		deleteWindows
	3211	update
	3212	deleteWindows
3213	3213	} -cleanup {
3214	3214	destroy .b1 .b2 .b3 .b4 .b5
3215	3215	image delete image1
3216		} -result {}
	3216	} -result {}
3217	3217
3218	3218	test button-5.1 {ConfigureButton - textvariable trace} -body {
3219	3219	button .b -bd 4 -bg green
3220	3220	.b configure -bd 7 -bg red -fg bogus
3221	3221	} -cleanup {
3222	3222	destroy .b
3223		} -returnCodes {error} -result {unknown color name "bogus"}
	3223	} -returnCodes {error} -result {unknown color name "bogus"}
3224	3224	test button-5.2 {ConfigureButton - textvariable trace} -body {
3225	3225	button .b -bd 4 -bg green
3226		catch {.b configure -bd 7 -bg red -fg bogus}
	3226	catch {.b configure -bd 7 -bg red -fg bogus}
3227	3227	list [.b cget -bd] [.b cget -bg]
3228	3228	} -cleanup {
3229	3229	destroy .b

3270	3270	checkbutton .c
3271	3271	.c cget -variable
3272	3272	} -cleanup {
3273		destroy .c
	3273	destroy .c
3274	3274	} -result {c}
3275	3275	test button-5.7 {ConfigureButton - setting selected state from variable} -body {
3276	3276	set x 0

3304	3304	unset -nocomplain x
3305	3305	} -body {
3306	3306	trace variable x w bogusTrace
3307		radiobutton .r -variable x
	3307	radiobutton .r -variable x
3308	3308	} -cleanup {
3309	3309	destroy .r
3310	3310	trace vdelete x w bogusTrace

3341	3341	} -cleanup {
3342	3342	trace vdelete x w bogusTrace
3343	3343	destroy .r
3344		} -returnCodes {error} -result {can't set "x": trace aborted}
	3344	} -returnCodes {error} -result {can't set "x": trace aborted}
3345	3345	test button-5.15 {ConfigureButton - variable handling} -setup {
3346	3346	unset -nocomplain x
3347	3347	} -body {

3354	3354	} -result {foo}
3355	3355
3356	3356	#ex 6.14
3357		test button-5.16 {ConfigureButton - -width option} -body {
	3357	test button-5.16 {ConfigureButton - -width option} -body {
3358	3358	button .b -text "Button 1"
3359	3359	.b configure -width 1i
3360	3360	} -cleanup {
3361	3361	destroy .b
3362		} -returnCodes {error} -result {expected integer but got "1i"}
	3362	} -returnCodes {error} -result {expected integer but got "1i"}
3363	3363	test button-5.17 {ConfigureButton - -width option} -body {
3364	3364	button .b -text "Button 1"
3365	3365	catch {.b configure -width 1i}

3370	3370	(processing -width option)
3371	3371	invoked from within
3372	3372	".b configure -width 1i"}
3373		test button-5.18 {ConfigureButton - -height option} -body {
	3373	test button-5.18 {ConfigureButton - -height option} -body {
3374	3374	button .b -text "Button 1"
3375	3375	.b configure -height 0.5c
3376	3376	} -cleanup {
3377	3377	destroy .b
3378		} -returnCodes {error} -result {expected integer but got "0.5c"}
3379		test button-5.19 {ConfigureButton - -height option} -body {
	3378	} -returnCodes {error} -result {expected integer but got "0.5c"}
	3379	test button-5.19 {ConfigureButton - -height option} -body {
3380	3380	button .b -text "Button 1"
3381		catch {.b configure -height 0.5c}
	3381	catch {.b configure -height 0.5c}
3382	3382	return $errorInfo
3383	3383	} -cleanup {
3384	3384	destroy .b

3392	3392	.b configure -width abc
3393	3393	} -cleanup {
3394	3394	destroy .b
3395		} -returnCodes {error} -result {bad screen distance "abc"}
	3395	} -returnCodes {error} -result {bad screen distance "abc"}
3396	3396	test button-5.21 {ConfigureButton - -width option} -body {
3397	3397	button .b -bitmap questhead
3398		catch {.b configure -width abc}
	3398	catch {.b configure -width abc}
3399	3399	return $errorInfo
3400	3400	} -cleanup {
3401	3401	destroy .b

3413	3413	} -cleanup {
3414	3414	destroy .b
3415	3415	image delete image1
3416		} -returnCodes {error} -result {bad screen distance "0.5x"}
	3416	} -returnCodes {error} -result {bad screen distance "0.5x"}
3417	3417	test button-5.23 {ConfigureButton - -height option} -constraints {
3418	3418	testImageType
3419	3419	} -setup {

3421	3421	} -body {
3422	3422	#ztestImageType
3423	3423	button .b -image image1
3424		catch {.b configure -height 0.5x}
	3424	catch {.b configure -height 0.5x}
3425	3425	return $errorInfo
3426	3426	} -cleanup {
3427	3427	destroy .b

3522	3522
3523	3523	test button-8.1 {TkInvokeButton procedure} -setup {
3524	3524	set x 0
3525		} -body {
	3525	} -body {
3526	3526	checkbutton .c -variable x
3527	3527	set result $x
3528	3528	.c invoke

3533	3533	destroy .c
3534	3534	} -result {0 1 0}
3535	3535
3536		test button-8.2 {TkInvokeButton procedure} -setup {
	3536	test button-8.2 {TkInvokeButton procedure} -setup {
3537	3537	set x 0
3538		} -body {
	3538	} -body {
3539	3539	checkbutton .c -variable x
3540	3540	trace variable x w bogusTrace
3541	3541	.c invoke

3545	3545	} -returnCodes {error} -result {can't set "x": trace aborted}
3546	3546	test button-8.3 {TkInvokeButton procedure} -setup {
3547	3547	set x 0
3548		} -body {
	3548	} -body {
3549	3549	checkbutton .c -variable x
3550	3550	trace variable x w bogusTrace
3551	3551	catch {.c invoke}

3554	3554	destroy .c
3555	3555	trace vdelete x w bogusTrace
3556	3556	} -result {1}
3557		test button-8.4 {TkInvokeButton procedure} -setup {
	3557	test button-8.4 {TkInvokeButton procedure} -setup {
3558	3558	set x 1
3559		} -body {
	3559	} -body {
3560	3560	checkbutton .c -variable x
3561	3561	trace variable x w bogusTrace
3562	3562	.c invoke

3566	3566	} -returnCodes {error} -result {can't set "x": trace aborted}
3567	3567	test button-8.5 {TkInvokeButton procedure} -setup {
3568	3568	set x 1
3569		} -body {
	3569	} -body {
3570	3570	checkbutton .c -variable x
3571	3571	trace variable x w bogusTrace
3572	3572	catch {.c invoke}

3578	3578
3579	3579	test button-8.6 {TkInvokeButton procedure} -setup {
3580	3580	set x 0
3581		} -body {
	3581	} -body {
3582	3582	radiobutton .r -variable x -value red
3583	3583	set result $x
3584	3584	.r invoke

3589	3589	destroy .r
3590	3590	} -result {0 red red}
3591	3591
3592		test button-8.7 {TkInvokeButton procedure} -body {
	3592	test button-8.7 {TkInvokeButton procedure} -body {
3593	3593	radiobutton .r -variable x -value red
3594	3594	set x green
3595	3595	trace variable x w bogusTrace

3598	3598	destroy .r
3599	3599	trace vdelete x w bogusTrace
3600	3600	} -returnCodes {error} -result {can't set "x": trace aborted}
3601		test button-8.8 {TkInvokeButton procedure} -body {
	3601	test button-8.8 {TkInvokeButton procedure} -body {
3602	3602	radiobutton .r -variable x -value red
3603	3603	set x green
3604	3604	trace variable x w bogusTrace

3753	3753	} -result {0}
3754	3754
3755	3755	test button-11.1 {ButtonImageProc procedure} -constraints {
3756		testImageType
	3756	testImageType
3757	3757	} -setup {
3758	3758	label .l -highlightthickness 0 -font {Helvetica -12 bold}
3759	3759	image create test image1

3787	3787	label .c -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
3788	3788	set result {}
3789	3789	} -body {
3790		.a configure -text Hej
	3790	.a configure -text Hej
3791	3791	.b configure -text Hej -width 10 -height 1
3792	3792	.c configure -text "" -width 10 -height 1
3793	3793

3799	3799	lappend result [expr {[winfo reqheight .a] == [winfo reqheight .b]}]
3800	3800	} -cleanup {
3801	3801	destroy .a .b .c
3802		} -result {1 1 1}
	3802	} -result {1 1 1}
3803	3803	test button-13.2 {size behavior: label} -setup {
3804	3804	label .a -borderwidth 2 -highlightthickness 2 -font {Arial 20}
3805	3805	label .b -borderwidth 2 -highlightthickness 2 -font {Arial 20}
3806	3806	label .c -borderwidth 2 -highlightthickness 2 -font {Arial 20}
3807	3807	set result {}
3808	3808	} -body {
3809		.a configure -text Hej
	3809	.a configure -text Hej
3810	3810	.b configure -text Hej -width 10 -height 1
3811	3811	.c configure -text "" -width 10 -height 1
3812	3812

3818	3818	lappend result [expr {[winfo reqheight .a] == [winfo reqheight .b]}]
3819	3819	} -cleanup {
3820	3820	destroy .a .b .c
3821		} -result {1 1 1}
	3821	} -result {1 1 1}
3822	3822
3823	3823	test button-13.3 {size behavior: button} -setup {
3824	3824	button .a -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}

3826	3826	button .c -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
3827	3827	set result {}
3828	3828	} -body {
3829		.a configure -text Hej
	3829	.a configure -text Hej
3830	3830	.b configure -text Hej -width 10 -height 1
3831	3831	.c configure -text "" -width 10 -height 1
3832	3832

3838	3838	lappend result [expr {[winfo reqheight .a] == [winfo reqheight .b]}]
3839	3839	} -cleanup {
3840	3840	destroy .a .b .c
3841		} -result {1 1 1}
	3841	} -result {1 1 1}
3842	3842	test button-13.4 {size behavior: button} -setup {
3843	3843	button .a -borderwidth 2 -highlightthickness 2 -font {Arial 20}
3844	3844	button .b -borderwidth 2 -highlightthickness 2 -font {Arial 20}
3845	3845	button .c -borderwidth 2 -highlightthickness 2 -font {Arial 20}
3846	3846	set result {}
3847	3847	} -body {
3848		.a configure -text Hej
	3848	.a configure -text Hej
3849	3849	.b configure -text Hej -width 10 -height 1
3850	3850	.c configure -text "" -width 10 -height 1
3851	3851

3857	3857	lappend result [expr {[winfo reqheight .a] == [winfo reqheight .b]}]
3858	3858	} -cleanup {
3859	3859	destroy .a .b .c
3860		} -result {1 1 1}
	3860	} -result {1 1 1}
3861	3861
3862	3862	test button-13.5 {size behavior: radiobutton} -setup {
3863	3863	radiobutton .a -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}

3865	3865	radiobutton .c -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
3866	3866	set result {}
3867	3867	} -body {
3868		.a configure -text Hej
	3868	.a configure -text Hej
3869	3869	.b configure -text Hej -width 10 -height 1
3870	3870	.c configure -text "" -width 10 -height 1
3871	3871

3877	3877	lappend result [expr {[winfo reqheight .a] == [winfo reqheight .b]}]
3878	3878	} -cleanup {
3879	3879	destroy .a .b .c
3880		} -result {1 1 1}
	3880	} -result {1 1 1}
3881	3881
3882	3882	test button-13.6 {size behavior: radiobutton} -setup {
3883	3883	radiobutton .a -borderwidth 2 -highlightthickness 2 -font {Arial 20}

3885	3885	radiobutton .c -borderwidth 2 -highlightthickness 2 -font {Arial 20}
3886	3886	set result {}
3887	3887	} -body {
3888		.a configure -text Hej
	3888	.a configure -text Hej
3889	3889	.b configure -text Hej -width 10 -height 1
3890	3890	.c configure -text "" -width 10 -height 1
3891	3891

3897	3897	lappend result [expr {[winfo reqheight .a] == [winfo reqheight .b]}]
3898	3898	} -cleanup {
3899	3899	destroy .a .b .c
3900		} -result {1 1 1}
	3900	} -result {1 1 1}
3901	3901
3902	3902	test button-13.7 {size behavior: checkbutton} -setup {
3903	3903	checkbutton .a -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}

3905	3905	checkbutton .c -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
3906	3906	set result {}
3907	3907	} -body {
3908		.a configure -text Hej
	3908	.a configure -text Hej
3909	3909	.b configure -text Hej -width 10 -height 1
3910	3910	.c configure -text "" -width 10 -height 1
3911	3911

3917	3917	lappend result [expr {[winfo reqheight .a] == [winfo reqheight .b]}]
3918	3918	} -cleanup {
3919	3919	destroy .a .b .c
3920		} -result {1 1 1}
	3920	} -result {1 1 1}
3921	3921
3922	3922	test button-13.8 {size behavior: checkbutton} -setup {
3923	3923	checkbutton .a -borderwidth 2 -highlightthickness 2 -font {Arial 20}

3925	3925	checkbutton .c -borderwidth 2 -highlightthickness 2 -font {Arial 20}
3926	3926	set result {}
3927	3927	} -body {
3928		.a configure -text Hej
	3928	.a configure -text Hej
3929	3929	.b configure -text Hej -width 10 -height 1
3930	3930	.c configure -text "" -width 10 -height 1
3931	3931

3937	3937	lappend result [expr {[winfo reqheight .a] == [winfo reqheight .b]}]
3938	3938	} -cleanup {
3939	3939	destroy .a .b .c
3940		} -result {1 1 1}
	3940	} -result {1 1 1}
3941	3941
3942	3942	test button-14.1 {bug fix: [011706ec42] tk::ButtonInvoke unsafe wrt widget destruction} -body {
3943	3943	proc destroy_button {} {

3955	3955	update ; # shall not trigger error invalid command name ".top.b"
3956	3956	} -cleanup {
3957	3957	destroy .top.b .top
3958		} -result {}
	3958	} -result {}
3959	3959
3960	3960	test button-15.1 {Bug [5d991b822e]} {
3961	3961	# Want this not to segfault

+14

-27

tests/canvImg.test less more

173	173	while {"timed out" ni $y && [lindex $y end 1] ne "display"} {
174	174	vwait y
175	175	}
176		after cancel timer
	176	after cancel $timer
177	177	list $x $y [.c bbox i1]
178	178	} -cleanup {
179	179	.c delete all

321	321	imageCleanup
322	322	} -result {5 15 35 30}
323	323	test canvImg-6.10 {ComputeImageBbox procedure} -constraints {
324		testImageType
	324	testImageType
325	325	} -setup {
326	326	image create test foo
327	327	.c delete all

334	334	image delete foo
335	335	} -result {20 15 50 30}
336	336	test canvImg-6.11 {ComputeImageBbox procedure} -constraints {
337		testImageType
	337	testImageType
338	338	} -setup {
339	339	image create test foo
340	340	.c delete all

347	347	image delete foo
348	348	} -result {20 23 50 38}
349	349	test canvImg-6.12 {ComputeImageBbox procedure} -constraints {
350		testImageType
	350	testImageType
351	351	} -setup {
352	352	image create test foo
353	353	.c delete all

726	726	image delete foo
727	727	} -result {75 150 105 165}
728	728
729		if {[tk windowingsystem] == "aqua" && $tcl_platform(osVersion) > 18} {
730		# Aqua >= 10.14 will redraw the entire image.
731		set result_10_1 {{foo display 0 0 30 15}}
732		} else {
733		set result_10_1 {{foo display 2 4 6 8}}
734		}
735	729	test canvImg-10.1 {TranslateImage procedure} -constraints testImageType -setup {
736	730	.c delete all
737	731	update

744	738	foo changed 2 4 6 8 30 15
745	739	vwait x
746	740	after cancel $timer
747		update
748	741	return $x
749	742	} -cleanup {
750	743	.c delete all
751	744	image delete foo
752		} -result $result_10_1
	745	} -result {{foo display 2 4 6 8}}
753	746
754	747	test canvImg-11.1 {TranslateImage procedure} -constraints testImageType -setup {
755	748	.c delete all

761	754	set x {}
762	755	set timer [after 500 {lappend x "timed out"}]
763	756	foo changed 2 4 6 8 40 50
764		vwait x
	757	vwait x
765	758	after cancel $timer
766	759	update
767	760	return $x

770	763	image delete foo
771	764	} -result {{foo display 0 0 40 50}}
772	765	test canvImg-11.2 {ImageChangedProc procedure} -constraints {
773		testImageType
	766	testImageType
774	767	} -setup {
775	768	.c delete all
776	769	} -body {

784	777	.c delete all
785	778	image delete foo
786	779	} -result {30 75 70 125}
787		if {[tk windowingsystem] == "aqua" && $tcl_platform(osVersion) > 18} {
788		# Aqua >= 10.14 will redraw the entire image.
789		set result_11_3 {{foo2 display 0 0 80 60}}
790		} else {
791		set result_11_3 {{foo2 display 0 0 20 40}}
792		}
	780
793	781	test canvImg-11.3 {ImageChangedProc procedure} -constraints {
794		testImageType
	782	testImageType
795	783	} -setup {
796	784	.c delete all
797		update
	785	update idletasks
798	786	} -body {
799	787	image create test foo -variable x
800	788	image create test foo2 -variable z

802	790	foo2 changed 0 0 0 0 80 60
803	791	.c create image 50 100 -image foo -tags image -anchor nw
804	792	.c create image 70 110 -image foo2 -anchor nw
805		update
806	793	set z {}
807	794	set timer [after 500 {lappend z "timed out"}]
808		image create test foo -variable x
809		vwait x
	795	image delete foo
	796	vwait z
810	797	after cancel $timer
811	798	return $z
812	799	} -cleanup {
813	800	.c delete all
814		image delete foo foo2
815		} -result $result_11_3
	801	image delete foo2
	802	} -result {{foo2 display 0 0 80 60}}
816	803
817	804	# cleanup
818	805	imageFinish

+2

-2

tests/canvMoveto.test less more

5	5	# Copyright (c) 2004 Neil McKay.
6	6	# All rights reserved.
7	7
8		package require tcltest 2.1
	8	package require tcltest 2.2
9	9	eval tcltest::configure $argv
10	10	tcltest::loadTestedCommands
11	11

32	32	test canvMoveto-2.1 {Canvas "moveto" command coordinates} {
33	33	.c moveto test 200 150
34	34	.c bbox test
35		} {200 150 272 232}
	35	} {200 150 272 232}
36	36	test canvMoveto-2.2 {Canvas "moveto" command, blank y coordinate} {
37	37	.c moveto test 200 150
38	38	.c moveto test 150 {}

+8

-8

tests/canvPs.test less more

18	18	update
19	19
20	20	test canvPs-1.1 {test writing to a file} -constraints {
21		unixOrPc
	21	unixOrWin
22	22	} -setup {
23	23	set foo [makeFile {} foo.ps]
24	24	} -body {
25		.c postscript -file $foo
26		file exists $foo
	25	set res [.c postscript -file $foo]
	26	lappend res [file exists $foo]
27	27	} -cleanup {
28	28	removeFile foo.ps
29	29	} -result 1
30	30	test canvPs-1.2 {test writing to a file, idempotency} -constraints {
31		unixOrPc
	31	unixOrWin
32	32	} -setup {
33	33	set foo [makeFile {} foo.ps]
34	34	set bar [makeFile {} bar.ps]

47	47
48	48
49	49	test canvPs-2.1 {test writing to a channel} -constraints {
50		unixOrPc
	50	unixOrWin
51	51	} -setup {
52	52	set foo [makeFile {} foo.ps]
53	53	file delete $foo
54	54	} -body {
55	55	set chan [open $foo w]
56	56	fconfigure $chan -translation lf
57		.c postscript -channel $chan
	57	set res [.c postscript -channel $chan]
58	58	close $chan
59		file exists $foo
	59	lappend res [file exists $foo]
60	60	} -cleanup {
61	61	removeFile foo.ps
62	62	} -result 1
63	63	test canvPs-2.2 {test writing to channel, idempotency} -constraints {
64		unixOrPc
	64	unixOrWin
65	65	} -setup {
66	66	set foo [makeFile {} foo.ps]
67	67	set bar [makeFile {} bar.ps]

+9

-9

tests/canvRect.test less more

227	227	[expr {[.c find closest 20 25.1] eq $yId}] \
228	228	[expr {[.c find closest 20 29.9] eq $yId}] \
229	229	[expr {[.c find closest 20 30.1] eq $xId}]
230
	230
231	231	} -cleanup {
232	232	.c delete all
233	233	} -result {1 1 1 1}

249	249	list [expr {[.c find closest 20 24.4] eq $xId}] \
250	250	[expr {[.c find closest 20 24.6] eq $yId}] \
251	251	[expr {[.c find closest 20 30.4] eq $yId}] \
252		[expr {[.c find closest 20 30.6] eq $xId}]
	252	[expr {[.c find closest 20 30.6] eq $xId}]
253	253	} -cleanup {
254	254	.c delete all
255	255	} -result {1 1 1 1}

274	274	list [expr {[.c find closest 20 23.2] eq $xId}] \
275	275	[expr {[.c find closest 20 23.3] eq $yId}] \
276	276	[expr {[.c find closest 20 31.7] eq $yId}] \
277		[expr {[.c find closest 20 31.8] eq $xId}]
278		} -cleanup {
279		.c delete all
280		} -result {1 1 1 1}
281
	277	[expr {[.c find closest 20 31.8] eq $xId}]
	278	} -cleanup {
	279	.c delete all
	280	} -result {1 1 1 1}
	281
282	282	test canvRect-6.7 {RectToPoint procedure} -body {
283		set xId [.c create rectangle 10 20 30 40 -outline {} -fill black]
	283	set xId [.c create rectangle 10 20 30 40 -outline {} -fill black]
284	284	set yId [.c create rectangle 40 40 50 50 -outline {} -fill black]
285	285	list [expr {[.c find closest 35 35] eq $xId}] \
286	286	[expr {[.c find closest 36 36] eq $yId}] \
287	287	[expr {[.c find closest 37 37] eq $yId}] \
288		[expr {[.c find closest 38 38] eq $yId}]
	288	[expr {[.c find closest 38 38] eq $yId}]
289	289	} -cleanup {
290	290	.c delete all
291	291	} -result {1 1 1 1}

+37

-1

tests/canvText.test less more

9	9	namespace import ::tcltest::*
10	10	eval tcltest::configure $argv
11	11	tcltest::loadTestedCommands
	12
	13	testConstraint failsOnUbuntu [expr {![info exists ::env(CI)] \|\| ![string match Linux $::tcl_platform(os)]}]
	14	testConstraint failsOnXQuarz [expr {$tcl_platform(os) ne "Darwin" \|\| [tk windowingsystem] ne "x11" }]
12	15
13	16	# Canvas used in 1.* - 17.* tests
14	17	canvas .c -width 400 -height 300 -bd 2 -relief sunken

802	805	} -cleanup {
803	806	.c delete test
804	807	} -returnCodes error -result "wrong \# args: should be \".c select clear\""
	808	test canvText-14.7 {GetTextIndex procedure: pixel index with non-default scrollregion} -setup {
	809	canvas .cc
	810	.cc create text 50 80 -tag test -text Hello -anchor nw -font "Arial 30"
	811	foreach {xmin ymin xmax ymax} [.cc bbox test] {}
	812	} -body {
	813	# default -scrollregion
	814	set res [.cc index test @$xmin,$ymin]
	815	lappend res [.cc index test @$xmax,$ymax]
	816	# -scrollregion with positive upper left corner
	817	.cc configure -scrollregion {50 50 700 900}
	818	lappend res [.cc index test @$xmin,$ymin]
	819	lappend res [.cc index test @$xmax,$ymax]
	820	# -scrollregion with negative upper left corner
	821	.cc configure -scrollregion {-100 -100 700 900}
	822	lappend res [.cc index test @$xmin,$ymin]
	823	lappend res [.cc index test @$xmax,$ymax]
	824	} -cleanup {
	825	destroy .cc
	826	} -result {0 5 0 5 0 5}
805	827
806	828	test canvText-15.1 {SetTextCursor procedure} -setup {
807	829	.c create text 0 0 -tag test

920	942	destroy .c
921	943	} -result {{Yeah } Yeah- 4 4}
922	944
923		test canvText-20.1 {angled text bounding box} -setup {
	945	test canvText-20.1 {angled text bounding box} -constraints {failsOnUbuntu failsOnXQuarz} -setup {
924	946	destroy .c
925	947	canvas .c
926	948	proc transpose {bbox} {

944	966	rename transpose {}
945	967	} -result {ok ok ok}
946	968
	969	test canvText-20.2 {crash on angled text selection (X11, without xft) - bug 2712f43f6e} -setup {
	970	destroy .c
	971	canvas .c -background bisque -selectforeground green2
	972	grid .c
	973	set id [.c create text 50 150 -anchor w -text "Angled text" \
	974	-angle 30 -font {Helvetica 32} -fill darkblue]
	975	} -body {
	976	.c select clear
	977	.c select from $id 0
	978	.c select to $id 8 ; update ; # used to crash on X11 (--disable-xft build only)
	979	} -cleanup {
	980	destroy .c
	981	} -result {}
	982
947	983	# cleanup
948	984	cleanupTests
949	985	return

+49

-7

tests/canvas.test less more

6	6	# Copyright (c) 2008 Donal K. Fellows
7	7	# All rights reserved.
8	8
9		package require tcltest 2.1
	9	package require tcltest 2.2
10	10	eval tcltest::configure $argv
11	11	tcltest::loadTestedCommands
12	12	imageInit

536	536	destroy .c
537	537	pack [canvas .c]
538	538	} -body {
539		set qx [expr {1.+1.}]
540		# qx has type double and no string representation
	539	set qx [expr {1.+1.}]
	540	# qx has type double and no string representation
541	541	.c scale all $qx 0 1. 1.
542		# qx has now type MMRep and no string representation
	542	# qx has now type MMRep and no string representation
543	543	list $qx [string length $qx]
544	544	} -result {2.0 3}
545	545	test canvas-12.2 {canvas mm obj, patch SF-403327, 102471} -setup {

548	548	} -body {
549	549	set val 10
550	550	incr val
551		# qx has type double and no string representation
	551	# qx has type double and no string representation
552	552	.c scale all $val 0 1 1
553		# qx has now type MMRep and no string representation
	553	# qx has now type MMRep and no string representation
554	554	incr val
555	555	} -result 12
556	556

726	726	destroy .c
727	727	canvas .c
728	728	} -body {
729		set id [.c create rect 0 0 1cm 1cm]
	729	set id [.c create rect 0 0 1cm 1cm]
730	730	expr {[lindex [.c coords $id] 2]>1}
731	731	} -result {1}
732	732	destroy .c

949	949	destroy .c
950	950	} -returnCodes error -result {bad index "foo"}
951	951
	952	test canvas-20.1 {addtag/dtag - no shuffling of tag sequence} -setup {
	953	canvas .c
	954	.c create text 100 100 -text Hello
	955	} -body {
	956	for {set i 1} {$i < 5} {incr i} {
	957	.c addtag tag$i all
	958	}
	959	# [.c addtags] only adds tags that are not already present
	960	.c addtag tag1 all ; # no effect
	961	set res [list [.c gettags 1]]
	962	.c dtag 1 tag2
	963	lappend res [.c gettags 1]
	964	} -cleanup {
	965	destroy .c
	966	} -result {{tag1 tag2 tag3 tag4} {tag1 tag3 tag4}}
	967	test canvas-20.2 {tag deletion - multiple tags with same name, no shuffling} -setup {
	968	canvas .c
	969	.c create text 100 100 -text Hello
	970	} -body {
	971	# [.c itemconfigure -tags] lets the user add duplicate tags
	972	# this is not a problem although inconsistent with [.c addtags]
	973	.c itemconfigure 1 -tags {tagA tagB tagA tagA tagC tagA}
	974	set res [list [.c gettags 1]]
	975	.c dtag 1 tagA
	976	lappend res [.c gettags 1]
	977	} -cleanup {
	978	destroy .c
	979	} -result {{tagA tagB tagA tagA tagC tagA} {tagB tagC}}
	980	test canvas-20.3 {tag deletion - all tags match} -setup {
	981	canvas .c
	982	.c create text 100 100 -text Hello
	983	} -body {
	984	# [.c itemconfigure -tags] lets the user add duplicate tags
	985	# this is not a problem although inconsistent with [.c addtags]
	986	.c itemconfigure 1 -tags {tagA tagA tagA tagA tagA tagA}
	987	set res [list [.c gettags 1]]
	988	.c dtag 1 tagA
	989	lappend res [.c gettags 1]
	990	} -cleanup {
	991	destroy .c
	992	} -result {{tagA tagA tagA tagA tagA tagA} {}}
	993
952	994	# cleanup
953	995	imageCleanup
954	996	cleanupTests

+4

-2

tests/clipboard.test less more

20	20	eval tcltest::configure $argv
21	21	tcltest::loadTestedCommands
22	22
	23	testConstraint failsOnXQuarz [expr {$tcl_platform(os) ne "Darwin" \|\| [tk windowingsystem] ne "x11" }]
	24
23	25	# set up a very large buffer to test INCR retrievals
24	26	set longValue ""
25	27	foreach i {a b c d e f g j h i j k l m o p q r s t u v w x y z} {

179	181	clipboard get
180	182	} -cleanup {
181	183	clipboard clear
182		} -returnCodes error -result {CLIPBOARD selection doesn't exist or form "STRING" not defined}
	184	} -returnCodes error -result {CLIPBOARD selection doesn't exist or form "STRING" not defined}
183	185	test clipboard-4.5 {ClipboardLostSel procedure} -setup {
184	186	clipboard clear
185	187	} -body {

232	234	} -cleanup {
233	235	clipboard clear
234	236	} -returnCodes ok -result {first chunk second chunk}
235		test clipboard-6.2 {Tk_ClipboardAppend procedure} -constraints x11 -setup {
	237	test clipboard-6.2 {Tk_ClipboardAppend procedure} -constraints {x11 failsOnXQuarz} -setup {
236	238	clipboard clear
237	239	} -body {
238	240	setupbg

+1

-1

tests/cmds.test less more

38	38	} -body {
39	39	after 100 {set x deleted; destroy .f}
40	40	tkwait visibility .f.b
41		} -returnCodes {error} -result {window ".f.b" was deleted before its visibility changed}
	41	} -returnCodes {error} -result {window ".f.b" was deleted before its visibility changed}
42	42	test cmds-1.6 {tkwait visibility, window gets deleted} -setup {
43	43	frame .f
44	44	button .f.b -text "Test"

+2

-2

tests/color.test less more

4	4	# Copyright (c) 1998-1999 by Scriptics Corporation.
5	5	# All rights reserved.
6	6
7		package require tcltest 2.1
	7	package require tcltest 2.2
8	8	eval tcltest::configure $argv
9	9	tcltest::loadTestedCommands
10	10

161	161	test color-1.5 {Color table} nonPortable {
162	162	set fd [open ../xlib/rgb.txt]
163	163	set result {}
164		while {[gets $fd line] != -1} {
	164	while {[gets $fd line] >= 0} {
165	165	if {[string index $line 0] == "!"} continue
166	166	set rgb [c255 [winfo rgb . [lrange $line 3 end]]]
167	167	if {$rgb != [lrange $line 0 2] } {

+17

-17

tests/config.test less more

195	195	testobjconfig
196	196	} -body {
197	197	option add *a.color non-existent
198		catch {testobjconfig alltypes .a}
	198	catch {testobjconfig alltypes .a}
199	199	return $errorInfo
200	200	} -cleanup {
201	201	killTables

557	557	killTables
558	558	} -returnCodes ok
559	559	test config-4.42 {DoObjConfig - getting rid of old color} -constraints {
560		testobjconfig
	560	testobjconfig
561	561	} -body {
562	562	testobjconfig alltypes .foo -color #333333
563	563	.foo configure -color #444444

565	565	killTables
566	566	} -returnCodes ok -result {32}
567	567	test config-4.43 {DoObjConfig - getting rid of old color} -constraints {
568		testobjconfig
	568	testobjconfig
569	569	} -body {
570	570	testobjconfig alltypes .foo -color #333333
571	571	.foo configure -color #444444

574	574	killTables
575	575	} -returnCodes ok -result {#444444}
576	576	test config-4.44 {DoObjConfig - getting rid of old color} -constraints {
577		testobjconfig
	577	testobjconfig
578	578	} -body {
579	579	testobjconfig alltypes .foo -color #333333
580	580	.foo configure -color #444444

664	664	} -returnCodes ok -result {gray75}
665	665	test config-4.55 {DoObjConfig - new bitmap} -constraints testobjconfig -body {
666	666	testobjconfig alltypes .foo -bitmap gray75
667		.foo configure -bitmap gray50
	667	.foo configure -bitmap gray50
668	668	} -cleanup {
669	669	killTables
670	670	} -returnCodes ok -result {128}
671	671	test config-4.56 {DoObjConfig - new bitmap} -constraints testobjconfig -body {
672	672	testobjconfig alltypes .foo -bitmap gray75
673		.foo configure -bitmap gray50
	673	.foo configure -bitmap gray50
674	674	.foo cget -bitmap
675	675	} -cleanup {
676	676	killTables

744	744	killTables
745	745	} -result {#123456}
746	746	test config-4.67 {DoObjConfig - getting rid of old border} -constraints {
747		testobjconfig
	747	testobjconfig
748	748	} -body {
749	749	testobjconfig alltypes .foo -border #333333
750	750	.foo configure -border #444444

752	752	killTables
753	753	} -returnCodes ok -result {256}
754	754	test config-4.68 {DoObjConfig - getting rid of old border} -constraints {
755		testobjconfig
	755	testobjconfig
756	756	} -body {
757	757	testobjconfig alltypes .foo -border #333333
758	758	.foo configure -border #444444

789	789	} -result {ridge}
790	790	test config-4.73 {DoObjConfig - new relief} -constraints testobjconfig -body {
791	791	testobjconfig alltypes .foo -relief raised
792		.foo configure -relief flat
	792	.foo configure -relief flat
793	793	} -cleanup {
794	794	killTables
795	795	} -returnCodes ok -result {512}
796	796	test config-4.74 {DoObjConfig - new relief} -constraints testobjconfig -body {
797	797	testobjconfig alltypes .foo -relief raised
798		.foo configure -relief flat
	798	.foo configure -relief flat
799	799	.foo cget -relief
800	800	} -cleanup {
801	801	killTables

914	914	} -returnCodes error -result {bad anchor "foo": must be n, ne, e, se, s, sw, w, nw, or center}
915	915	test config-4.92 {DoObjConfig - new anchor} -constraints testobjconfig -body {
916	916	testobjconfig alltypes .foo -anchor e
917		.foo configure -anchor n
	917	.foo configure -anchor n
918	918	} -cleanup {
919	919	killTables
920	920	} -returnCodes ok -result {4096}

992	992	} -returnCodes ok -result {.bar}
993	993	test config-4.103 {DoObjConfig - invalid window} -constraints testobjconfig -body {
994	994	toplevel .bar
995		testobjconfig twowindows .foo -window foo
	995	testobjconfig twowindows .foo -window foo
996	996	} -cleanup {
997	997	killTables
998	998	} -returnCodes error -result {bad window path name "foo"}

1204	1204	test config-7.4 {Tk_SetOptions - missing value} -constraints {
1205	1205	testobjconfig
1206	1206	} -body {
1207		.a configure -color green -relief
	1207	.a configure -color green -relief
1208	1208	} -returnCodes error -result {value for "-relief" missing}
1209	1209	test config-7.5 {Tk_SetOptions - missing value} -constraints {
1210	1210	testobjconfig
1211	1211	} -body {
1212		catch {.a configure -color green -relief}
	1212	catch {.a configure -color green -relief}
1213	1213	.a cget -color
1214	1214	} -result {green}
1215	1215	test config-7.6 {Tk_SetOptions - saving old values} -constraints {
1216	1216	testobjconfig
1217	1217	} -body {
1218	1218	.a configure -color red -int 7 -relief raised -double 3.14159
1219		.a csave -color green -int 432 -relief sunken -double 2.0 -color bogus
	1219	.a csave -color green -int 432 -relief sunken -double 2.0 -color bogus
1220	1220	} -returnCodes error -result {unknown color name "bogus"}
1221	1221	test config-7.7 {Tk_SetOptions - saving old values} -constraints {
1222	1222	testobjconfig

1229	1229	test config-7.8 {Tk_SetOptions - error in DoObjConfig call} -constraints {
1230	1230	testobjconfig
1231	1231	} -body {
1232		.a configure -color bogus
	1232	.a configure -color bogus
1233	1233	} -returnCodes error -result {unknown color name "bogus"}
1234	1234	test config-7.9 {Tk_SetOptions - error in DoObjConfig call} -constraints {
1235	1235	testobjconfig

1261	1261	test config-7.13 {Tk_SetOptions - error in DoObjConfig with custom option} -constraints {
1262	1262	testobjconfig
1263	1263	} -body {
1264		.a configure -custom bad
	1264	.a configure -custom bad
1265	1265	} -returnCodes error -result {expected good value, got "BAD"}
1266	1266	test config-7.14 {Tk_SetOptions - error in DoObjConfig with custom option} -constraints {
1267	1267	testobjconfig

+7

-7

tests/constraints.tcl less more

4	4	return
5	5	}
6	6
7		package require Tk 8.4
	7	package require Tk
8	8	tk appname tktest
9	9	wm title . tktest
10	10	# If the main window isn't already mapped (e.g. because the tests are

16	16	update
17	17	}
18	18
19		package require tcltest 2.1
	19	package require tcltest 2.2
20	20
21	21	namespace eval tk {
22	22	namespace eval test {

36	36
37	37	namespace eval bg {
38	38	# Manage a background process.
39		# Replace with slave interp or thread?
	39	# Replace with child interp or thread?
40	40	namespace import ::tcltest::interpreter
41	41	namespace import ::tk::test::loadTkCommand
42	42	namespace export setup cleanup do

196	196	}]
197	197
198	198	# constraints for testing facilities defined in the tktest executable...
199		testConstraint testImageType [expr {[lsearch [image types] test] >= 0}]
200		testConstraint testOldImageType [expr {[lsearch [image types] oldtest] >= 0}]
	199	testConstraint testImageType [expr {"test" in [image types]}]
	200	testConstraint testOldImageType [expr {"oldtest" in [image types]}]
201	201	testConstraint testbitmap [llength [info commands testbitmap]]
202	202	testConstraint testborder [llength [info commands testborder]]
203	203	testConstraint testcbind [llength [info commands testcbind]]

246	246	}]
247	247	destroy .t
248	248	testConstraint haveTruecolor24 [expr {
249		[lsearch -exact [winfo visualsavailable .] {truecolor 24}] >= 0
	249	{truecolor 24} in [winfo visualsavailable .]
250	250	}]
251	251	testConstraint haveGrayscale8 [expr {
252		[lsearch -exact [winfo visualsavailable .] {grayscale 8}] >= 0
	252	{grayscale 8} in [winfo visualsavailable .]
253	253	}]
254	254	testConstraint defaultPseudocolor8 [expr {
255	255	([winfo visual .] eq "pseudocolor") && ([winfo depth .] == 8)

+1

-1

tests/cursor.test less more

107	107	} -cleanup {
108	108	destroy .b
109	109	removeDirectory $wincur(dir)
110		unset wincur
	110	unset wincur
111	111	} -result {.b}
112	112	test cursor-2.4 {Tk_GetCursor procedure: cursor specs are lists} -constraints {
113	113	win

+290

-261

tests/entry.test less more

10	10	eval tcltest::configure $argv
11	11	tcltest::loadTestedCommands
12	12
	13	testConstraint failsOnUbuntu [expr {![info exists ::env(CI)] \|\| ![string match Linux $::tcl_platform(os)]}]
	14	testConstraint failsOnUbuntuNoXft [expr {[testConstraint failsOnUbuntu] \|\| (![catch {tk::pkgconfig get fontsystem} fs] && ($fs eq "xft"))}]
	15	testConstraint failsOnXQuarz [expr {$tcl_platform(os) ne "Darwin" \|\| [tk windowingsystem] ne "x11" }]
	16
13	17	# For xscrollcommand
	18	set scrollInfo {}
14	19	proc scroll args {
15	20	global scrollInfo
16	21	set scrollInfo $args
17	22	}
18		# For trace variable
	23	# For trace variable
19	24	proc override args {
20	25	global x
21	26	set x 12345

68	73	.e cget -bd
69	74	} -cleanup {
70	75	destroy .e
71		} -result {4}
	76	} -result 4
72	77	test entry-1.4 {configuration option: "bd" for entry} -setup {
73	78	entry .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
74	79	pack .e

105	110	update
106	111	} -body {
107	112	.e configure -borderwidth 1.3
108		.e cget -borderwidth
109		} -cleanup {
110		destroy .e
111		} -result {1}
	113	.e cget -borderwidth
	114	} -cleanup {
	115	destroy .e
	116	} -result 1
112	117	test entry-1.8 {configuration option: "borderwidth" for entry} -setup {
113	118	entry .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
114	119	pack .e

188	193	.e cget -exportselection
189	194	} -cleanup {
190	195	destroy .e
191		} -result {1}
	196	} -result 1
192	197	test entry-1.16 {configuration option: "exportselection" for entry} -setup {
193	198	entry .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
194	199	pack .e

220	225	} -returnCodes {error} -result {unknown color name "non-existent"}
221	226
222	227	test entry-1.19 {configuration option: "font" for entry} -setup {
223		entry .e -borderwidth 2 -highlightthickness 2
	228	entry .e -borderwidth 2 -highlightthickness 2
224	229	pack .e
225	230	update
226	231	} -body {

230	235	destroy .e
231	236	} -result {Helvetica -12}
232	237	test entry-1.20 {configuration option: "font" for entry} -setup {
233		entry .e -borderwidth 2 -highlightthickness 2
	238	entry .e -borderwidth 2 -highlightthickness 2
234	239	pack .e
235	240	update
236	241	} -body {

308	313	.e cget -highlightthickness
309	314	} -cleanup {
310	315	destroy .e
311		} -result {6}
	316	} -result 6
312	317	test entry-1.28 {configuration option: "highlightthickness" for entry} -setup {
313	318	entry .e -borderwidth 2 -font {Helvetica -12 bold}
314	319	pack .e

318	323	.e cget -highlightthickness
319	324	} -cleanup {
320	325	destroy .e
321		} -result {0}
	326	} -result 0
322	327	test entry-1.29 {configuration option: "highlightthickness" for entry} -setup {
323	328	entry .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
324	329	pack .e

358	363	.e cget -insertborderwidth
359	364	} -cleanup {
360	365	destroy .e
361		} -result {1}
	366	} -result 1
362	367	test entry-1.33 {configuration option: "insertborderwidth" for entry} -setup {
363	368	entry .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
364	369	pack .e

378	383	.e cget -insertofftime
379	384	} -cleanup {
380	385	destroy .e
381		} -result {100}
	386	} -result 100
382	387	test entry-1.35 {configuration option: "insertofftime" for entry} -setup {
383	388	entry .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
384	389	pack .e

398	403	.e cget -insertontime
399	404	} -cleanup {
400	405	destroy .e
401		} -result {100}
	406	} -result 100
402	407	test entry-1.37 {configuration option: "insertontime" for entry} -setup {
403	408	entry .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
404	409	pack .e

511	516	.e cget -selectborderwidth
512	517	} -cleanup {
513	518	destroy .e
514		} -result {1}
	519	} -result 1
515	520	test entry-1.48 {configuration option: "selectborderwidth" for entry} -setup {
516	521	entry .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
517	522	pack .e

604	609	.e cget -width
605	610	} -cleanup {
606	611	destroy .e
607		} -result {402}
	612	} -result 402
608	613	test entry-1.57 {configuration option: "width" for entry} -setup {
609	614	entry .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
610	615	pack .e

661	666
662	667
663	668	test entry-3.1 {EntryWidgetCmd procedure} -setup {
664		entry .e
	669	entry .e
665	670	pack .e
666	671	update
667	672	} -body {

670	675	destroy .e
671	676	} -returnCodes error -result {wrong # args: should be ".e option ?arg ...?"}
672	677	test entry-3.2 {EntryWidgetCmd procedure, "bbox" widget command} -setup {
673		entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	678	entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
674	679	pack .e
675	680	update
676	681	} -body {

679	684	destroy .e
680	685	} -returnCodes error -result {wrong # args: should be ".e bbox index"}
681	686	test entry-3.3 {EntryWidgetCmd procedure, "bbox" widget command} -setup {
682		entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	687	entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
683	688	pack .e
684	689	update
685	690	} -body {

688	693	destroy .e
689	694	} -returnCodes error -result {wrong # args: should be ".e bbox index"}
690	695	test entry-3.4 {EntryWidgetCmd procedure, "bbox" widget command} -setup {
691		entry .e
	696	entry .e
692	697	pack .e
693	698	update
694	699	} -body {

697	702	destroy .e
698	703	} -returnCodes error -result {bad entry index "bogus"}
699	704	test entry-3.5 {EntryWidgetCmd procedure, "bbox" widget command} -setup {
700		entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	705	entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
701	706	pack .e
702	707	update
703	708	} -body {

706	711	destroy .e
707	712	} -result [list 5 5 0 $cy]
708	713
709		# Previously the result was count using previousli counted font measurements
	714	# Previously the result was count using previousli counted font measurements
710	715	# and metrics. It was changed to less verbose solution - the result is the one
711	716	# that passes fonts constraint (this concerns tests 3.6, 3.7, 3.8, 3.10)
712	717	test entry-3.6 {EntryWidgetCmd procedure, "bbox" widget command} -constraints {

725	730	test entry-3.7 {EntryWidgetCmd procedure, "bbox" widget command} -constraints {
726	731	fonts
727	732	} -setup {
728		entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	733	entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
729	734	pack .e
730	735	update
731	736	} -body {

738	743	test entry-3.8 {EntryWidgetCmd procedure, "bbox" widget command} -constraints {
739	744	fonts
740	745	} -setup {
741		entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	746	entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
742	747	pack .e
743	748	update
744	749	} -body {

749	754	destroy .e
750	755	} -result {31 5 7 13}
751	756	test entry-3.9 {EntryWidgetCmd procedure, "bbox" widget command} -setup {
752		entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	757	entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
753	758	pack .e
754	759	update
755	760	} -body {

761	766	test entry-3.10 {EntryWidgetCmd procedure, "bbox" widget command} -constraints {
762	767	fonts
763	768	} -setup {
764		entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	769	entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
765	770	pack .e
766	771	update
767	772	} -body {

771	776	destroy .e
772	777	} -result {{5 5 7 13} {12 5 7 13} {75 5 12 13} {122 5 7 13}}
773	778	test entry-3.11 {EntryWidgetCmd procedure, "cget" widget command} -setup {
774		entry .e
	779	entry .e
775	780	} -body {
776	781	.e cget
777	782	} -cleanup {
778	783	destroy .e
779	784	} -returnCodes error -result {wrong # args: should be ".e cget option"}
780	785	test entry-3.12 {EntryWidgetCmd procedure, "cget" widget command} -setup {
781		entry .e
	786	entry .e
782	787	} -body {
783	788	.e cget a b
784	789	} -cleanup {
785	790	destroy .e
786	791	} -returnCodes error -result {wrong # args: should be ".e cget option"}
787	792	test entry-3.13 {EntryWidgetCmd procedure, "cget" widget command} -setup {
788		entry .e
	793	entry .e
789	794	} -body {
790	795	.e cget -gorp
791	796	} -cleanup {
792	797	destroy .e
793	798	} -returnCodes error -result {unknown option "-gorp"}
794	799	test entry-3.14 {EntryWidgetCmd procedure, "cget" widget command} -setup {
795		entry .e
	800	entry .e
796	801	} -body {
797	802	.e configure -bd 4
798	803	.e cget -bd
799	804	} -cleanup {
800	805	destroy .e
801		} -result {4}
	806	} -result 4
802	807	test entry-3.15 {EntryWidgetCmd procedure, "configure" widget command} -setup {
803		entry .e
	808	entry .e
804	809	pack .e
805	810	update
806	811	} -body {
807	812	llength [.e configure]
808	813	} -cleanup {
809	814	destroy .e
810		} -result {36}
	815	} -result 36
811	816	test entry-3.16 {EntryWidgetCmd procedure, "configure" widget command} -setup {
812		entry .e
	817	entry .e
813	818	} -body {
814	819	.e configure -foo
815	820	} -cleanup {
816	821	destroy .e
817	822	} -returnCodes error -result {unknown option "-foo"}
818	823	test entry-3.17 {EntryWidgetCmd procedure, "configure" widget command} -setup {
819		entry .e
	824	entry .e
820	825	} -body {
821	826	.e configure -bd 4
822	827	.e configure -bg #ffffff
823	828	lindex [.e configure -bd] 4
824	829	} -cleanup {
825	830	destroy .e
826		} -result {4}
	831	} -result 4
827	832	test entry-3.18 {EntryWidgetCmd procedure, "delete" widget command} -setup {
828		entry .e
	833	entry .e
829	834	} -body {
830	835	.e delete
831	836	} -cleanup {
832	837	destroy .e
833	838	} -returnCodes error -result {wrong # args: should be ".e delete firstIndex ?lastIndex?"}
834	839	test entry-3.19 {EntryWidgetCmd procedure, "delete" widget command} -setup {
835		entry .e
	840	entry .e
836	841	} -body {
837	842	.e delete a b c
838	843	} -cleanup {
839	844	destroy .e
840	845	} -returnCodes error -result {wrong # args: should be ".e delete firstIndex ?lastIndex?"}
841	846	test entry-3.20 {EntryWidgetCmd procedure, "delete" widget command} -setup {
842		entry .e
	847	entry .e
843	848	} -body {
844	849	.e delete foo
845	850	} -cleanup {
846	851	destroy .e
847	852	} -returnCodes error -result {bad entry index "foo"}
848	853	test entry-3.21 {EntryWidgetCmd procedure, "delete" widget command} -setup {
849		entry .e
	854	entry .e
850	855	} -body {
851	856	.e delete 0 bar
852	857	} -cleanup {

855	860	test entry-3.22 {EntryWidgetCmd procedure, "delete" widget command} -setup {
856	861	entry .e
857	862	pack .e
858		update
	863	update
859	864	} -body {
860	865	.e insert end "01234567890"
861	866	.e delete 2 4
862	867	.e get
863	868	} -cleanup {
864	869	destroy .e
865		} -result {014567890}
	870	} -result 014567890
866	871	test entry-3.23 {EntryWidgetCmd procedure, "delete" widget command} -setup {
867		entry .e
	872	entry .e
868	873	} -body {
869	874	.e insert end "01234567890"
870	875	.e delete 6
871	876	.e get
872	877	} -cleanup {
873	878	destroy .e
874		} -result {0123457890}
	879	} -result 0123457890
875	880	test entry-3.24 {EntryWidgetCmd procedure, "delete" widget command} -setup {
876	881	entry .e
877	882	pack .e
878		update
	883	update
879	884	set x {}
880	885	} -body {
881	886	# UTF

896	901	test entry-3.25 {EntryWidgetCmd procedure, "delete" widget command} -setup {
897	902	entry .e
898	903	pack .e
899		update
	904	update
900	905	} -body {
901	906	.e insert end "01234567890"
902	907	.e delete 6 5
903	908	.e get
904	909	} -cleanup {
905	910	destroy .e
906		} -result {01234567890}
	911	} -result 01234567890
907	912	test entry-3.26 {EntryWidgetCmd procedure, "delete" widget command} -setup {
908	913	entry .e
909	914	pack .e
910		update
	915	update
911	916	} -body {
912	917	.e insert end "01234567890"
913	918	.e configure -state disabled

916	921	.e get
917	922	} -cleanup {
918	923	destroy .e
919		} -result {01234567890}
	924	} -result 01234567890
920	925	test entry-3.26a {EntryWidgetCmd procedure, "delete" widget command} -setup {
921	926	entry .e
922	927	pack .e
923		update
	928	update
924	929	} -body {
925	930	.e insert end "01234567890"
926	931	.e configure -state readonly

929	934	.e get
930	935	} -cleanup {
931	936	destroy .e
932		} -result {01234567890}
	937	} -result 01234567890
933	938	test entry-3.27 {EntryWidgetCmd procedure, "get" widget command} -setup {
934		entry .e
	939	entry .e
935	940	} -body {
936	941	.e get foo
937	942	} -cleanup {
938	943	destroy .e
939	944	} -returnCodes error -result {wrong # args: should be ".e get"}
940	945	test entry-3.28 {EntryWidgetCmd procedure, "icursor" widget command} -setup {
941		entry .e
	946	entry .e
942	947	} -body {
943	948	.e icursor
944	949	} -cleanup {
945	950	destroy .e
946	951	} -returnCodes error -result {wrong # args: should be ".e icursor pos"}
947	952	test entry-3.29 {EntryWidgetCmd procedure, "icursor" widget command} -setup {
948		entry .e
	953	entry .e
949	954	} -body {
950	955	.e icursor foo
951	956	} -cleanup {
952	957	destroy .e
953	958	} -returnCodes error -result {bad entry index "foo"}
954	959	test entry-3.30 {EntryWidgetCmd procedure, "icursor" widget command} -setup {
955		entry .e
	960	entry .e
956	961	} -body {
957	962	.e insert end "01234567890"
958	963	.e icursor 4
959	964	.e index insert
960	965	} -cleanup {
961	966	destroy .e
962		} -result {4}
	967	} -result 4
963	968	test entry-3.31 {EntryWidgetCmd procedure, "index" widget command} -setup {
964		entry .e
	969	entry .e
965	970	} -body {
966	971	.e in
967	972	} -cleanup {
968	973	destroy .e
969	974	} -returnCodes error -result {ambiguous option "in": must be bbox, cget, configure, delete, get, icursor, index, insert, scan, selection, validate, or xview}
970	975	test entry-3.32 {EntryWidgetCmd procedure, "index" widget command} -setup {
971		entry .e
	976	entry .e
972	977	} -body {
973	978	.e index
974	979	} -cleanup {
975	980	destroy .e
976	981	} -returnCodes error -result {wrong # args: should be ".e index string"}
977	982	test entry-3.33 {EntryWidgetCmd procedure, "index" widget command} -setup {
978		entry .e
	983	entry .e
979	984	} -body {
980	985	.e index foo
981	986	} -cleanup {

984	989	test entry-3.34 {EntryWidgetCmd procedure, "index" widget command} -setup {
985	990	entry .e
986	991	pack .e
987		update
	992	update
988	993	} -body {
989	994	.e index 0
990	995	} -cleanup {

993	998	test entry-3.35 {EntryWidgetCmd procedure, "index" widget command} -setup {
994	999	entry .e
995	1000	pack .e
996		update
	1001	update
997	1002	} -body {
998	1003	# UTF
999	1004	.e insert 0 abc\u4e4e\u0153def

1002	1007	destroy .e
1003	1008	} -result {3 4 8}
1004	1009	test entry-3.36 {EntryWidgetCmd procedure, "insert" widget command} -setup {
1005		entry .e
	1010	entry .e
1006	1011	} -body {
1007	1012	.e insert a
1008	1013	} -cleanup {
1009	1014	destroy .e
1010	1015	} -returnCodes error -result {wrong # args: should be ".e insert index text"}
1011	1016	test entry-3.37 {EntryWidgetCmd procedure, "insert" widget command} -setup {
1012		entry .e
	1017	entry .e
1013	1018	} -body {
1014	1019	.e insert a b c
1015	1020	} -cleanup {
1016	1021	destroy .e
1017	1022	} -returnCodes error -result {wrong # args: should be ".e insert index text"}
1018	1023	test entry-3.38 {EntryWidgetCmd procedure, "insert" widget command} -setup {
1019		entry .e
	1024	entry .e
1020	1025	} -body {
1021	1026	.e insert foo Text
1022	1027	} -cleanup {

1025	1030	test entry-3.39 {EntryWidgetCmd procedure, "insert" widget command} -setup {
1026	1031	entry .e
1027	1032	pack .e
1028		update
	1033	update
1029	1034	} -body {
1030	1035	.e insert end "01234567890"
1031	1036	.e insert 3 xxx

1036	1041	test entry-3.40 {EntryWidgetCmd procedure, "insert" widget command} -setup {
1037	1042	entry .e
1038	1043	pack .e
1039		update
	1044	update
1040	1045	} -body {
1041	1046	.e insert end "01234567890"
1042	1047	.e configure -state disabled

1045	1050	.e get
1046	1051	} -cleanup {
1047	1052	destroy .e
1048		} -result {01234567890}
	1053	} -result 01234567890
1049	1054	test entry-3.40a {EntryWidgetCmd procedure, "insert" widget command} -setup {
1050	1055	entry .e
1051	1056	pack .e
1052		update
	1057	update
1053	1058	} -body {
1054	1059	.e insert end "01234567890"
1055	1060	.e configure -state readonly

1058	1063	.e get
1059	1064	} -cleanup {
1060	1065	destroy .e
1061		} -result {01234567890}
	1066	} -result 01234567890
1062	1067	test entry-3.41 {EntryWidgetCmd procedure, "insert" widget command} -setup {
1063		entry .e
	1068	entry .e
1064	1069	} -body {
1065	1070	.e insert a b c
1066	1071	} -cleanup {
1067	1072	destroy .e
1068	1073	} -returnCodes error -result {wrong # args: should be ".e insert index text"}
1069	1074	test entry-3.42 {EntryWidgetCmd procedure, "scan" widget command} -setup {
1070		entry .e
	1075	entry .e
1071	1076	pack .e
1072	1077	update
1073	1078	} -body {

1078	1083	test entry-3.43 {EntryWidgetCmd procedure, "scan" widget command} -setup {
1079	1084	entry .e
1080	1085	pack .e
1081		update
	1086	update
1082	1087	} -body {
1083	1088	.e scan a b c
1084	1089	} -cleanup {

1087	1092	test entry-3.44 {EntryWidgetCmd procedure, "scan" widget command} -setup {
1088	1093	entry .e
1089	1094	pack .e
1090		update
	1095	update
1091	1096	} -body {
1092	1097	.e scan foobar 20
1093	1098	} -cleanup {

1096	1101	test entry-3.45 {EntryWidgetCmd procedure, "scan" widget command} -setup {
1097	1102	entry .e
1098	1103	pack .e
1099		update
	1104	update
1100	1105	} -body {
1101	1106	.e scan mark 20.1
1102	1107	} -cleanup {

1107	1112	test entry-3.46 {EntryWidgetCmd procedure, "scan" widget command} -constraints {
1108	1113	fonts
1109	1114	} -setup {
1110		entry .e -font {Helvetica -12} -borderwidth 2 -highlightthickness 2
	1115	entry .e -font {Helvetica -12} -borderwidth 2 -highlightthickness 2
1111	1116	pack .e
1112	1117	update
1113	1118	} -body {

1118	1123	.e index @0
1119	1124	} -cleanup {
1120	1125	destroy .e
1121		} -result {2}
	1126	} -result 2
1122	1127	test entry-3.47 {EntryWidgetCmd procedure, "select" widget command} -setup {
1123		entry .e
	1128	entry .e
1124	1129	} -body {
1125	1130	.e select
1126	1131	} -cleanup {
1127	1132	destroy .e
1128	1133	} -returnCodes error -result {wrong # args: should be ".e selection option ?index?"}
1129	1134	test entry-3.48 {EntryWidgetCmd procedure, "select" widget command} -setup {
1130		entry .e
	1135	entry .e
1131	1136	} -body {
1132	1137	.e select foo
1133	1138	} -cleanup {

1135	1140	} -returnCodes error -result {bad selection option "foo": must be adjust, clear, from, present, range, or to}
1136	1141
1137	1142	test entry-3.49 {EntryWidgetCmd procedure, "select clear" widget command} -setup {
1138		entry .e
	1143	entry .e
1139	1144	} -body {
1140	1145	.e select clear gorp
1141	1146	} -cleanup {
1142	1147	destroy .e
1143	1148	} -returnCodes error -result {wrong # args: should be ".e selection clear"}
1144	1149	test entry-3.50 {EntryWidgetCmd procedure, "select clear" widget command} -setup {
1145		entry .e
	1150	entry .e
1146	1151	} -body {
1147	1152	.e insert end "0123456789"
1148	1153	.e select from 1
1149	1154	.e select to 4
1150	1155	update
1151	1156	.e select clear
1152		selection get
	1157	selection get
1153	1158	} -cleanup {
1154	1159	destroy .e
1155	1160	} -returnCodes error -result {PRIMARY selection doesn't exist or form "STRING" not defined}
1156	1161	test entry-3.50.1 {EntryWidgetCmd procedure, "select clear" widget command} -setup {
1157	1162	entry .e
1158	1163	pack .e
1159		update
	1164	update
1160	1165	} -body {
1161	1166	.e insert end "0123456789"
1162	1167	.e select from 1

1170	1175	} -result {.e}
1171	1176
1172	1177	test entry-3.51 {EntryWidgetCmd procedure, "selection present" widget command} -setup {
1173		entry .e
	1178	entry .e
1174	1179	} -body {
1175	1180	.e selection present foo
1176	1181	} -cleanup {

1179	1184	test entry-3.52 {EntryWidgetCmd procedure, "selection present" widget command} -setup {
1180	1185	entry .e
1181	1186	pack .e
1182		update
	1187	update
1183	1188	} -body {
1184	1189	.e insert end 0123456789
1185	1190	.e select from 3

1187	1192	.e selection present
1188	1193	} -cleanup {
1189	1194	destroy .e
1190		} -result {1}
	1195	} -result 1
1191	1196	test entry-3.53 {EntryWidgetCmd procedure, "selection present" widget command} -setup {
1192	1197	entry .e
1193	1198	pack .e
1194		update
	1199	update
1195	1200	} -body {
1196	1201	.e insert end 0123456789
1197	1202	.e select from 3

1200	1205	.e selection present
1201	1206	} -cleanup {
1202	1207	destroy .e
1203		} -result {1}
	1208	} -result 1
1204	1209	test entry-3.54 {EntryWidgetCmd procedure, "selection present" widget command} -setup {
1205	1210	entry .e
1206	1211	pack .e
1207		update
	1212	update
1208	1213	} -body {
1209	1214	.e insert end 0123456789
1210	1215	.e select from 3

1213	1218	.e selection present
1214	1219	} -cleanup {
1215	1220	destroy .e
1216		} -result {0}
	1221	} -result 0
1217	1222	test entry-3.55 {EntryWidgetCmd procedure, "selection adjust" widget command} -setup {
1218	1223	entry .e
1219	1224	} -body {

1241	1246	selection get
1242	1247	} -cleanup {
1243	1248	destroy .e
1244		} -result {123}
	1249	} -result 123
1245	1250	test entry-3.58 {EntryWidgetCmd procedure, "selection adjust" widget command} -setup {
1246	1251	entry .e
1247	1252	pack .e

1255	1260	selection get
1256	1261	} -cleanup {
1257	1262	destroy .e
1258		} -result {234}
	1263	} -result 234
1259	1264	test entry-3.59 {EntryWidgetCmd procedure, "selection from" widget command} -setup {
1260	1265	entry .e
1261	1266	} -body {

1343	1348	} -returnCodes error -result {wrong # args: should be ".e selection to index"}
1344	1349
1345	1350	test entry-3.65 {EntryWidgetCmd procedure, "xview" widget command} -setup {
1346		entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	1351	entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
1347	1352	pack .e
1348	1353	update
1349	1354	} -body {

1355	1360	destroy .e
1356	1361	} -result {0.0537634 0.2688172}
1357	1362	test entry-3.66 {EntryWidgetCmd procedure, "xview" widget command} -setup {
1358		entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	1363	entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
1359	1364	pack .e
1360	1365	update
1361	1366	} -body {

1364	1369	destroy .e
1365	1370	} -returnCodes error -result {bad entry index "gorp"}
1366	1371	test entry-3.67 {EntryWidgetCmd procedure, "xview" widget command} -setup {
1367		entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	1372	entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
1368	1373	pack .e
1369	1374	update
1370	1375	} -body {

1378	1383	destroy .e
1379	1384	} -result {0.107527 0.322581}
1380	1385	test entry-3.68 {EntryWidgetCmd procedure, "xview" widget command} -setup {
1381		entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	1386	entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
1382	1387	pack .e
1383	1388	update
1384	1389	} -body {

1387	1392	destroy .e
1388	1393	} -returnCodes error -result {wrong # args: should be ".e xview moveto fraction"}
1389	1394	test entry-3.69 {EntryWidgetCmd procedure, "xview" widget command} -setup {
1390		entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	1395	entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
1391	1396	pack .e
1392	1397	update
1393	1398	} -body {

1396	1401	destroy .e
1397	1402	} -returnCodes error -result {expected floating-point number but got "foo"}
1398	1403	test entry-3.70 {EntryWidgetCmd procedure, "xview" widget command} -setup {
1399		entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	1404	entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
1400	1405	pack .e
1401	1406	update
1402	1407	} -body {

1408	1413	destroy .e
1409	1414	} -result {0.505376 0.720430}
1410	1415	test entry-3.71 {EntryWidgetCmd procedure, "xview" widget command} -setup {
1411		entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	1416	entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
1412	1417	pack .e
1413	1418	update
1414	1419	} -body {

1419	1424	destroy .e
1420	1425	} -returnCodes error -result {wrong # args: should be ".e xview scroll number units\|pages"}
1421	1426	test entry-3.72 {EntryWidgetCmd procedure, "xview" widget command} -setup {
1422		entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	1427	entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
1423	1428	pack .e
1424	1429	} -body {
1425	1430	.e insert end "This is quite a long text string, so long that it "

1430	1435	destroy .e
1431	1436	} -returnCodes error -result {expected integer but got "gorp"}
1432	1437	test entry-3.73 {EntryWidgetCmd procedure, "xview" widget command} -setup {
1433		entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	1438	entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
1434	1439	pack .e
1435	1440	} -body {
1436	1441	.e insert end "This is quite a long text string, so long that it "

1443	1448	destroy .e
1444	1449	} -result {0.193548 0.408602}
1445	1450	test entry-3.74 {EntryWidgetCmd procedure, "xview" widget command} -setup {
1446		entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	1451	entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
1447	1452	pack .e
1448	1453	update
1449	1454	} -body {

1457	1462	destroy .e
1458	1463	} -result {0.397849 0.612903}
1459	1464	test entry-3.75 {EntryWidgetCmd procedure, "xview" widget command} -setup {
1460		entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	1465	entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
1461	1466	pack .e
1462	1467	} -body {
1463	1468	.e insert end "This is quite a long text string, so long that it "

1465	1470	update
1466	1471	.e xview 30
1467	1472	update
1468		.e xview scroll 2 units
	1473	.e xview scroll 2 units
1469	1474	.e index @0
1470	1475	} -cleanup {
1471	1476	destroy .e
1472		} -result {32}
	1477	} -result 32
1473	1478	test entry-3.76 {EntryWidgetCmd procedure, "xview" widget command} -setup {
1474		entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	1479	entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
1475	1480	pack .e
1476	1481	} -body {
1477	1482	.e insert end "This is quite a long text string, so long that it "

1479	1484	update
1480	1485	.e xview 30
1481	1486	update
1482		.e xview scroll -1 units
	1487	.e xview scroll -1 units
1483	1488	.e index @0
1484	1489	} -cleanup {
1485	1490	destroy .e
1486		} -result {29}
	1491	} -result 29
1487	1492	test entry-3.77 {EntryWidgetCmd procedure, "xview" widget command} -setup {
1488		entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	1493	entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
1489	1494	pack .e
1490	1495	} -body {
1491	1496	.e insert end "This is quite a long text string, so long that it "

1496	1501	destroy .e
1497	1502	} -returnCodes error -result {bad argument "foobars": must be units or pages}
1498	1503	test entry-3.78 {EntryWidgetCmd procedure, "xview" widget command} -setup {
1499		entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	1504	entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
1500	1505	pack .e
1501	1506	} -body {
1502	1507	.e insert end "This is quite a long text string, so long that it "

1507	1512	destroy .e
1508	1513	} -returnCodes error -result {unknown option "eat": must be moveto or scroll}
1509	1514	test entry-3.79 {EntryWidgetCmd procedure, "xview" widget command} -setup {
1510		entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	1515	entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
1511	1516	pack .e
1512	1517	update
1513	1518	} -body {

1515	1520	.e insert end "runs off the end of the window quite a bit."
1516	1521	.e xview 0
1517	1522	update
1518		.e xview -4
	1523	.e xview -1
1519	1524	.e index @0
1520	1525	} -cleanup {
1521	1526	destroy .e
1522		} -result {0}
	1527	} -result 0
1523	1528	test entry-3.80 {EntryWidgetCmd procedure, "xview" widget command} -setup {
1524		entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	1529	entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
1525	1530	pack .e
1526	1531	} -body {
1527	1532	.e insert end "This is quite a long text string, so long that it "

1531	1536	.e index @0
1532	1537	} -cleanup {
1533	1538	destroy .e
1534		} -result {73}
	1539	} -result 73
1535	1540	test entry-3.86 {EntryWidgetCmd procedure, "xview" widget command} -setup {
1536		entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	1541	entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
1537	1542	pack .e
1538	1543	} -body {
1539	1544	.e insert end "This is quite a long text string, so long that it "

1555	1560	} -result {0.095745 0.106383 0.117021}
1556	1561
1557	1562	test entry-3.82 {EntryWidgetCmd procedure} -setup {
1558		entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	1563	entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
1559	1564	pack .e
1560	1565	update
1561	1566	} -body {

1582	1587	.e get
1583	1588	} -cleanup {
1584	1589	destroy .e
1585		} -result {12345}
	1590	} -result 12345
1586	1591	test entry-5.2 {ConfigureEntry procedure, -textvariable} -body {
1587	1592	set x 12345
1588	1593	entry .e -textvariable x

1599	1604	} -body {
1600	1605	.e insert 0 "Some text"
1601	1606	.e configure -textvariable x
1602		return $x
	1607	set x
1603	1608	} -cleanup {
1604	1609	destroy .e
1605	1610	} -result {Some text}

1614	1619	} -cleanup {
1615	1620	destroy .e
1616	1621	trace vdelete x w override
1617		unset x;
	1622	unset x;
1618	1623	} -result {12345 12345}
1619	1624
1620	1625	test entry-5.5 {ConfigureEntry procedure} -setup {

1634	1639	lappend x [selection get]
1635	1640	.e1 configure -exportselection 1
1636	1641	lappend x [selection get]
1637		return $x
	1642	set x
1638	1643	} -cleanup {
1639	1644	destroy .e1 .e2
1640	1645	} -result {{This is so} {This is so} 1234}
1641	1646	test entry-5.6 {ConfigureEntry procedure} -setup {
1642		entry .e
	1647	entry .e
1643	1648	pack .e
1644	1649	} -body {
1645	1650	.e insert end "0123456789"
1646	1651	.e select from 1
1647	1652	.e select to 5
1648	1653	.e configure -exportselection 0
1649		selection get
	1654	selection get
1650	1655	} -cleanup {
1651	1656	destroy .e
1652	1657	} -returnCodes error -result {PRIMARY selection doesn't exist or form "STRING" not defined}

1658	1663	.e select from 1
1659	1664	.e select to 5
1660	1665	.e configure -exportselection 0
1661		catch {selection get}
	1666	catch {selection get}
1662	1667	list [.e index sel.first] [.e index sel.last]
1663	1668	} -cleanup {
1664	1669	destroy .e
1665	1670	} -result {1 5}
1666	1671
1667	1672	test entry-5.7 {ConfigureEntry procedure} -setup {
1668		entry .e -font {Helvetica -12} -borderwidth 2 -highlightthickness 2
	1673	entry .e -font {Helvetica -12} -borderwidth 2 -highlightthickness 2
1669	1674	pack .e
1670	1675	} -body {
1671	1676	.e configure -font {Courier -12} -width 4 -xscrollcommand scroll
1672	1677	.e insert end "01234567890"
1673		set timeout [after 500 {set $scrollInfo "timeout"}]
	1678	update idletasks
	1679	set timeout [after 500 {set scrollInfo {-1000000 -1000000}}]
	1680	.e configure -width 5
1674	1681	vwait scrollInfo
1675		.e configure -width 5
1676	1682	format {%.6f %.6f} {*}$scrollInfo
1677	1683	} -cleanup {
1678	1684	destroy .e

1681	1687
1682	1688
1683	1689	test entry-5.8 {ConfigureEntry procedure} -constraints {
1684		fonts
	1690	fonts failsOnXQuarz
1685	1691	} -setup {
1686		entry .e -borderwidth 2 -highlightthickness 2
	1692	entry .e -borderwidth 2 -highlightthickness 2
1687	1693	pack .e
1688	1694	} -body {
1689	1695	.e configure -width 0 -font {Helvetica -12}

1738	1744	test entry-6.1 {EntryComputeGeometry procedure} -constraints {
1739	1745	fonts
1740	1746	} -setup {
1741		entry .e
	1747	entry .e
1742	1748	pack .e
1743	1749	} -body {
1744	1750	.e configure -font {Courier -12} -bd 2 -relief raised -width 20 \

1752	1758	test entry-6.2 {EntryComputeGeometry procedure} -constraints {
1753	1759	fonts
1754	1760	} -setup {
1755		entry .e
	1761	entry .e
1756	1762	pack .e
1757	1763	} -body {
1758	1764	.e configure -font {Courier -12} -bd 2 -relief raised -width 20 \

1766	1772	test entry-6.3 {EntryComputeGeometry procedure} -constraints {
1767	1773	fonts
1768	1774	} -setup {
1769		entry .e
	1775	entry .e
1770	1776	pack .e
1771	1777	} -body {
1772	1778	.e configure -font {Courier -12} -bd 2 -relief raised -width 20 \

1778	1784	destroy .e
1779	1785	} -result {3 4}
1780	1786	test entry-6.4 {EntryComputeGeometry procedure} -setup {
1781		entry .e
	1787	entry .e
1782	1788	pack .e
1783	1789	} -body {
1784	1790	.e configure -font {Courier -12} -bd 2 -relief raised -width 5

1788	1794	.e index @0
1789	1795	} -cleanup {
1790	1796	destroy .e
1791		} -result {6}
	1797	} -result 6
1792	1798	test entry-6.5 {EntryComputeGeometry procedure} -setup {
1793	1799	entry .e -highlightthickness 2
1794	1800	pack .e
1795	1801	} -body {
1796		.e configure -font {Courier -12} -bd 2 -relief raised -width 5
	1802	.e configure -font {Courier -12} -bd 2 -relief raised -width 5
1797	1803	.e insert end "01234567890"
1798	1804	update
1799	1805	.e xview 7
1800	1806	.e index @0
1801	1807	} -cleanup {
1802	1808	destroy .e
1803		} -result {6}
	1809	} -result 6
1804	1810	test entry-6.6 {EntryComputeGeometry procedure} -constraints {
1805	1811	fonts
1806	1812	} -setup {
1807	1813	entry .e -highlightthickness 2
1808	1814	pack .e
1809	1815	} -body {
1810		.e configure -font {Courier -12} -bd 2 -relief raised -width 10
	1816	.e configure -font {Courier -12} -bd 2 -relief raised -width 10
1811	1817	.e insert end "01234\t67890"
1812	1818	update
1813	1819	.e xview 3

1847	1853	entry .e -highlightthickness 2
1848	1854	pack .e
1849	1855	} -body {
1850		.e configure -font {Helvetica -24} -bd 3 -relief raised -width 0
	1856	.e configure -font {Helvetica -24} -bd 3 -relief raised -width 0
1851	1857	update
1852	1858	list [winfo reqwidth .e] [winfo reqheight .e]
1853	1859	} -cleanup {
1854	1860	destroy .e
1855	1861	} -result {25 39}
1856	1862	test entry-6.10 {EntryComputeGeometry procedure} -constraints {
1857		unix fonts
	1863	unix fonts
1858	1864	} -setup {
1859	1865	entry .e -highlightthickness 2 -font {Helvetica -12}
1860	1866	pack .e

1909	1915
1910	1916
1911	1917	test entry-7.1 {InsertChars procedure} -setup {
1912		unset -nocomplain contents
	1918	unset -nocomplain contents
1913	1919	entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
1914	1920	pack .e
1915	1921	focus .e
1916	1922	} -body {
1917	1923	.e configure -textvariable contents -xscrollcommand scroll
	1924	set timeout [after 500 {set scrollInfo {-1000000 -1000000}}]
1918	1925	.e insert 0 abcde
1919	1926	.e insert 2 XXX
1920		set timeout [after 500 {set $scrollInfo "timeout"}]
1921	1927	vwait scrollInfo
1922	1928	list [.e get] $contents [format {%.6f %.6f} {*}$scrollInfo]
1923	1929	} -cleanup {

1926	1932	} -result {abXXXcde abXXXcde {0.000000 1.000000}}
1927	1933
1928	1934	test entry-7.2 {InsertChars procedure} -setup {
1929		unset -nocomplain contents
1930		entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
	1935	unset -nocomplain contents
	1936	entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
1931	1937	pack .e
1932	1938	focus .e
1933	1939	} -body {
1934	1940	.e configure -textvariable contents -xscrollcommand scroll
	1941	set timeout [after 500 {set scrollInfo {-1000000 -1000000}}]
1935	1942	.e insert 0 abcde
1936	1943	.e insert 500 XXX
1937		set timeout [after 500 {set $scrollInfo "timeout"}]
1938	1944	vwait scrollInfo
1939	1945	list [.e get] $contents [format {%.6f %.6f} {*}$scrollInfo]
1940	1946	} -cleanup {

1998	2004	destroy .e
1999	2005	} -result {2 6 2 5}
2000	2006	test entry-7.7 {InsertChars procedure} -setup {
2001		entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
	2007	entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
2002	2008	pack .e
2003	2009	} -body {
2004	2010	.e configure -xscrollcommand scroll

2008	2014	.e index insert
2009	2015	} -cleanup {
2010	2016	destroy .e
2011		} -result {7}
	2017	} -result 7
2012	2018	test entry-7.8 {InsertChars procedure} -setup {
2013		entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
	2019	entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
2014	2020	pack .e
2015	2021	} -body {
2016	2022	.e insert 0 0123456789

2019	2025	.e index insert
2020	2026	} -cleanup {
2021	2027	destroy .e
2022		} -result {4}
	2028	} -result 4
2023	2029	test entry-7.9 {InsertChars procedure} -setup {
2024		entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
	2030	entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
2025	2031	pack .e
2026	2032	} -body {
2027	2033	.e insert 0 "This is a very long string"

2031	2037	.e index @0
2032	2038	} -cleanup {
2033	2039	destroy .e
2034		} -result {7}
	2040	} -result 7
2035	2041	test entry-7.10 {InsertChars procedure} -setup {
2036		entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
	2042	entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
2037	2043	pack .e
2038	2044	} -body {
2039	2045	.e insert 0 "This is a very long string"

2043	2049	.e index @0
2044	2050	} -cleanup {
2045	2051	destroy .e
2046		} -result {4}
	2052	} -result 4
2047	2053
2048	2054	test entry-7.11 {InsertChars procedure} -constraints {
2049	2055	fonts
2050	2056	} -setup {
2051		entry .e -width 0 -font {Courier -12} -highlightthickness 2 -bd 2
	2057	entry .e -width 0 -font {Courier -12} -highlightthickness 2 -bd 2
2052	2058	pack .e
2053	2059	} -body {
2054	2060	.e insert 0 "xyzzy"

2057	2063	winfo reqwidth .e
2058	2064	} -cleanup {
2059	2065	destroy .e
2060		} -result {59}
	2066	} -result 59
2061	2067
2062	2068	test entry-8.1 {DeleteChars procedure} -setup {
2063	2069	unset -nocomplain contents
2064		entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
	2070	entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
2065	2071	pack .e
2066	2072	focus .e
2067	2073	} -body {
2068	2074	.e configure -textvariable contents -xscrollcommand scroll
	2075	set timeout [after 500 {set scrollInfo {-1000000 -1000000}}]
2069	2076	.e insert 0 abcde
2070	2077	.e delete 2 4
2071		set timeout [after 500 {set $scrollInfo "timeout"}]
2072	2078	vwait scrollInfo
2073	2079	list [.e get] $contents [format {%.6f %.6f} {*}$scrollInfo]
2074	2080	} -cleanup {

2077	2083	} -result {abe abe {0.000000 1.000000}}
2078	2084	test entry-8.2 {DeleteChars procedure} -setup {
2079	2085	unset -nocomplain contents
2080		entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
	2086	entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
2081	2087	pack .e
2082	2088	focus .e
2083	2089	} -body {
2084	2090	.e configure -textvariable contents -xscrollcommand scroll
	2091	set timeout [after 500 {set scrollInfo {-1000000 -1000000}}]
2085	2092	.e insert 0 abcde
2086		.e delete -2 2
2087		set timeout [after 500 {set $scrollInfo "timeout"}]
	2093	.e delete -1 2
2088	2094	vwait scrollInfo
2089	2095	list [.e get] $contents [format {%.6f %.6f} {*}$scrollInfo]
2090	2096	} -cleanup {

2093	2099	} -result {cde cde {0.000000 1.000000}}
2094	2100	test entry-8.3 {DeleteChars procedure} -setup {
2095	2101	unset -nocomplain contents
2096		entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
	2102	entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
2097	2103	pack .e
2098	2104	focus .e
2099	2105	} -body {
2100	2106	.e configure -textvariable contents -xscrollcommand scroll
	2107	set timeout [after 500 {set scrollInfo {-1000000 -1000000}}]
2101	2108	.e insert 0 abcde
2102	2109	.e delete 3 1000
2103		set timeout [after 500 {set $scrollInfo "timeout"}]
2104	2110	vwait scrollInfo
2105	2111	list [.e get] $contents [format {%.6f %.6f} {*}$scrollInfo]
2106	2112	} -cleanup {

2108	2114	after cancel $timeout
2109	2115	} -result {abc abc {0.000000 1.000000}}
2110	2116	test entry-8.4 {DeleteChars procedure} -setup {
2111		entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
	2117	entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
2112	2118	pack .e
2113	2119	focus .e
2114	2120	} -body {

2124	2130	destroy .e
2125	2131	} -result {1 6 1 5}
2126	2132	test entry-8.5 {DeleteChars procedure} -setup {
2127		entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
	2133	entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
2128	2134	pack .e
2129	2135	focus .e
2130	2136	} -body {

2140	2146	destroy .e
2141	2147	} -result {1 5 1 4}
2142	2148	test entry-8.6 {DeleteChars procedure} -setup {
2143		entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
	2149	entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
2144	2150	pack .e
2145	2151	focus .e
2146	2152	} -body {

2156	2162	destroy .e
2157	2163	} -result {1 2 1 5}
2158	2164	test entry-8.7 {DeleteChars procedure} -setup {
2159		entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
	2165	entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
2160	2166	pack .e
2161	2167	focus .e
2162	2168	} -body {

2170	2176	destroy .e
2171	2177	} -returnCodes error -result {selection isn't in widget .e}
2172	2178	test entry-8.8 {DeleteChars procedure} -setup {
2173		entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
	2179	entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
2174	2180	pack .e
2175	2181	focus .e
2176	2182	} -body {

2186	2192	destroy .e
2187	2193	} -result {3 4 3 8}
2188	2194	test entry-8.9 {DeleteChars procedure} -setup {
2189		entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
	2195	entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
2190	2196	pack .e
2191	2197	} -body {
2192	2198	.e insert 0 0123456789abcde

2199	2205	destroy .e
2200	2206	} -returnCodes error -result {selection isn't in widget .e}
2201	2207	test entry-8.10 {DeleteChars procedure} -setup {
2202		entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
	2208	entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
2203	2209	pack .e
2204	2210	focus .e
2205	2211	} -body {

2215	2221	destroy .e
2216	2222	} -result {3 5 5 8}
2217	2223	test entry-8.11 {DeleteChars procedure} -setup {
2218		entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
	2224	entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
2219	2225	pack .e
2220	2226	focus .e
2221	2227	} -body {

2231	2237	destroy .e
2232	2238	} -result {3 8 4 8}
2233	2239	test entry-8.12 {DeleteChars procedure} -setup {
2234		entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
	2240	entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
2235	2241	pack .e
2236	2242	focus .e
2237	2243	} -body {

2242	2248	.e index insert
2243	2249	} -cleanup {
2244	2250	destroy .e
2245		} -result {1}
	2251	} -result 1
2246	2252	test entry-8.13 {DeleteChars procedure} -setup {
2247		entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
	2253	entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
2248	2254	pack .e
2249	2255	focus .e
2250	2256	} -body {

2255	2261	.e index insert
2256	2262	} -cleanup {
2257	2263	destroy .e
2258		} -result {1}
	2264	} -result 1
2259	2265	test entry-8.14 {DeleteChars procedure} -setup {
2260		entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
	2266	entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
2261	2267	pack .e
2262	2268	focus .e
2263	2269	} -body {

2268	2274	.e index insert
2269	2275	} -cleanup {
2270	2276	destroy .e
2271		} -result {4}
	2277	} -result 4
2272	2278	test entry-8.15 {DeleteChars procedure} -setup {
2273		entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
	2279	entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
2274	2280	pack .e
2275	2281	focus .e
2276	2282	} -body {

2281	2287	.e index @0
2282	2288	} -cleanup {
2283	2289	destroy .e
2284		} -result {1}
	2290	} -result 1
2285	2291	test entry-8.16 {DeleteChars procedure} -setup {
2286		entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
	2292	entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
2287	2293	pack .e
2288	2294	focus .e
2289	2295	} -body {

2294	2300	.e index @0
2295	2301	} -cleanup {
2296	2302	destroy .e
2297		} -result {1}
	2303	} -result 1
2298	2304	test entry-8.17 {DeleteChars procedure} -setup {
2299		entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
	2305	entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
2300	2306	pack .e
2301	2307	focus .e
2302	2308	} -body {

2307	2313	.e index @0
2308	2314	} -cleanup {
2309	2315	destroy .e
2310		} -result {4}
2311		test entry-8.18 {DeleteChars procedure} -setup {
2312		entry .e -width 0 -font {Courier -12} -highlightthickness 2 -bd 2
	2316	} -result 4
	2317	test entry-8.18 {DeleteChars procedure} -constraints failsOnUbuntuNoXft -setup {
	2318	entry .e -width 0 -font {Courier -12} -highlightthickness 2 -bd 2
2313	2319	pack .e
2314	2320	focus .e
2315	2321	} -body {

2319	2325	winfo reqwidth .e
2320	2326	} -cleanup {
2321	2327	destroy .e
2322		} -result {31}
	2328	} -result 31
2323	2329
2324	2330	test entry-9.1 {EntryValueChanged procedure} -setup {
2325	2331	unset -nocomplain x

2340	2346	set y ab
2341	2347	entry .e -font {Helvetica -12} -highlightthickness 2 -bd 2 -width 0
2342	2348	pack .e
2343		.e configure -textvariable x
	2349	.e configure -textvariable x
2344	2350	.e configure -textvariable y
2345	2351	update
2346	2352	list [.e get] [winfo reqwidth .e]

2349	2355	} -result {ab 24}
2350	2356	test entry-10.2 {EntrySetValue procedure, updating selection} -setup {
2351	2357	unset -nocomplain x
2352		entry .e -font {Helvetica -12} -highlightthickness 2 -bd 2
	2358	entry .e -font {Helvetica -12} -highlightthickness 2 -bd 2
2353	2359	pack .e
2354	2360	} -body {
2355	2361	.e configure -textvariable x

2362	2368	} -returnCodes error -result {selection isn't in widget .e}
2363	2369	test entry-10.3 {EntrySetValue procedure, updating selection} -setup {
2364	2370	unset -nocomplain x
2365		entry .e -font {Helvetica -12} -highlightthickness 2 -bd 2
	2371	entry .e -font {Helvetica -12} -highlightthickness 2 -bd 2
2366	2372	pack .e
2367	2373	} -body {
2368	2374	.e configure -textvariable x

2375	2381	} -result {4 7}
2376	2382	test entry-10.4 {EntrySetValue procedure, updating selection} -setup {
2377	2383	unset -nocomplain x
2378		entry .e -font {Helvetica -12} -highlightthickness 2 -bd 2
	2384	entry .e -font {Helvetica -12} -highlightthickness 2 -bd 2
2379	2385	pack .e
2380	2386	} -body {
2381	2387	.e configure -textvariable x

2388	2394	} -result {4 10}
2389	2395	test entry-10.5 {EntrySetValue procedure, updating display position} -setup {
2390	2396	unset -nocomplain x
2391		entry .e -highlightthickness 2 -bd 2
	2397	entry .e -highlightthickness 2 -bd 2
2392	2398	pack .e
2393	2399	} -body {
2394	2400	.e configure -width 10 -font {Courier -12} -textvariable x

2400	2406	.e index @0
2401	2407	} -cleanup {
2402	2408	destroy .e
2403		} -result {0}
	2409	} -result 0
2404	2410	test entry-10.6 {EntrySetValue procedure, updating display position} -setup {
2405	2411	unset -nocomplain x
2406		entry .e -highlightthickness 2 -bd 2
	2412	entry .e -highlightthickness 2 -bd 2
2407	2413	pack .e
2408	2414	} -body {
2409	2415	.e configure -width 10 -font {Courier -12} -textvariable x

2416	2422	.e index @0
2417	2423	} -cleanup {
2418	2424	destroy .e
2419		} -result {10}
	2425	} -result 10
2420	2426	test entry-10.7 {EntrySetValue procedure, updating insertion cursor} -setup {
2421	2427	unset -nocomplain x
2422		entry .e -highlightthickness 2 -bd 2
	2428	entry .e -highlightthickness 2 -bd 2
2423	2429	pack .e
2424	2430	update
2425	2431	} -body {

2431	2437	.e index insert
2432	2438	} -cleanup {
2433	2439	destroy .e
2434		} -result {3}
	2440	} -result 3
2435	2441	test entry-10.8 {EntrySetValue procedure, updating insertion cursor} -setup {
2436	2442	unset -nocomplain x
2437		entry .e -highlightthickness 2 -bd 2
	2443	entry .e -highlightthickness 2 -bd 2
2438	2444	pack .e
2439	2445	} -body {
2440	2446	.e configure -width 10 -font {Courier -12} -textvariable x

2445	2451	.e index insert
2446	2452	} -cleanup {
2447	2453	destroy .e
2448		} -result {5}
	2454	} -result 5
2449	2455
2450	2456	test entry-11.1 {EntryEventProc procedure} -setup {
2451	2457	entry .e -highlightthickness 2 -bd 2 -font {Helvetica -12}

2489	2495	.e index end
2490	2496	} -cleanup {
2491	2497	destroy .e
2492		} -result {21}
	2498	} -result 21
2493	2499	test entry-13.2 {GetEntryIndex procedure} -body {
2494		entry .e
	2500	entry .e
2495	2501	.e index abogus
2496	2502	} -cleanup {
2497	2503	destroy .e

2508	2514	.e index anchor
2509	2515	} -cleanup {
2510	2516	destroy .e
2511		} -result {1}
	2517	} -result 1
2512	2518	test entry-13.4 {GetEntryIndex procedure} -setup {
2513	2519	entry .e -font {Courier -12} -width 5 -bd 2 -relief sunken
2514	2520	pack .e

2521	2527	.e index anchor
2522	2528	} -cleanup {
2523	2529	destroy .e
2524		} -result {4}
	2530	} -result 4
2525	2531	test entry-13.5 {GetEntryIndex procedure} -setup {
2526	2532	entry .e -font {Courier -12} -width 5 -bd 2 -relief sunken
2527	2533	pack .e

2535	2541	.e index anchor
2536	2542	} -cleanup {
2537	2543	destroy .e
2538		} -result {15}
	2544	} -result 15
2539	2545	test entry-13.6 {GetEntryIndex procedure} -setup {
2540	2546	entry .e
2541	2547	} -body {

2554	2560	.e index insert
2555	2561	} -cleanup {
2556	2562	destroy .e
2557		} -result {2}
	2563	} -result 2
2558	2564	test entry-13.8 {GetEntryIndex procedure} -setup {
2559	2565	entry .e
2560	2566	} -body {

2582	2588
2583	2589
2584	2590	test entry-13.10 {GetEntryIndex procedure} -constraints x11 -body {
2585		# On unix, when selection is cleared, entry widget's internal
	2591	# On unix, when selection is cleared, entry widget's internal
2586	2592	# selection range is reset.
2587	2593	# Previous settings:
2588	2594	entry .e -font {Courier -12} -width 5 -bd 2 -relief sunken

2602	2608
2603	2609	test entry-13.11 {GetEntryIndex procedure} -constraints aquaOrWin32 -body {
2604	2610	# On mac and pc, when selection is cleared, entry widget remembers
2605		# last selected range. When selection ownership is restored to
	2611	# last selected range. When selection ownership is restored to
2606	2612	# entry, the old range will be rehighlighted.
2607	2613	# Previous settings:
2608	2614	entry .e -font {Courier -12} -width 5 -bd 2 -relief sunken

2619	2625	.e index sel.first
2620	2626	} -cleanup {
2621	2627	destroy .e
2622		} -result {1}
	2628	} -result 1
2623	2629
2624	2630	test entry-13.12 {GetEntryIndex procedure} -constraints x11 -body {
2625	2631	# Previous settings:

2638	2644	destroy .e
2639	2645	} -returnCodes error -result {selection isn't in widget .e}
2640	2646
2641		# why when string in .e index changed to not beginning with s,
	2647	# why when string in .e index changed to not beginning with s,
2642	2648	# it behaves differently?
2643	2649	test entry-13.12.1 {GetEntryIndex procedure} -constraints unix -body {
2644	2650	# Previous settings:

2676	2682
2677	2683	test entry-13.14 {GetEntryIndex procedure} -constraints win -body {
2678	2684	# On mac and pc, when selection is cleared, entry widget remembers
2679		# last selected range. When selection ownership is restored to
	2685	# last selected range. When selection ownership is restored to
2680	2686	# entry, the old range will be rehighlighted.
2681	2687	# Previous settings:
2682	2688	entry .e -font {Courier -12} -width 5 -bd 2 -relief sunken

2689	2695	list [.e index sel.first] [.e index sel.last]
2690	2696	# Testing:
2691	2697	selection clear .e
2692		selection get
	2698	selection get
2693	2699	} -cleanup {
2694	2700	destroy .e
2695	2701	} -returnCodes error -match glob -result {*}
2696	2702
2697	2703	test entry-13.14.1 {GetEntryIndex procedure} -constraints win -body {
2698	2704	# On mac and pc, when selection is cleared, entry widget remembers
2699		# last selected range. When selection ownership is restored to
	2705	# last selected range. When selection ownership is restored to
2700	2706	# entry, the old range will be rehighlighted.
2701	2707	# Previous settings:
2702	2708	entry .e -font {Courier -12} -width 5 -bd 2 -relief sunken

2708	2714	.e select to 6
2709	2715	list [.e index sel.first] [.e index sel.last]
2710	2716	# Testing:
2711		selection clear .e
2712		catch {selection get}
2713		.e index sbogus
	2717	selection clear .e
	2718	catch {selection get}
	2719	.e index sbogus
2714	2720	} -cleanup {
2715	2721	destroy .e
2716	2722	} -returnCodes error -match glob -result {*}

2725	2731
2726	2732	test entry-13.16 {GetEntryIndex procedure} -constraints fonts -body {
2727	2733	entry .e -width 5 -relief sunken -highlightthickness 2 -bd 2\
2728		-font {Courier -12}
	2734	-font {Courier -12}
2729	2735	pack .e
2730	2736	.e insert 0 012345678901234567890
2731	2737	.e xview 4

2733	2739	.e index @4
2734	2740	} -cleanup {
2735	2741	destroy .e
2736		} -result {4}
	2742	} -result 4
2737	2743	test entry-13.17 {GetEntryIndex procedure} -constraints fonts -body {
2738	2744	entry .e -width 5 -relief sunken -highlightthickness 2 -bd 2\
2739	2745	-font {Courier -12}

2744	2750	.e index @11
2745	2751	} -cleanup {
2746	2752	destroy .e
2747		} -result {4}
	2753	} -result 4
2748	2754	test entry-13.18 {GetEntryIndex procedure} -constraints fonts -body {
2749	2755	entry .e -width 5 -relief sunken -highlightthickness 2 -bd 2\
2750	2756	-font {Courier -12}

2755	2761	.e index @12
2756	2762	} -cleanup {
2757	2763	destroy .e
2758		} -result {5}
	2764	} -result 5
2759	2765	test entry-13.19 {GetEntryIndex procedure} -constraints fonts -body {
2760	2766	entry .e -width 5 -relief sunken -highlightthickness 2 -bd 2\
2761		-font {Courier -12}
	2767	-font {Courier -12}
2762	2768	pack .e
2763	2769	.e insert 0 012345678901234567890
2764	2770	.e xview 4

2766	2772	.e index @[expr {[winfo width .e] - 6}]
2767	2773	} -cleanup {
2768	2774	destroy .e
2769		} -result {8}
	2775	} -result 8
2770	2776	test entry-13.20 {GetEntryIndex procedure} -constraints fonts -body {
2771	2777	entry .e -width 5 -relief sunken -highlightthickness 2 -bd 2\
2772	2778	-font {Courier -12}

2777	2783	.e index @[expr {[winfo width .e] - 5}]
2778	2784	} -cleanup {
2779	2785	destroy .e
2780		} -result {9}
	2786	} -result 9
2781	2787	test entry-13.21 {GetEntryIndex procedure} -body {
2782	2788	entry .e -width 5 -relief sunken -highlightthickness 2 -bd 2\
2783	2789	-font {Courier -12}

2788	2794	.e index @1000
2789	2795	} -cleanup {
2790	2796	destroy .e
2791		} -result {9}
	2797	} -result 9
2792	2798	test entry-13.22 {GetEntryIndex procedure} -setup {
2793		entry .e
	2799	entry .e
2794	2800	pack .e
2795	2801	update
2796	2802	} -body {

2800	2806	} -returnCodes error -result {bad entry index "1xyz"}
2801	2807	test entry-13.23 {GetEntryIndex procedure} -body {
2802	2808	entry .e -width 5 -relief sunken -highlightthickness 2 -bd 2\
2803		-font {Courier -12}
	2809	-font {Courier -12}
2804	2810	pack .e
2805	2811	.e insert 0 012345678901234567890
2806	2812	.e xview 4
2807	2813	update
2808		.e index -10
2809		} -cleanup {
2810		destroy .e
2811		} -result {0}
	2814	.e index -1
	2815	} -cleanup {
	2816	destroy .e
	2817	} -result 0
2812	2818	test entry-13.24 {GetEntryIndex procedure} -body {
2813	2819	entry .e -width 5 -relief sunken -highlightthickness 2 -bd 2\
2814		-font {Courier -12}
	2820	-font {Courier -12}
2815	2821	pack .e
2816	2822	.e insert 0 012345678901234567890
2817	2823	.e xview 4

2819	2825	.e index 12
2820	2826	} -cleanup {
2821	2827	destroy .e
2822		} -result {12}
	2828	} -result 12
2823	2829	test entry-13.25 {GetEntryIndex procedure} -body {
2824	2830	entry .e -width 5 -relief sunken -highlightthickness 2 -bd 2\
2825		-font {Courier -12}
	2831	-font {Courier -12}
2826	2832	pack .e
2827	2833	.e insert 0 012345678901234567890
2828	2834	.e xview 4

2830	2836	.e index 49
2831	2837	} -cleanup {
2832	2838	destroy .e
2833		} -result {21}
	2839	} -result 21
2834	2840	test entry-13.26 {GetEntryIndex procedure} -constraints fonts -body {
2835	2841	entry .e -highlightthickness 2 -bd 2 -font {Helvetica -12}
2836	2842	selection clear .e

2871	2877	}
2872	2878	} -body {
2873	2879	entry .e
2874		.e insert end $x
	2880	.e insert end $x
2875	2881	.e select from 0
2876	2882	.e select to end
2877	2883	string compare [selection get] $x
2878	2884	} -cleanup {
2879	2885	destroy .e
2880		} -result {0}
	2886	} -result 0
2881	2887
2882	2888	test entry-15.1 {EntryLostSelection} -body {
2883	2889	entry .e

2898	2904	entry .e -width 10 -font {Helvetica -12}
2899	2905	pack .e
2900	2906	update
2901		.e insert 0 "............................."
	2907	.e insert 0 "............................."
2902	2908	format {%.6f %.6f} {*}[.e xview]
2903	2909	} -cleanup {
2904	2910	destroy .e

2936	2942	test entry-17.1 {EntryUpdateScrollbar procedure} -body {
2937	2943	entry .e -width 10 -xscrollcommand scroll -font {Courier -12}
2938	2944	pack .e
	2945	update idletasks
	2946	set timeout [after 500 {set scrollInfo {-1000000 -1000000}}]
2939	2947	.e delete 0 end
2940	2948	.e insert 0 123
2941		set timeout [after 500 {set $scrollInfo "timeout"}]
2942	2949	vwait scrollInfo
2943	2950	format {%.6f %.6f} {*}$scrollInfo
2944	2951	} -cleanup {

2948	2955	test entry-17.2 {EntryUpdateScrollbar procedure} -body {
2949	2956	entry .e -width 10 -xscrollcommand scroll -font {Courier -12}
2950	2957	pack .e
	2958	set timeout [after 500 {set scrollInfo {-1000000 -1000000}}]
2951	2959	.e insert 0 0123456789abcdef
2952	2960	.e xview 3
2953		set timeout [after 500 {set $scrollInfo "timeout"}]
2954	2961	vwait scrollInfo
2955	2962	format {%.6f %.6f} {*}$scrollInfo
2956	2963	} -cleanup {

2960	2967	test entry-17.3 {EntryUpdateScrollbar procedure} -body {
2961	2968	entry .e -width 10 -xscrollcommand scroll -font {Courier -12}
2962	2969	pack .e
	2970	set timeout [after 500 {set scrollInfo {-1000000 -1000000}}]
2963	2971	.e insert 0 abcdefghijklmnopqrs
2964	2972	.e xview 6
2965		set timeout [after 500 {set $scrollInfo "timeout"}]
2966	2973	vwait scrollInfo
2967	2974	format {%.6f %.6f} {*}$scrollInfo
2968	2975	} -cleanup {

2975	2982	set x $msg
2976	2983	}
2977	2984	} -body {
2978		entry .e -width 5 -xscrollcommand thisisnotacommand
2979		pack .e
	2985	entry .e -width 5
	2986	pack .e
	2987	update idletasks
	2988	.e configure -xscrollcommand thisisnotacommand
2980	2989	vwait x
2981	2990	list $x $errorInfo
2982	2991	} -cleanup {

2997	3006	set res1 [list [winfo children .] [interp hidden]]
2998	3007	set res2 [list {} $l]
2999	3008	expr {$res1 == $res2}
3000		} -result {1}
	3009	} -result 1
3001	3010
3002	3011	##
3003	3012	## Entry widget VALIDATION tests

3019	3028	-background red -foreground white
3020	3029	pack .e
3021	3030	.e insert 0 a
3022		return $::vVals
	3031	set ::vVals
3023	3032	} -cleanup {
3024	3033	destroy .e
3025	3034	} -result {.e 1 0 a {} a all key}

3051	3060	pack .e
3052	3061	.e insert 0 ab ;# previous settings
3053	3062	.e insert end c
3054		return $::vVals
	3063	set ::vVals
3055	3064	} -cleanup {
3056	3065	destroy .e
3057	3066	} -result {.e 1 2 abc ab c all key}

3083	3092	pack .e
3084	3093	.e insert 0 a123bc ;# previous settings
3085	3094	.e delete 2
3086		return $::vVals
	3095	set ::vVals
3087	3096	} -cleanup {
3088	3097	destroy .e
3089	3098	} -result {.e 0 2 a13bc a123bc 2 all key}

3100	3109	.e insert 0 a13bc ;# previous settings
3101	3110	.e configure -validate key
3102	3111	.e delete 1 3
3103		return $::vVals
	3112	set ::vVals
3104	3113	} -cleanup {
3105	3114	destroy .e
3106	3115	} -result {.e 0 1 abc a13bc 13 key key}

3117	3126	.e insert end abc ;# previous settings
3118	3127	set ::vVals {}
3119	3128	.e insert end d
3120		return $::vVals
	3129	set ::vVals
3121	3130	} -cleanup {
3122	3131	destroy .e
3123	3132	} -result {}

3136	3145	focus -force .e
3137	3146	# update necessary to process FocusIn event
3138	3147	update
3139		return $::vVals
	3148	set ::vVals
3140	3149	} -cleanup {
3141	3150	destroy .e
3142	3151	} -result {.e -1 -1 abcd abcd {} focus focusin}

3157	3166	focus -force .
3158	3167	# update necessary to process FocusOut event
3159	3168	update
3160		return $::vVals
	3169	set ::vVals
3161	3170	} -cleanup {
3162	3171	destroy .e
3163	3172	} -result {.e -1 -1 abcd abcd {} focus focusout}

3175	3184	focus -force .e
3176	3185	# update necessary to process FocusIn event
3177	3186	update
3178		return $::vVals
	3187	set ::vVals
3179	3188	} -cleanup {
3180	3189	destroy .e
3181	3190	} -result {.e -1 -1 abcd abcd {} all focusin}

3196	3205	focus -force .
3197	3206	# update necessary to process FocusOut event
3198	3207	update
3199		return $::vVals
	3208	set ::vVals
3200	3209	} -cleanup {
3201	3210	destroy .e
3202	3211	} -result {.e -1 -1 abcd abcd {} all focusout}

3214	3223	focus -force .e
3215	3224	# update necessary to process FocusIn event
3216	3225	update
3217		return $::vVals
	3226	set ::vVals
3218	3227	} -cleanup {
3219	3228	destroy .e
3220	3229	} -result {.e -1 -1 abcd abcd {} focusin focusin}

3233	3242	focus -force .
3234	3243	# update necessary to process FocusOut event
3235	3244	update
3236		return $::vVals
	3245	set ::vVals
3237	3246	} -cleanup {
3238	3247	destroy .e
3239	3248	} -result {}

3252	3261	focus -force .e
3253	3262	# update necessary to process FocusIn event
3254	3263	update
3255		return $::vVals
	3264	set ::vVals
3256	3265	} -cleanup {
3257	3266	destroy .e
3258	3267	} -result {}

3274	3283	focus -force .
3275	3284	# update necessary to process FocusOut event
3276	3285	update
3277		return $::vVals
	3286	set ::vVals
3278	3287	} -cleanup {
3279	3288	destroy .e
3280	3289	} -result {.e -1 -1 abcd abcd {} focusout focusout}

3351	3360	-background red -foreground white
3352	3361	pack .e
3353	3362	set ::e nextdata ;# previous settings
3354
	3363
3355	3364	.e configure -validatecommand [list doval2 %W %d %i %P %s %S %v %V]
3356	3365	.e validate
3357	3366	list [.e cget -validate] [.e get] $::vVals
3358	3367	} -cleanup {
3359	3368	destroy .e
3360		} -result {none mydata {.e -1 -1 nextdata nextdata {} all forced}}
	3369	} -result {none nextdata {.e -1 -1 nextdata nextdata {} all forced}}
3361	3370
3362	3371	## This leaves validate alone because we trigger validation through the
3363	3372	## textvar (a write trace), and the write during validation triggers

3376	3385	set ::e nextdata ;# previous settings
3377	3386	.e configure -validatecommand [list doval2 %W %d %i %P %s %S %v %V] ;# prev
3378	3387	.e validate ;# previous settings
3379
	3388
3380	3389	.e configure -validate all
3381	3390	set ::e testdata
3382	3391	list [.e cget -validate] [.e get] $::e $::vVals
3383	3392	} -cleanup {
3384	3393	destroy .e
3385	3394	} -result {all testdata mydata {.e -1 -1 testdata mydata {} all forced}}
	3395
	3396	## This leaves validate alone because we trigger validation through the
	3397	## textvar (a write trace), and the write during validation triggers
	3398	## nothing (by definition of avoiding loops on var traces). This is
	3399	## one of those "dangerous" conditions where the user will have a
	3400	## different value in the entry widget shown as is in the textvar.
	3401	test entry-19.21 {entry widget validation - bug 40e4bf6198} -setup {
	3402	unset -nocomplain ::e ::vVals
	3403	} -body {
	3404	entry .e -validate key \
	3405	-validatecommand [list doval2 %W %d %i %P %s %S %v %V] \
	3406	-textvariable ::e
	3407	pack .e
	3408	set ::e origdata
	3409	.e insert 0 A
	3410	list [.e cget -validate] [.e get] $::e $::vVals
	3411	} -cleanup {
	3412	destroy .e
	3413	} -result {none origdata mydata {.e 1 0 Aorigdata origdata A key key}}
	3414
3386	3415	##
3387	3416	## End validation tests
3388	3417	##

3396	3425	winfo exists .e
3397	3426	} -cleanup {
3398	3427	destroy .e
3399		} -result {0}
	3428	} -result 0
3400	3429
3401	3430	test entry-20.2 {widget deletion while active} -body {
3402	3431	entry .e -validate all \

3406	3435	winfo exists .e
3407	3436	} -cleanup {
3408	3437	destroy .e
3409		} -result {0}
	3438	} -result 0
3410	3439
3411	3440	test entry-20.3 {widget deletion while active} -body {
3412	3441	entry .e -validate all \

3415	3444	winfo exists .e
3416	3445	} -cleanup {
3417	3446	destroy .e
3418		} -result {0}
	3447	} -result 0
3419	3448
3420	3449	test entry-20.4 {widget deletion while active} -body {
3421	3450	entry .e -validate all \

3425	3454	winfo exists .e
3426	3455	} -cleanup {
3427	3456	destroy .e
3428		} -result {0}
	3457	} -result 0
3429	3458
3430	3459	test entry-20.5 {widget deletion while active} -body {
3431	3460	entry .e -validatecommand { destroy .e ; return 0 }

3433	3462	winfo exists .e
3434	3463	} -cleanup {
3435	3464	destroy .e
3436		} -result {0}
	3465	} -result 0
3437	3466
3438	3467	test entry-20.6 {widget deletion while active} -body {
3439	3468	pack [entry .e]

3443	3472	winfo exists .e
3444	3473	} -cleanup {
3445	3474	destroy .e
3446		} -result {0}
	3475	} -result 0
3447	3476
3448	3477	test entry-20.7 {widget deletion with textvariable active} -body {
3449	3478	# SF bugs 607390 and 617446

3455	3484	winfo exists .e
3456	3485	} -cleanup {
3457	3486	destroy .e
3458		} -result {0}
	3487	} -result 0
3459	3488
3460	3489
3461	3490	test entry-21.1 {selection present while disabled, bug 637828} -body {

+7

-6

tests/event.test less more

244	244	set e [entry $t.e]
245	245	pack $e
246	246	tkwait visibility $e
247		# Avoid a hang when macOS puts the mouse pointer on the green button
	247	# Avoid a hang when macOS puts the mouse pointer on the green button
248	248	wm geometry .t +200+100
249	249	_keypress_string $e MELLO
250	250	_keypress $e BackSpace

358	358
359	359	# Save the position of the insert cursor
360	360	lappend result [$e index insert]
361
	361
362	362	# Now drag until selend is highlighted, then click up
363	363
364	364	set current $anchor

425	425
426	426	# Save the position of the insert cursor
427	427	lappend result [$e index insert]
428
	428
429	429	# Now drag until selend is highlighted, then click up
430	430
431	431	set current $anchor

611	611	deleteWindows
612	612	} -result {select 11 7 select 4 { select} {Word select} 2}
613	613
614		test event-5.1(triple-click-drag) {Triple click and drag across lines in a
	614	test event-5.1(triple-click-drag) {Triple click and drag across lines in a
615	615	text widget, this should extend the selection to the new line} -setup {
616	616	deleteWindows
617	617	} -body {

796	796	set result [list]
797	797	lappend result [$e index insert]
798	798	lappend result [_get_selection $e]
799
	799
800	800	# Clear selection by clicking at 0,0
801	801
802	802	event generate $e <ButtonPress-1> -x 0 -y 0

824	824	} -result {4 A 4 A}
825	825
826	826	test event-8 {event generate with keysyms corresponding to
827		multi-byte virtual keycodes - bug
	827	multi-byte virtual keycodes - bug
828	828	e36963bfe8df9f5e528134707a91b9c0051de723} -constraints nonPortable -setup {
829	829	deleteWindows
830	830	set res [list ]

859	859	} -result {OK}
860	860
861	861	# cleanup
	862	update
862	863	unset -nocomplain keypress_lookup
863	864	rename _init_keypress_lookup {}
864	865	rename _keypress_lookup {}

+2

-2

tests/filebox.test less more

5	5	# Copyright (c) 1998-1999 by Scriptics Corporation.
6	6	# All rights reserved.
7	7
8		package require tcltest 2.1
	8	package require tcltest 2.2
9	9	eval tcltest::configure $argv
10	10	tcltest::loadTestedCommands
11	11

166	166	catch {tk_getOpenFile -foo 1} msg
167	167	regsub -all , $msg "" options
168	168	regsub \"-foo\" $options "" options
169
	169
170	170	foreach option $options {
171	171	if {[string index $option 0] eq "-"} {
172	172	test filebox-1.2-$mode$option "tk_getOpenFile command" -body {

+38

-15

tests/focus.test less more

9	9	eval tcltest::configure $argv
10	10	tcltest::loadTestedCommands
11	11	namespace import -force tcltest::test
	12
	13	testConstraint failsOnUbuntu [expr {![info exists ::env(CI)] \|\| ![string match Linux $::tcl_platform(os)]}]
	14	testConstraint failsOnXQuarz [expr {$tcl_platform(os) ne "Darwin" \|\| [tk windowingsystem] ne "x11" }]
12	15
13	16	proc focusSetup {} {
14	17	destroy .t

103	106	focus .gorp a
104	107	} -returnCodes error -result {bad option ".gorp": must be -displayof, -force, or -lastfor}
105	108	test focus-1.8 {Tk_FocusCmd procedure, focussing on dead window} -constraints {
106		unix
	109	unix
107	110	} -setup {
108	111	destroy .t2
109	112	} -body {

129	132	destroy .t2
130	133	} -result {.t2.f2 .t2 .t2}
131	134	test focus-1.9 {Tk_FocusCmd procedure, -displayof option} -constraints {
132		unix
	135	unix
133	136	} -body {
134	137	focus -displayof
135	138	} -returnCodes error -result {wrong # args: should be "focus -displayof window"}
136	139	test focus-1.10 {Tk_FocusCmd procedure, -displayof option} -constraints {
137		unix
	140	unix
138	141	} -body {
139	142	focus -displayof a b
140	143	} -returnCodes error -result {wrong # args: should be "focus -displayof window"}
141	144	test focus-1.11 {Tk_FocusCmd procedure, -displayof option} -constraints {
142		unix
	145	unix
143	146	} -body {
144	147	focus -displayof .lousy
145	148	} -returnCodes error -result {bad window path name ".lousy"}
146	149	test focus-1.12 {Tk_FocusCmd procedure, -displayof option} -constraints {
147		unix
	150	unix
148	151	} -body {
149	152	focusClear
150	153	focus .t
151	154	focus -displayof .t.b3
152	155	} -result {}
153	156	test focus-1.13 {Tk_FocusCmd procedure, -displayof option} -constraints {
154		unix
	157	unix
155	158	} -body {
156	159	focusClear
157	160	focus -force .t

184	187	lappend x [focus]
185	188	} -result {{} .t.b1}
186	189	test focus-1.20 {Tk_FocusCmd procedure, -lastfor option} -constraints {
187		unix
	190	unix
188	191	} -body {
189	192	focus -lastfor
190	193	} -returnCodes error -result {wrong # args: should be "focus -lastfor window"}
191	194	test focus-1.21 {Tk_FocusCmd procedure, -lastfor option} -constraints {
192		unix
	195	unix
193	196	} -body {
194	197	focus -lastfor 1 2
195	198	} -returnCodes error -result {wrong # args: should be "focus -lastfor window"}
196	199	test focus-1.22 {Tk_FocusCmd procedure, -lastfor option} -constraints {
197		unix
	200	unix
198	201	} -body {
199	202	focus -lastfor who_knows?
200	203	} -returnCodes error -result {bad window path name "who_knows?"}
201	204	test focus-1.23 {Tk_FocusCmd procedure, -lastfor option} -constraints {
202		unix
	205	unix
203	206	} -body {
204	207	focusClear
205	208	focusSetup

208	211	list [focus -lastfor .] [focus -lastfor .t.b3]
209	212	} -result {.b .t.b1}
210	213	test focus-1.24 {Tk_FocusCmd procedure, -lastfor option} -constraints {
211		unix
	214	unix
212	215	} -body {
213	216	focusClear
214	217	focusSetup

307	310	} .t.b1}
308	311
309	312	test focus-2.6 {TkFocusFilterEvent procedure, FocusIn events} -constraints {
310		unix testwrapper
	313	unix testwrapper failsOnUbuntu failsOnXQuarz
311	314	} -body {
312	315	focus .t.b1
313	316	focus .

319	322	list $x $focusInfo
320	323	} -result {.t.b1 {press .t.b1 x}}
321	324	test focus-2.7 {TkFocusFilterEvent procedure, FocusOut events} -constraints {
322		unix testwrapper
	325	unix testwrapper failsOnUbuntu failsOnXQuarz
323	326	} -body {
324	327	set result {}
325	328	foreach detail {NotifyAncestor NotifyInferior NotifyNonlinear

340	343	focus
341	344	} -result {.t.b1}
342	345	test focus-2.9 {TkFocusFilterEvent procedure, FocusOut events} -constraints {
343		unix testwrapper
	346	unix testwrapper failsOnUbuntu failsOnXQuarz
344	347	} -body {
345	348	focus .t.b1
346	349	event gen [testwrapper .] <FocusOut> -detail NotifyAncestor

598	601
599	602	# Test 5.1 fails (before and after update)
600	603	test focus-5.1 {ChangeXFocus procedure, don't take focus unless have it} -constraints {
601		unix testwrapper secureserver
	604	unix testwrapper secureserver failsOnUbuntu failsOnXQuarz
602	605	} -body {
603	606	setupbg
604	607	focusSetup

729	732	bind all <FocusOut> {}
730	733	} -result {{.t.f2.e1 {} {focus out .t.f2.e1 NotifyNonlinear} {focus out .t.f2 NotifyNonlinearVirtual} {focus in .t.f1 NotifyNonlinear} \| {focus out .t.f1 NotifyNonlinear} {focus in .t.f2 NotifyNonlinearVirtual} {focus in .t.f2.e1 NotifyNonlinear}} {{focus in . NotifyVirtual} {focus in .e1 NotifyAncestor} \| {focus out .e1 NotifyAncestor} {focus out . NotifyVirtual}}}
731	734
	735	test focus-7.1 {TkSetFocusWin procedure, unmapped windows} -setup {
	736	# TkSetFocusWin handles the case of not yet mapped windows
	737	# by not setting the focus on them right at the time it is
	738	# requested, but by scheduling an event handler that will
	739	# set the focus later once it gets mapped. The purpose of
	740	# this test is to check that event scheduling and deletion
	741	# work as expected (bug [08e2f8e6f0]).
	742	toplevel .top
	743	spinbox .top.s1
	744	spinbox .top.s2
	745	spinbox .top.s3
	746	grid .top.s1 .top.s2 .top.s3
	747	} -body {
	748	focus -force .top.s2
	749	focus -force .top.s3
	750	update
	751	focus
	752	} -cleanup {
	753	destroy .top
	754	} -result {.top.s3}
732	755
733	756
734	757	deleteWindows

+255

-247

tests/font.test less more

10	10	eval tcltest::configure $argv
11	11	tcltest::loadTestedCommands
12	12
	13	# Some tests require support for 4-byte UTF-8 sequences
	14	testConstraint fullutf [expr {[format %c 0x010000] != "\uFFFD"}]
	15
	16	testConstraint failsOnUbuntu [expr {![info exists ::env(CI)] \|\| ![string match Linux $::tcl_platform(os)]}]
	17	testConstraint failsOnUbuntuNoXft [expr {[testConstraint failsOnUbuntu] \|\| (![catch {tk::pkgconfig get fontsystem} fs] && ($fs eq "xft"))}]
13	18
14	19	set defaultfontlist [font names]
15	20

57	62	} -body {
58	63	interp create foo
59	64	foo eval {
60		load {} Tk
61		wm geometry . +0+0
62		update
	65	load {} Tk
	66	wm geometry . +0+0
	67	update
63	68	}
64	69	interp delete foo
65	70	} -result {}

73	78
74	79	# Makes sure that named font was visible only to child interp.
75	80	foo eval {
76		load {} Tk
77		wm geometry . +0+0
78		button .b -font {times 16} -text "hi"
79		pack .b
80		font create wiggles -family courier -underline 1
81		update
	81	load {} Tk
	82	wm geometry . +0+0
	83	button .b -font {times 16} -text "hi"
	84	pack .b
	85	font create wiggles -family courier -underline 1
	86	update
82	87	}
83	88	lappend x [catch {font configure wiggles} msg; set msg]
84	89
85	90	# Tests cancelling the idle handler for TheWorldHasChanged,
86	91	# because app goes away before idle serviced.
87	92	foo eval {
88		.b config -font wiggles
89		font config wiggles -size 24
90		destroy .
	93	.b config -font wiggles
	94	font config wiggles -size 24
	95	destroy .
91	96	}
92	97	lappend x [foo eval {catch {font families} msg; set msg}]
93	98	} -cleanup {
94		interp delete foo
	99	interp delete foo
95	100	} -result {{named font "wiggles" doesn't exist} {can't invoke "font" command: application has been destroyed}}
96	101
97	102

133	138	# not (objc > 3) so objPtr = NULL
134	139	lindex [font actual {-family times}] 0
135	140	} -result {-family}
136		test font-4.9 {font command: actual} -constraints {unix noExceed} -body {
	141	test font-4.9 {font command: actual} -constraints {unix noExceed failsOnUbuntu} -body {
137	142	# (objc > 3) so objPtr = objv[3 + skip]
138	143	string tolower [font actual {-family times} -family]
139	144	} -result {times}

151	156	font actual {-family times} -- \udc00
152	157	} -match glob -result {*}
153	158	test font-4.14 {font command: actual} -constraints win -body {
154		font actual {-family times} -family -- \ud800\udc00
	159	font actual {-family times} -family -- \uD800\uDC00
155	160	} -result {Times New Roman}
156	161	test font-4.15 {font command: actual} -body {
157	162	font actual {-family times} -- \udc00\ud800
158	163	} -returnCodes 1 -match glob -result {expected a single character but got "*"}
	164	test font-4.16 {font command: actual} -constraints {fullutf win} -body {
	165	font actual {-family times} -family -- \U10000
	166	} -result {Times New Roman}
159	167
160	168
161	169	test font-5.1 {font command: configure} -body {

187	195	font create xyz -family xyz
188	196	lindex [font configure xyz] 1
189	197	} -cleanup {
190		font delete xyz
	198	font delete xyz
191	199	} -result xyz
192	200	test font-5.5 {font command: configure: get one option} -setup {
193	201	clearnondefaultfonts

195	203	# (objc == 4) so objPtr = objv[3]
196	204	font create xyz -family xyz
197	205	font configure xyz -family
198		getnondefaultfonts
199		} -cleanup {
200		font delete xyz
	206	getnondefaultfonts
	207	} -cleanup {
	208	font delete xyz
201	209	} -result xyz
202	210	test font-5.6 {font command: configure: update existing font} -setup {
203	211	catch {font delete xyz}

208	216	update
209	217	font configure xyz -family
210	218	} -cleanup {
211		font delete xyz
	219	font delete xyz
212	220	} -result xyz
213	221	test font-5.7 {font command: configure: bad option} -setup {
214	222	catch {font delete xyz}

216	224	font create xyz
217	225	font configure xyz -style
218	226	} -cleanup {
219		font delete xyz
	227	font delete xyz
220	228	} -returnCodes error -result {bad option "-style": must be -family, -size, -weight, -slant, -underline, or -overstrike}
221	229
222	230

236	244	font create xyz
237	245	getnondefaultfonts
238	246	} -cleanup {
239		font delete xyz
	247	font delete xyz
240	248	} -result {xyz}
241	249	test font-6.3 {font command: create: name not really specified} -setup {
242	250	clearnondefaultfonts

278	286	font create xyz
279	287	font create xyz
280	288	} -cleanup {
281		font delete xyz
	289	font delete xyz
282	290	} -returnCodes error -result {named font "xyz" already exists}
283	291
284	292	test font-7.1 {font command: delete: arguments} -body {

287	295	} -returnCodes error -result {wrong # args: should be "font delete fontname ?fontname ...?"}
288	296	test font-7.2 {font command: delete: loop test} -setup {
289	297	clearnondefaultfonts
290		set x {}
	298	set x {}
291	299	} -body {
292	300	# for (i = 2; i < objc; i++)
293	301	font create a -underline 1

303	311	} -result {{a b c d e} d}
304	312	test font-7.3 {font command: delete: loop test} -setup {
305	313	clearnondefaultfonts
306		set x {}
	314	set x {}
307	315	} -body {
308	316	# (namedHashPtr == NULL) in middle of loop
309	317	font create a -underline 1

336	344	font actual xyz
337	345	font configure xyz
338	346	} -cleanup {
339		destroy .t.f
	347	destroy .t.f
340	348	} -returnCodes error -result {named font "xyz" doesn't exist}
341	349	test font-7.6 {font command: delete: mark for later deletion} -setup {
342	350	destroy .t.f

350	358	font delete xyz
351	359	font actual xyz
352	360	catch {font configure xyz}
353		.t.f cget -font
	361	.t.f cget -font
354	362	} -cleanup {
355	363	destroy .t.f
356	364	} -result xyz

376	384	# (objc - skip != 2) when skip == 2
377	385	font families -displayof . xyz
378	386	} -returnCodes error -result {wrong # args: should be "font families ?-displayof window?"}
379		test font-8.4 {font command: families} -body {
	387	test font-8.4 {font command: families} -constraints failsOnUbuntu -body {
380	388	# TkpGetFontFamilies()
381	389	regexp -nocase times [font families]
382	390	} -result 1

508	516	font create xyz
509	517	font configure xyz -family times
510	518	} -cleanup {
511		font delete xyz
	519	font delete xyz
512	520	} -result {}
513	521	test font-12.2 {UpdateDependantFonts procedure: pings the widgets} -setup {
514	522	destroy .t.f

527	535	set b2 [winfo reqwidth .t.f]
528	536	expr {$a1==$b1 && $a2==$b2}
529	537	} -cleanup {
530		destroy .t.f
	538	destroy .t.f
531	539	font delete xyz
532	540	} -result {1}
533	541
534	542
535	543	test font-13.1 {CreateNamedFont: new named font} -setup {
536	544	catch {font delete xyz}
537		set x {}
	545	set x {}
538	546	} -body {
539	547	# not (new == 0)
540	548	lappend x [getnondefaultfonts]
541	549	font create xyz
542	550	lappend x [getnondefaultfonts]
543	551	} -cleanup {
544		font delete xyz
	552	font delete xyz
545	553	} -result {{} xyz}
546	554	test font-13.2 {CreateNamedFont: named font already exists} -setup {
547	555	catch {font delete xyz}

550	558	font create xyz
551	559	font create xyz
552	560	} -cleanup {
553		font delete xyz
	561	font delete xyz
554	562	} -returnCodes error -result {named font "xyz" already exists}
555	563	test font-13.3 {CreateNamedFont: named font already exists} -setup {
556	564	catch {font delete xyz}

559	567	font create xyz
560	568	font create xyz
561	569	} -cleanup {
562		font delete xyz
	570	font delete xyz
563	571	} -returnCodes error -result {named font "xyz" already exists}
564	572	test font-13.4 {CreateNamedFont: recreate "deleted" font} -setup {
565	573	destroy .t.f

574	582	font create xyz -family courier
575	583	font configure xyz -family
576	584	} -cleanup {
577		font delete xyz
578		destroy .t.f
	585	font delete xyz
	586	destroy .t.f
579	587	} -result {courier}
580	588
581	589

584	592
585	593
586	594	test font-15.1 {Tk_AllocFontFromObj - converting internal reps} -constraints {
587		testfont
	595	testfont
588	596	} -setup {
589	597	destroy .b1 .b2
590	598	} -body {

597	605	destroy .b1 .b2
598	606	} -result {{1 0}}
599	607	test font-15.2 {Tk_AllocFontFromObj - discard stale font} -constraints {
600		testfont
	608	testfont
601	609	} -setup {
602	610	destroy .b1 .b2
603	611	set result {}

612	620	destroy .b2
613	621	} -result {{} {{1 1}}}
614	622	test font-15.3 {Tk_AllocFontFromObj - reuse existing font} -constraints {
615		testfont
	623	testfont
616	624	} -setup {
617	625	destroy .b1 .b2
618	626	set result {}

635	643	.t.f config -font {-family fixed}
636	644	lindex [font actual {-family fixed}] 0
637	645	} -cleanup {
638		destroy .t.f
	646	destroy .t.f
639	647	} -result {-family}
640	648	test font-15.5 {Tk_AllocFontFromObj procedure: get named font} -setup {
641	649	destroy .t.f

647	655	font create xyz
648	656	.t.f config -font xyz
649	657	} -cleanup {
650		destroy .t.f
	658	destroy .t.f
651	659	font delete xyz
652	660	} -result {}
653	661	test font-15.6 {Tk_AllocFontFromObj procedure: not a named font} -setup {

658	666	# not (namedHashPtr != NULL)
659	667	.t.f config -font {times 20}
660	668	} -cleanup {
661		destroy .t.f
	669	destroy .t.f
662	670	} -result {-family} -result {}
663	671	test font-15.7 {Tk_AllocFontFromObj procedure: get native font} -constraints {
664	672	unix

702	710	lindex [font actual {plan 9}] 0
703	711	} -result {-family}
704	712	test font-15.12 {Tk_AllocFontFromObj procedure: setup tab width} -setup {
705		destroy .l
	713	destroy .l
706	714	} -body {
707	715	# Tk_MeasureChars(fontPtr, "0", ...)
708	716	label .l -bd 0 -padx 0 -highlightthickness 0 -font $fixed -text "a\tb"

711	719	set res2 [expr [font measure $fixed "0"]*9]
712	720	expr {$res1 eq $res2}
713	721	} -cleanup {
714		destroy .l
	722	destroy .l
715	723	} -result 1
716	724	test font-15.13 {Tk_AllocFontFromObj procedure: underline position} -setup {
717	725	destroy .t.f

722	730	.t.f config -text "underline" -font "times -8 underline"
723	731	update
724	732	} -cleanup {
725		destroy .t.f
	733	destroy .t.f
726	734	} -result {}
727	735
728	736

734	742	.t.f config -font -family\ fixed
735	743	.t.f cget -font
736	744	} -cleanup {
737		destroy .t.f
	745	destroy .t.f
738	746	} -result {-family fixed}
739	747
740	748

920	928	}
921	929	} -result {LucidaBright}
922	930	test font-21.6 {Tk_PostscriptFontName procedure: spaces} -constraints {
923		x11
	931	x11 failsOnUbuntu
924	932	} -body {
925	933	psfontname "{new century schoolbook} 10"
926	934	} -result {NewCenturySchlbk-Roman}

1442	1450
1443	1451
1444	1452	test font-22.1 {Tk_TextWidth procedure} -setup {
1445		destroy .t.l
1446		} -body {
1447		label .t.l -padx 0 -pady 0 -bd 0 -highlightthickness 0 -justify left \
1448		-text "0" -font "Courier -12"
1449		pack .t.l
1450		set ax [winfo reqwidth .t.l]
	1453	destroy .t.l
	1454	} -body {
	1455	label .t.l -padx 0 -pady 0 -bd 0 -highlightthickness 0 -justify left \
	1456	-text "0" -font "Courier -12"
	1457	pack .t.l
	1458	set ax [winfo reqwidth .t.l]
1451	1459	expr {[font measure [.t.l cget -font] "000"] eq $ax*3}
1452	1460	} -cleanup {
1453		destroy .t.l
	1461	destroy .t.l
1454	1462	} -result 1
1455	1463
1456	1464
1457	1465	test font-23.1 {Tk_UnderlineChars procedure} -setup {
1458		destroy .t.t
	1466	destroy .t.t
1459	1467	} -body {
1460	1468	text .t.t
1461	1469	.t.t insert 1.0 abc\tdefg

1463	1471	.t.t tag add sel 1.0 end
1464	1472	update
1465	1473	} -cleanup {
1466		destroy .t.t
	1474	destroy .t.t
1467	1475	} -result {}
1468	1476
1469	1477

1480	1488	} -result {}
1481	1489	test font-24.2 {Tk_ComputeTextLayout: simple string} -body {
1482	1490	.t.l config -text "000"
1483		update
1484		list [expr {[winfo reqwidth .t.l] eq [expr {$ax * 3}]}] \
1485		[expr {[winfo reqheight .t.l] eq $ay}]
	1491	update
	1492	list [expr {[winfo reqwidth .t.l] eq [expr {$ax * 3}]}] \
	1493	[expr {[winfo reqheight .t.l] eq $ay}]
1486	1494	} -result {1 1}
1487	1495	test font-24.3 {Tk_ComputeTextLayout: find special chars} -body {
1488	1496	.t.l config -text "000\n000"
1489		update
1490		list [expr {[winfo reqwidth .t.l] eq [expr {$ax * 3}]}] \
1491		[expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
	1497	update
	1498	list [expr {[winfo reqwidth .t.l] eq [expr {$ax * 3}]}] \
	1499	[expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
1492	1500	} -result {1 1}
1493	1501	test font-24.4 {Tk_ComputeTextLayout: calls Tk_MeasureChars} -body {
1494	1502	.t.l config -text "000\n000"
1495		update
1496		list [expr {[winfo reqwidth .t.l] eq [expr {$ax * 3}]}] \
1497		[expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
	1503	update
	1504	list [expr {[winfo reqwidth .t.l] eq [expr {$ax * 3}]}] \
	1505	[expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
1498	1506	} -result {1 1}
1499	1507	test font-24.5 {Tk_ComputeTextLayout: break line} -body {
1500	1508	.t.l config -text "000\t00000" -wrap [expr 9 * $ax]
1501		update
1502		list [expr {[winfo reqwidth .t.l] eq [expr {$ax * 8}]}] \
1503		[expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
	1509	update
	1510	list [expr {[winfo reqwidth .t.l] eq [expr {$ax * 8}]}] \
	1511	[expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
1504	1512	} -cleanup {
1505	1513	.t.l config -wrap 0
1506	1514	} -result {1 1}

1509	1517	} -result {}
1510	1518	test font-24.7 {Tk_ComputeTextLayout: special char was \n} -body {
1511	1519	.t.l config -text "000\n0000"
1512		update
1513		list [expr {[winfo reqwidth .t.l] eq [expr {$ax * 4}]}] \
1514		[expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
	1520	update
	1521	list [expr {[winfo reqwidth .t.l] eq [expr {$ax * 4}]}] \
	1522	[expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
1515	1523	} -result {1 1}
1516	1524	test font-24.8 {Tk_ComputeTextLayout: special char was \t} -body {
1517	1525	.t.l config -text "000\t00"
1518		update
1519		list [expr {[winfo reqwidth .t.l] eq [expr {$ax * 10}]}] \
1520		[expr {[winfo reqheight .t.l] eq $ay}]
	1526	update
	1527	list [expr {[winfo reqwidth .t.l] eq [expr {$ax * 10}]}] \
	1528	[expr {[winfo reqheight .t.l] eq $ay}]
1521	1529	} -result {1 1}
1522	1530	test font-24.9 {Tk_ComputeTextLayout: tab didn't cause break} -body {
1523	1531	set x {}
1524	1532	.t.l config -text "000\t000"
1525		update
	1533	update
1526	1534	lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 11}]}]
1527		lappend x [expr {[winfo reqheight .t.l] eq $ay}]
	1535	lappend x [expr {[winfo reqheight .t.l] eq $ay}]
1528	1536	.t.l config -text "000\t000" -wrap [expr 100 * $ax]
1529		update
	1537	update
1530	1538	lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 11}]}]
1531		lappend x [expr {[winfo reqheight .t.l] eq $ay}]
	1539	lappend x [expr {[winfo reqheight .t.l] eq $ay}]
1532	1540	return $x
1533	1541	} -cleanup {
1534	1542	.t.l config -wrap 0

1536	1544	test font-24.10 {Tk_ComputeTextLayout: tab caused break} -body {
1537	1545	set x {}
1538	1546	.t.l config -text "000\t"
1539		update
	1547	update
1540	1548	lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 8}]}]
1541		lappend x [expr {[winfo reqheight .t.l] eq $ay}]
	1549	lappend x [expr {[winfo reqheight .t.l] eq $ay}]
1542	1550	.t.l config -text "000\t00" -wrap [expr $ax * 6]
1543		update
1544		lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 8}]}]
1545		lappend x [expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
	1551	update
	1552	lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 8}]}]
	1553	lappend x [expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
1546	1554	return $x
1547	1555	} -cleanup {
1548	1556	.t.l config -wrap 0

1550	1558	test font-24.11 {Tk_ComputeTextLayout: absorb spaces at eol} -body {
1551	1559	set x {}
1552	1560	.t.l config -text "000 000" -wrap [expr {$ax * 5}]
1553		update
1554		lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 3}]}]
1555		lappend x [expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
	1561	update
	1562	lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 3}]}]
	1563	lappend x [expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
1556	1564	.t.l config -text "000 "
1557		update
1558		lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 3}]}]
1559		lappend x [expr {[winfo reqheight .t.l] eq $ay}]
	1565	update
	1566	lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 3}]}]
	1567	lappend x [expr {[winfo reqheight .t.l] eq $ay}]
1560	1568	return $x
1561	1569	} -cleanup {
1562	1570	.t.l config -wrap 0

1564	1572	test font-24.12 {Tk_ComputeTextLayout: append non-printing spaces to chunk} -body {
1565	1573	set x {}
1566	1574	.t.l config -text "000 0000" -wrap [expr {$ax * 5}]
1567		update
1568		lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 4}]}]
1569		lappend x [expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
	1575	update
	1576	lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 4}]}]
	1577	lappend x [expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
1570	1578	.t.l config -text "000\t00 0000" -wrap [expr {$ax * 12}]
1571		update
1572		lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 10}]}]
1573		lappend x [expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
	1579	update
	1580	lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 10}]}]
	1581	lappend x [expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
1574	1582	return $x
1575	1583	} -cleanup {
1576	1584	.t.l config -wrap 0
1577	1585	} -result {1 1 1 1}
1578	1586	test font-24.13 {Tk_ComputeTextLayout: many lines -> realloc line array} -body {
1579	1587	.t.l config -text "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
1580		update
1581		list [expr {[winfo reqwidth .t.l] eq 1}] \
1582		[expr {[winfo reqheight .t.l] eq [expr {$ay * 129}]}]
	1588	update
	1589	list [expr {[winfo reqwidth .t.l] eq 1}] \
	1590	[expr {[winfo reqheight .t.l] eq [expr {$ay * 129}]}]
1583	1591	} -result {1 1}
1584	1592	test font-24.14 {Tk_ComputeTextLayout: text ended with \n} -body {
1585	1593	set x {}
1586		.t.l config -text "0000"
1587		update
1588		lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 4}]}]
1589		lappend x [expr {[winfo reqheight .t.l] eq $ay}]
1590		.t.l config -text "0000\n"
1591		update
1592		lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 4}]}]
1593		lappend x [expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
1594		return $x
	1594	.t.l config -text "0000"
	1595	update
	1596	lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 4}]}]
	1597	lappend x [expr {[winfo reqheight .t.l] eq $ay}]
	1598	.t.l config -text "0000\n"
	1599	update
	1600	lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 4}]}]
	1601	lappend x [expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
	1602	set x
1595	1603	} -result {1 1 1 1}
1596	1604	destroy .t.l
1597	1605
1598	1606	test font-24.15 {Tk_ComputeTextLayout: justification} -setup {
1599	1607	set x {}
1600		destroy .t.c
1601		canvas .t.c -closeenough 0
1602		.t.c create text 0 0 -tags text -anchor nw -just left -font "Courier -12"
1603		pack .t.c
1604		update
	1608	destroy .t.c
	1609	canvas .t.c -closeenough 0
	1610	.t.c create text 0 0 -tags text -anchor nw -just left -font "Courier -12"
	1611	pack .t.c
	1612	update
1605	1613	} -body {
1606	1614	csetup "000\n00000"
1607	1615	.t.c itemconfig text -just left

1613	1621	.t.c itemconfig text -just left
1614	1622	return $x
1615	1623	} -cleanup {
1616		destroy .t.c
	1624	destroy .t.c
1617	1625	} -result {2 1 0}
1618	1626
1619	1627

1625	1633	.t.f config -text foo
1626	1634	.t.f config -text boo
1627	1635	} -cleanup {
1628		destroy .t.f
	1636	destroy .t.f
1629	1637	} -result {}
1630	1638
1631	1639

1642	1650	} -body {
1643	1651	.t.f config -text foo
1644	1652	} -cleanup {
1645		destroy .t.f
	1653	destroy .t.f
1646	1654	} -result {}
1647	1655	test font-26.2 {Tk_DrawTextLayout procedure: multiple chunks} -body {
1648	1656	csetup "000\t00\n000"

1787	1795	update
1788	1796	test font-30.1 {Tk_DistanceToTextLayout procedure: loop once} -body {
1789	1797	csetup "000\n000\n000"
1790		.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
	1798	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
1791	1799	set x {}
1792	1800	event generate .t.c <Leave>
1793	1801	event generate .t.c <Enter> -x 0 -y 0
1794	1802	return $x
1795	1803	} -cleanup {
1796		bind all <Enter> {}
	1804	bind all <Enter> {}
1797	1805	} -result {0}
1798	1806	test font-30.2 {Tk_DistanceToTextLayout procedure: loop multiple} -body {
1799	1807	csetup "000\n000\n000"
1800		.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
	1808	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
1801	1809	set x {}
1802	1810	event generate .t.c <Leave>
1803	1811	event generate .t.c <Enter> -x $ax -y $ay
1804	1812	return $x
1805	1813	} -cleanup {
1806		bind all <Enter> {}
	1814	bind all <Enter> {}
1807	1815	} -result {5}
1808	1816	test font-30.3 {Tk_DistanceToTextLayout procedure: loop to end} -body {
1809	1817	csetup "000\n0\n000"
1810		.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
	1818	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
1811	1819	set x {}
1812	1820	event generate .t.c <Leave>
1813	1821	event generate .t.c <Enter> -x [expr $ax*2] -y $ay
1814	1822	return $x
1815	1823	} -cleanup {
1816		bind all <Enter> {}
	1824	bind all <Enter> {}
1817	1825	} -result {}
1818	1826	test font-30.4 {Tk_DistanceToTextLayout procedure: hit a special char (tab)} -body {
1819	1827	csetup "000\t000\n000"
1820		.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
	1828	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
1821	1829	set x {}
1822	1830	event generate .t.c <Leave>
1823	1831	event generate .t.c <Enter> -x [expr $ax*6] -y 0
1824	1832	return $x
1825	1833	} -cleanup {
1826		bind all <Enter> {}
	1834	bind all <Enter> {}
1827	1835	} -result {3}
1828	1836	test font-30.5 {Tk_DistanceToTextLayout procedure: ignore newline} -body {
1829	1837	csetup "000\n0\n000"
1830		.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
	1838	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
1831	1839	set x {}
1832	1840	event generate .t.c <Leave>
1833	1841	event generate .t.c <Enter> -x [expr $ax*2] -y $ay
1834	1842	return $x
1835	1843	} -cleanup {
1836		bind all <Enter> {}
	1844	bind all <Enter> {}
1837	1845	} -result {}
1838	1846	test font-30.6 {Tk_DistanceToTextLayout procedure: ignore spaces at eol} -body {
1839	1847	csetup "000\n000 000000000"
1840	1848	.t.c itemconfig text -width [expr $ax*10]
1841		.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
	1849	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
1842	1850	set x {}
1843	1851	event generate .t.c <Leave>
1844	1852	event generate .t.c <Enter> -x [expr $ax*5] -y $ay
1845	1853	.t.c itemconfig text -width 0
1846	1854	return $x
1847	1855	} -cleanup {
1848		bind all <Enter> {}
	1856	bind all <Enter> {}
1849	1857	} -result {}
1850	1858	.t.c itemconfig text -justify center
1851	1859	test font-30.7 {Tk_DistanceToTextLayout procedure: on left side} -body {
1852	1860	csetup "0\n000"
1853		.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
	1861	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
1854	1862	set x {}
1855	1863	event generate .t.c <Leave>
1856	1864	event generate .t.c <Enter> -x 0 -y 0
1857	1865	return $x
1858	1866	} -cleanup {
1859		bind all <Enter> {}
	1867	bind all <Enter> {}
1860	1868	} -result {}
1861	1869	test font-30.8 {Tk_DistanceToTextLayout procedure: on right side} -body {
1862	1870	csetup "0\n000"
1863		.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
	1871	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
1864	1872	set x {}
1865	1873	event generate .t.c <Leave>
1866	1874	event generate .t.c <Enter> -x [expr $ax*2] -y 0
1867	1875	return $x
1868	1876	} -cleanup {
1869		bind all <Enter> {}
	1877	bind all <Enter> {}
1870	1878	} -result {}
1871	1879	test font-30.9 {Tk_DistanceToTextLayout procedure: inside line} -body {
1872	1880	csetup "0\n000"
1873		.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
	1881	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
1874	1882	set x {}
1875	1883	event generate .t.c <Leave>
1876	1884	event generate .t.c <Enter> -x $ax -y 0
1877	1885	return $x
1878	1886	} -cleanup {
1879		bind all <Enter> {}
	1887	bind all <Enter> {}
1880	1888	} -result {0}
1881	1889	test font-30.10 {Tk_DistanceToTextLayout procedure: above line} -body {
1882	1890	csetup "0\n000"
1883		.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
	1891	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
1884	1892	set x {}
1885	1893	event generate .t.c <Leave>
1886	1894	event generate .t.c <Enter> -x 0 -y 0
1887	1895	return $x
1888	1896	} -cleanup {
1889		bind all <Enter> {}
	1897	bind all <Enter> {}
1890	1898	} -result {}
1891	1899	test font-30.11 {Tk_DistanceToTextLayout procedure: below line} -body {
1892	1900	csetup "000\n0"
1893		.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
	1901	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
1894	1902	set x {}
1895	1903	event generate .t.c <Leave>
1896	1904	event generate .t.c <Enter> -x 0 -y $ay

1900	1908	} -result {}
1901	1909	test font-30.12 {Tk_DistanceToTextLayout procedure: in line} -body {
1902	1910	csetup "0\n000"
1903		.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
	1911	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
1904	1912	set x {}
1905	1913	event generate .t.c <Leave>
1906	1914	event generate .t.c <Enter> -x $ax -y $ay

1911	1919	.t.c itemconfig text -justify left
1912	1920	test font-30.13 {Tk_DistanceToTextLayout procedure: exact hit} -body {
1913	1921	csetup "000"
1914		.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
	1922	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
1915	1923	set x {}
1916	1924	event generate .t.c <Leave>
1917	1925	event generate .t.c <Enter> -x $ax -y 0
1918	1926	return $x
1919	1927	} -cleanup {
1920		bind all <Enter> {}
	1928	bind all <Enter> {}
1921	1929	} -result {1}
1922	1930	destroy .t.c
1923	1931

1969	1977
1970	1978
1971	1979	test font-32.1 {Tk_TextLayoutToPostscript: ensure buffer doesn't overflow} -setup {
1972		destroy .t.c
1973		canvas .t.c -closeenough 0
1974		.t.c create text 0 0 -tags text -anchor nw -just left -font "Courier -12"
1975		pack .t.c
1976		update
	1980	destroy .t.c
	1981	canvas .t.c -closeenough 0
	1982	.t.c create text 0 0 -tags text -anchor nw -just left -font "Courier -12"
	1983	pack .t.c
	1984	update
1977	1985	} -body {
1978	1986	# If there were a whole bunch of returns or tabs in a row, then the
1979	1987	# temporary buffer could overflow and write on the stack.

1986	1994	set i [string first "(qwerty" $x]
1987	1995	string range $x $i [expr {$i + 278}]
1988	1996	} -cleanup {
1989		destroy .t.c
	1997	destroy .t.c
1990	1998	} -result {(qwertyuiopasdfghjklzxcvbnm1234qwertyuiopasdfghjklzxcvbnm)]
1991	1999	[(qwertyuiopasdfghjklzxcvbnm1234qwertyuiopasdfghjklzxcvbnm)]
1992	2000	[()]

2044	2052
2045	2053	test font-34.3 {ConfigAttributesObj procedure: family} -setup {
2046	2054	catch {font delete xyz}
2047		set x {}
2048		} -body {
2049		font create xyz -family xyz
2050		lappend x [font config xyz -family]
2051		font config xyz -family times
2052		lappend x [font config xyz -family]
	2055	set x {}
	2056	} -body {
	2057	font create xyz -family xyz
	2058	lappend x [font config xyz -family]
	2059	font config xyz -family times
	2060	lappend x [font config xyz -family]
2053	2061	} -cleanup {
2054	2062	font delete xyz
2055	2063	} -result {xyz times}
2056	2064	test font-34.4 {ConfigAttributesObj procedure: size} -setup {
2057	2065	catch {font delete xyz}
2058		set x {}
2059		} -body {
2060		font create xyz -size 20
2061		lappend x [font config xyz -size]
2062		font config xyz -size 40
2063		lappend x [font config xyz -size]
2064		} -cleanup {
2065		font delete xyz
	2066	set x {}
	2067	} -body {
	2068	font create xyz -size 20
	2069	lappend x [font config xyz -size]
	2070	font config xyz -size 40
	2071	lappend x [font config xyz -size]
	2072	} -cleanup {
	2073	font delete xyz
2066	2074	} -result {20 40}
2067	2075	test font-34.5 {ConfigAttributesObj procedure: weight} -setup {
2068	2076	catch {font delete xyz}
2069		set x {}
2070		} -body {
2071		font create xyz -weight normal
2072		lappend x [font config xyz -weight]
2073		font config xyz -weight bold
2074		lappend x [font config xyz -weight]
2075		} -cleanup {
2076		font delete xyz
	2077	set x {}
	2078	} -body {
	2079	font create xyz -weight normal
	2080	lappend x [font config xyz -weight]
	2081	font config xyz -weight bold
	2082	lappend x [font config xyz -weight]
	2083	} -cleanup {
	2084	font delete xyz
2077	2085	} -result {normal bold}
2078	2086	test font-34.6 {ConfigAttributesObj procedure: slant} -setup {
2079	2087	catch {font delete xyz}
2080		set x {}
2081		} -body {
2082		font create xyz -slant roman
2083		lappend x [font config xyz -slant]
2084		font config xyz -slant italic
2085		lappend x [font config xyz -slant]
2086		} -cleanup {
2087		font delete xyz
	2088	set x {}
	2089	} -body {
	2090	font create xyz -slant roman
	2091	lappend x [font config xyz -slant]
	2092	font config xyz -slant italic
	2093	lappend x [font config xyz -slant]
	2094	} -cleanup {
	2095	font delete xyz
2088	2096	} -result {roman italic}
2089	2097	test font-34.7 {ConfigAttributesObj procedure: underline} -setup {
2090	2098	catch {font delete xyz}
2091		set x {}
2092		} -body {
2093		font create xyz -underline 0
2094		lappend x [font config xyz -underline]
2095		font config xyz -underline 1
2096		lappend x [font config xyz -underline]
2097		} -cleanup {
2098		font delete xyz
	2099	set x {}
	2100	} -body {
	2101	font create xyz -underline 0
	2102	lappend x [font config xyz -underline]
	2103	font config xyz -underline 1
	2104	lappend x [font config xyz -underline]
	2105	} -cleanup {
	2106	font delete xyz
2099	2107	} -result {0 1}
2100	2108	test font-34.8 {ConfigAttributesObj procedure: overstrike} -setup {
2101	2109	catch {font delete xyz}
2102		set x {}
2103		} -body {
2104		font create xyz -overstrike 0
2105		lappend x [font config xyz -overstrike]
2106		font config xyz -overstrike 1
2107		lappend x [font config xyz -overstrike]
2108		} -cleanup {
2109		font delete xyz
	2110	set x {}
	2111	} -body {
	2112	font create xyz -overstrike 0
	2113	lappend x [font config xyz -overstrike]
	2114	font config xyz -overstrike 1
	2115	lappend x [font config xyz -overstrike]
	2116	} -cleanup {
	2117	font delete xyz
2110	2118	} -result {0 1}
2111	2119
2112	2120	test font-34.9 {ConfigAttributesObj procedure: size} -body {
2113		font create xyz -size xyz
	2121	font create xyz -size xyz
2114	2122	} -returnCodes error -result {expected integer but got "xyz"}
2115	2123	test font-34.10 {ConfigAttributesObj procedure: weight} -body {
2116		font create xyz -weight xyz
	2124	font create xyz -weight xyz
2117	2125	} -returnCodes error -result {bad -weight value "xyz": must be normal, or bold}
2118	2126	test font-34.11 {ConfigAttributesObj procedure: slant} -body {
2119		font create xyz -slant xyz
	2127	font create xyz -slant xyz
2120	2128	} -returnCodes error -result {bad -slant value "xyz": must be roman, or italic}
2121	2129	test font-34.12 {ConfigAttributesObj procedure: underline} -body {
2122		font create xyz -underline xyz
	2130	font create xyz -underline xyz
2123	2131	} -returnCodes error -result {expected boolean value but got "xyz"}
2124	2132	test font-34.13 {ConfigAttributesObj procedure: overstrike} -body {
2125		font create xyz -overstrike xyz
	2133	font create xyz -overstrike xyz
2126	2134	} -returnCodes error -result {expected boolean value but got "xyz"}
2127	2135
2128	2136

2133	2141	font create xyz -family xyz
2134	2142	font config xyz -family
2135	2143	} -cleanup {
2136		font delete xyz
	2144	font delete xyz
2137	2145	} -result {xyz}
2138	2146
2139	2147

2144	2152	font create xyz
2145	2153	font config xyz -xyz
2146	2154	} -cleanup {
2147		font delete xyz
	2155	font delete xyz
2148	2156	} -returnCodes {
2149	2157	error
2150	2158	} -result {bad option "-xyz": must be -family, -size, -weight, -slant, -underline, or -overstrike}

2157	2165	font create xyz -family xyz
2158	2166	font config xyz
2159	2167	} -cleanup {
2160		font delete xyz
	2168	font delete xyz
2161	2169	} -result {-family xyz -size 0 -weight normal -slant roman -underline 0 -overstrike 0}
2162	2170	test font-37.2 {GetAttributeInfo procedure: family} -setup {
2163	2171	catch {font delete xyz}
2164	2172	} -body {
2165		font create xyz -family xyz
2166		font config xyz -family
2167		} -cleanup {
2168		font delete xyz
	2173	font create xyz -family xyz
	2174	font config xyz -family
	2175	} -cleanup {
	2176	font delete xyz
2169	2177	} -result {xyz}
2170	2178	test font-37.3 {GetAttributeInfo procedure: size} -setup {
2171	2179	catch {font delete xyz}
2172		set x {}
2173		} -body {
2174		font create xyz -size 20
2175		font config xyz -size
2176		} -cleanup {
2177		font delete xyz
	2180	set x {}
	2181	} -body {
	2182	font create xyz -size 20
	2183	font config xyz -size
	2184	} -cleanup {
	2185	font delete xyz
2178	2186	} -result {20}
2179	2187	test font-37.4 {GetAttributeInfo procedure: weight} -setup {
2180	2188	catch {font delete xyz}
2181		set x {}
2182		} -body {
2183		font create xyz -weight normal
2184		font config xyz -weight
2185		} -cleanup {
2186		font delete xyz
	2189	set x {}
	2190	} -body {
	2191	font create xyz -weight normal
	2192	font config xyz -weight
	2193	} -cleanup {
	2194	font delete xyz
2187	2195	} -result {normal}
2188	2196	test font-37.5 {GetAttributeInfo procedure: slant} -setup {
2189	2197	catch {font delete xyz}
2190		set x {}
2191		} -body {
2192		font create xyz -slant italic
2193		font config xyz -slant
2194		} -cleanup {
2195		font delete xyz
	2198	set x {}
	2199	} -body {
	2200	font create xyz -slant italic
	2201	font config xyz -slant
	2202	} -cleanup {
	2203	font delete xyz
2196	2204	} -result {italic}
2197	2205	test font-37.6 {GetAttributeInfo procedure: underline} -setup {
2198	2206	catch {font delete xyz}
2199		set x {}
2200		} -body {
2201		font create xyz -underline yes
2202		font config xyz -underline
2203		} -cleanup {
2204		font delete xyz
	2207	set x {}
	2208	} -body {
	2209	font create xyz -underline yes
	2210	font config xyz -underline
	2211	} -cleanup {
	2212	font delete xyz
2205	2213	} -result {1}
2206	2214	test font-37.7 {GetAttributeInfo procedure: overstrike} -setup {
2207	2215	catch {font delete xyz}
2208		set x {}
2209		} -body {
2210		font create xyz -overstrike no
2211		font config xyz -overstrike
2212		} -cleanup {
2213		font delete xyz
	2216	set x {}
	2217	} -body {
	2218	font create xyz -overstrike no
	2219	font config xyz -overstrike
	2220	} -cleanup {
	2221	font delete xyz
2214	2222	} -result {0}
2215	2223
2216	2224

2249	2257	font actual {times xyz xyz}
2250	2258	} -returnCodes error -result {expected integer but got "xyz"}
2251	2259	test font-38.11 {ParseFontNameObj procedure: stylelist loop} -constraints {
2252		unixOrPc
	2260	unixOrWin failsOnUbuntuNoXft
2253	2261	} -body {
2254	2262	lrange [font actual {times 12 bold italic overstrike underline}] 4 end
2255	2263	} -result {-weight bold -slant italic -underline 1 -overstrike 1}

2331	2339	} -result [font actual {times 0} -family]
2332	2340
2333	2341
2334		test font-44.1 {TkFontGetPixels: size < 0} -setup {
2335		set oldscale [tk scaling]
2336		} -body {
2337		tk scaling 0.5
	2342	test font-44.1 {TkFontGetPixels: size < 0} -constraints failsOnUbuntu -setup {
	2343	set oldscale [tk scaling]
	2344	} -body {
	2345	tk scaling 0.5
2338	2346	font actual {times -12} -size
2339	2347	} -cleanup {
2340		tk scaling $oldscale
	2348	tk scaling $oldscale
2341	2349	} -result {24}
2342		test font-44.2 {TkFontGetPoints: size >= 0} -constraints noExceed -setup {
2343		set oldscale [tk scaling]
2344		} -body {
2345		tk scaling 0.5
	2350	test font-44.2 {TkFontGetPoints: size >= 0} -constraints {noExceed failsOnUbuntuNoXft} -setup {
	2351	set oldscale [tk scaling]
	2352	} -body {
	2353	tk scaling 0.5
2346	2354	font actual {times 12} -size
2347	2355	} -cleanup {
2348		tk scaling $oldscale
	2356	tk scaling $oldscale
2349	2357	} -result {12}
2350	2358
2351	2359

2355	2363	test font-45.2 {TkFontGetAliasList: match} -constraints win -body {
2356	2364	font actual {times 10} -family
2357	2365	} -result {Times New Roman}
2358		test font-45.3 {TkFontGetAliasList: match} -constraints {noExceed} -body {
	2366	test font-45.3 {TkFontGetAliasList: match} -constraints {noExceed failsOnUbuntu} -body {
2359	2367	if {[font actual {{times new roman} 10} -family] eq "Times New Roman"} {
2360	2368	# avoid test failure on systems that have a real "times new roman" font
2361	2369	set res 1

2367	2375
2368	2376
2369	2377	test font-46.1 {font actual, with character, no option, no --} -body {
2370		font actual {times 10} a
	2378	font actual {times 10} a
2371	2379	} -match glob -result [list -family [font actual {times 10} -family] -size *\
2372	2380	-slant roman -underline 0 -overstrike 0]
2373	2381
2374	2382	test font-46.2 {font actual, with character introduced by --} -body {
2375		font actual {times 10} -- -
	2383	font actual {times 10} -- -
2376	2384	} -match glob -result [list -family [font actual {times 10} -family] -size *\
2377	2385	-slant roman -underline 0 -overstrike 0]
2378	2386

+12

-3

tests/fontchooser.test less more

1	1	#
2	2	# Copyright (c) 2008 Pat Thoyts
3	3
4		package require tcltest 2.1
	4	package require tcltest 2.2
5	5	eval tcltest::configure $argv
6	6	tcltest::loadTestedCommands
7	7
	8	testConstraint failsOnUbuntu [expr {![info exists ::env(CI)] \|\| ![string match Linux $::tcl_platform(os)]}]
	9	testConstraint failsOnUbuntuNoXft [expr {[testConstraint failsOnUbuntu] \|\| (![catch {tk::pkgconfig get fontsystem} fs] && ($fs eq "xft"))}]
	10
8	11	# the following helper functions are related to the functions used
9	12	# in winDialog.test where they are used to send messages to the win32
10		# dialog (hence the wierdness).
	13	# dialog (hence the weirdness).
11	14
12	15	proc start {cmd} {
13	16	set ::tk_dialog {}

178	181	expr {$::testfont ne {}}
179	182	} -result {1}
180	183
181		test fontchooser-4.4 {fontchooser -font} -constraints scriptImpl -body {
	184	test fontchooser-4.4 {fontchooser -font} -constraints {scriptImpl failsOnUbuntuNoXft} -body {
182	185	start {
183	186	tk::fontchooser::Configure -command ApplyFont -font {times 14 bold}
184	187	tk::fontchooser::Show

188	191	}
189	192	lrange $::testfont 1 end
190	193	} -result {14 bold}
	194
	195	test fontchooser-5.1 {fontchooser multiple configure} -constraints {scriptImpl} -body {
	196	tk fontchooser configure -title TestTitle -command foo
	197	tk fontchooser configure -command bar
	198	tk fontchooser configure -title
	199	} -result {TestTitle}
191	200
192	201	# -------------------------------------------------------------------------
193	202

+22

-5

tests/frame.test less more

672	672	} -body {
673	673	toplevel .t -container 1 -width 300 -height 120
674	674	wm geometry .t +0+0
	675	if {[tk windowingsystem] eq "aqua"} {
	676	update idletasks
	677	} else {
	678	update
	679	}
675	680	option add *x.use [winfo id .t]
676		update
677	681	toplevel .x -width 140 -height 300 -bg green
678		tkwait visibility .x
679		update
	682	if {[tk windowingsystem] eq "aqua"} {
	683	update idletasks
	684	} else {
	685	tkwait visibility .x
	686	update
	687	}
680	688	list [expr {[winfo rootx .x] - [winfo rootx .t]}] \
681	689	[expr {[winfo rooty .x] - [winfo rooty .t]}] \
682	690	[winfo width .t] [winfo height .t]

1153	1161	} -result {1 1 1 1 1 1 1 1 1 1 1 1}
1154	1162	test frame-12.3 {FrameWorldChanged procedure} -setup {
1155	1163	deleteWindows
	1164	update idletasks
1156	1165	} -body {
1157	1166	# Check reaction on font change
1158	1167	font create myfont -family courier -size 10
1159	1168	labelframe .f -font myfont -text Mupp
1160	1169	place .f -x 0 -y 0 -width 40 -height 40
1161	1170	pack [frame .f.f] -fill both -expand 1
1162		update
	1171	if {[tk windowingsystem] eq "aqua"} {
	1172	update idletasks
	1173	} else {
	1174	update
	1175	}
1163	1176	set h1 [font metrics myfont -linespace]
1164	1177	set y1 [winfo y .f.f]
1165	1178	font configure myfont -size 20
1166		update
	1179	if {[tk windowingsystem] eq "aqua"} {
	1180	update idletasks
	1181	} else {
	1182	update
	1183	}
1167	1184	set h2 [font metrics myfont -linespace]
1168	1185	set y2 [winfo y .f.f]
1169	1186	expr {($h2 - $h1) - ($y2 - $y1)}

+1

-1

tests/geometry.test less more

269	269	wm geometry .t +0+0
270	270	tkwait visibility .t
271	271	update
272		pack [frame .t.f]
	272	pack [frame .t.f]
273	273	button .t.quit -text Quit -command exit
274	274	pack .t.quit -in .t.f
275	275	wm iconify .t

+43

-43

tests/grid.test less more

44	44	} -returnCodes error -result {wrong # args: should be "grid option arg ?arg ...?"}
45	45	test grid-1.2 {basic argument checking} -body {
46	46	grid foo bar
47		} -returnCodes error -result {bad option "foo": must be anchor, bbox, columnconfigure, configure, forget, info, location, propagate, remove, rowconfigure, size, or slaves}
	47	} -returnCodes error -result {bad option "foo": must be anchor, bbox, columnconfigure, configure, content, forget, info, location, propagate, remove, rowconfigure, size, or slaves}
48	48	test grid-1.3 {basic argument checking} -body {
49	49	button .b
50	50	grid .b -row 0 -column

144	144	test grid-3.2 {configure: basic argument checking} -body {
145	145	button .b
146	146	grid configure .b
147		grid slaves .
	147	grid content .
148	148	} -cleanup {
149	149	grid_reset 3.2
150	150	} -result {.b}

182	182	test grid-3.8 {configure: basic argument checking} -body {
183	183	button .b
184	184	grid configure x .b
185		grid slaves .
	185	grid content .
186	186	} -cleanup {
187	187	grid_reset 3.8
188	188	} -result {.b}

192	192	} -cleanup {
193	193	grid_reset 3.9
194	194	} -returnCodes error -result {invalid window shortcut, "y" should be '-', 'x', or '^'}
195		test grid-3.10 {ConfigureSlave procedure, bad -in option} -body {
	195	test grid-3.10 {ConfigureContent procedure, bad -in option} -body {
196	196	frame .f
197	197	grid .f -in .f
198	198	} -cleanup {

223	223	test grid-4.2 {forget} -body {
224	224	button .c
225	225	grid [button .b]
226		set a [grid slaves .]
	226	set a [grid content .]
227	227	grid forget .b .c
228		lappend a [grid slaves .]
	228	lappend a [grid content .]
229	229	return $a
230	230	} -cleanup {
231	231	grid_reset 4.2

515	515	grid_reset 8.6
516	516	} -result {{51 11} {51 11} {31 11} {21 11} {16 1} {1 1}}
517	517
518		test grid-9.1 {slaves} -body {
519		grid slaves .
	518	test grid-9.1 {content} -body {
	519	grid content .
520	520	} -returnCodes ok -result {}
521		test grid-9.2 {slaves} -body {
522		grid slaves .foo
	521	test grid-9.2 {content} -body {
	522	grid content .foo
523	523	} -returnCodes error -result {bad window path name ".foo"}
524		test grid-9.3 {slaves} -body {
525		grid slaves a b
526		} -returnCodes error -result {wrong # args: should be "grid slaves window ?-option value ...?"}
527		test grid-9.4 {slaves} -body {
528		grid slaves . a b
	524	test grid-9.3 {content} -body {
	525	grid content a b
	526	} -returnCodes error -result {wrong # args: should be "grid content window ?-option value ...?"}
	527	test grid-9.4 {content} -body {
	528	grid content . a b
529	529	} -returnCodes error -result {bad option "a": must be -column or -row}
530		test grid-9.5 {slaves} -body {
531		grid slaves . -column x
	530	test grid-9.5 {content} -body {
	531	grid content . -column x
532	532	} -returnCodes error -result {expected integer but got "x"}
533		test grid-9.6 {slaves} -body {
534		grid slaves . -row -3
	533	test grid-9.6 {content} -body {
	534	grid content . -row -3
535	535	} -returnCodes error -result {-3 is an invalid value: should NOT be < 0}
536		test grid-9.7 {slaves} -body {
537		grid slaves . -foo 3
	536	test grid-9.7 {content} -body {
	537	grid content . -foo 3
538	538	} -returnCodes error -result {bad option "-foo": must be -column or -row}
539		test grid-9.8 {slaves} -body {
540		grid slaves .x -row 3
	539	test grid-9.8 {content} -body {
	540	grid content .x -row 3
541	541	} -returnCodes error -result {bad window path name ".x"}
542		test grid-9.9 {slaves} -body {
543		grid slaves . -row 3
	542	test grid-9.9 {content} -body {
	543	grid content . -row 3
544	544	} -returnCodes ok -result {}
545		test grid-9.10 {slaves} -body {
	545	test grid-9.10 {content} -body {
546	546	foreach i {0 1 2} {
547	547	label .$i -text $i
548	548	grid .$i -row $i -column $i
549	549	}
550		grid slaves .
	550	grid content .
551	551	} -cleanup {
552	552	grid_reset 9.10
553	553	} -result {.2 .1 .0}
554		test grid-9.11 {slaves} -body {
	554	test grid-9.11 {content} -body {
555	555	catch {unset a}
556	556	foreach i {0 1 2} {
557	557	label .$i -text $i

560	560	grid .$i-x -row $i -column [incr i]
561	561	}
562	562	foreach row {0 1 2 3} {
563		lappend a $row{[grid slaves . -row $row]}
	563	lappend a $row{[grid content . -row $row]}
564	564	}
565	565	foreach col {0 1 2 3} {
566		lappend a $col{[grid slaves . -column $col]}
	566	lappend a $col{[grid content . -column $col]}
567	567	}
568	568	return $a
569	569	} -cleanup {

1304	1304	grid .b -in .1
1305	1305	set a ""
1306	1306	catch {unset info}; array set info [grid info .b]
1307		lappend a [grid slaves .1],[grid slaves .2],$info(-in)
	1307	lappend a [grid content .1],[grid content .2],$info(-in)
1308	1308	grid .b -in .2
1309	1309	catch {unset info}; array set info [grid info .b]
1310		lappend a [grid slaves .1],[grid slaves .2],$info(-in)
	1310	lappend a [grid content .1],[grid content .2],$info(-in)
1311	1311	unset info
1312	1312	return $a
1313	1313	} -cleanup {

1368	1368	grid_reset 14.3
1369	1369	} -result {.2 2 .0 1 . 2 .1 1}
1370	1370
1371		test grid-15.1 {lost slave} -body {
	1371	test grid-15.1 {lost content} -body {
1372	1372	button .b
1373	1373	grid .b
1374		set a [grid slaves .]
	1374	set a [grid content .]
1375	1375	pack .b
1376		lappend a [grid slaves .]
	1376	lappend a [grid content .]
1377	1377	grid .b
1378		lappend a [grid slaves .]
	1378	lappend a [grid content .]
1379	1379	} -cleanup {
1380	1380	grid_reset 15.1
1381	1381	} -result {.b {} .b}
1382		test grid-15.2 {lost slave} -body {
	1382	test grid-15.2 {lost content} -body {
1383	1383	frame .f
1384	1384	grid .f
1385	1385	button .b
1386	1386	grid .b -in .f
1387		set a [grid slaves .f]
	1387	set a [grid content .f]
1388	1388	pack .b -in .f
1389		lappend a [grid slaves .f]
	1389	lappend a [grid content .f]
1390	1390	grid .b -in .f
1391		lappend a [grid slaves .f]
	1391	lappend a [grid content .f]
1392	1392	} -cleanup {
1393	1393	grid_reset 15.2
1394	1394	} -result {.b {} .b}

1974	1974	test grid-22.2 {remove} {
1975	1975	button .c
1976	1976	grid [button .b]
1977		set a [grid slaves .]
	1977	set a [grid content .]
1978	1978	grid remove .b .c
1979		lappend a [grid slaves .]
	1979	lappend a [grid content .]
1980	1980	return $a
1981	1981	} {.b {}}
1982	1982	grid_reset 22.2

2023	2023	} {-in . -column 0 -row 0 -columnspan 2 -rowspan 2 -ipadx 0 -ipady 0 -padx {3 5} -pady {4 7} -sticky ns}
2024	2024	grid_reset 22.5
2025	2025
2026		test grid-23 {grid configure -in leaked from previous master - bug
	2026	test grid-23 {grid configure -in leaked from previous container window - bug
2027	2027	6aea69fccbb266b7f0437686379fbe5b55442958} {
2028	2028	frame .f
2029	2029	frame .g

+5

-18

tests/image.test less more

310	310	test image-6.1 {Tk_ImageCmd procedure, "types" option} -body {
311	311	image types x
312	312	} -returnCodes error -result {wrong # args: should be "image types"}
313		test image-6.2 {Tk_ImageCmd procedure, "types" option} -constraints {
314		testImageType
315		} -body {
	313	test image-6.2 {Tk_ImageCmd procedure, "types" option} -body {
316	314	lsort [image types]
317		} -result {bitmap oldtest photo test}
	315	} -match glob -result {bitmap*photo test}
318	316
319	317
320	318	test image-7.1 {Tk_ImageCmd procedure, "width" option} -body {

356	354	catch {destroy .b}
357	355	} -result [list 0 1]
358	356
359		if {[tk windowingsystem] == "aqua" && $tcl_platform(osVersion) > 18} {
360		# Aqua >= 10.14 will redraw the entire image in drawRect.
361		set result_9_1 {{foo display 0 0 30 15}}
362		} else {
363		set result_9_1 {{foo display 5 6 7 8}}
364		}
365	357	test image-9.1 {Tk_ImageChanged procedure} -constraints testImageType -setup {
366	358	.c delete all
367	359	imageCleanup

384	376	} -cleanup {
385	377	.c delete all
386	378	imageCleanup
387		} -result $result_9_1
388		if {[tk windowingsystem] == "aqua" && $tcl_platform(osVersion) > 18} {
389		# Aqua >= 10.14 will redraw the entire image.
390		set result_9_2 {{foo display 0 0 30 15} {foo display 0 0 30 15}}
391		} else {
392		set result_9_2 {{foo display 5 6 25 9} {foo display 0 0 12 14}}
393		}
	379	} -result {{foo display 5 6 7 8}}
	380
394	381	test image-9.2 {Tk_ImageChanged procedure} -constraints testImageType -setup {
395	382	.c delete all
396	383	imageCleanup

410	397	} -cleanup {
411	398	.c delete all
412	399	imageCleanup
413		} -result $result_9_2
	400	} -result {{foo display 5 6 25 9} {foo display 0 0 12 14}}
414	401
415	402	test image-10.1 {Tk_GetImage procedure} -setup {
416	403	imageCleanup

+9

-9

tests/imgBmap.test less more

136	136	} -result {image1 image1 0 0 #000000 {}}
137	137
138	138
139		test imageBmap-3.1 {ImgBmapConfigureMaster procedure, memory de-allocation} -body {
	139	test imageBmap-3.1 {ImgBmapConfigureModel procedure, memory de-allocation} -body {
140	140	image create bitmap i1 -data $data1
141	141	i1 configure -data $data1
142	142	} -cleanup {
143	143	image delete i1
144	144	} -result {}
145		test imageBmap-3.2 {ImgBmapConfigureMaster procedure} -body {
	145	test imageBmap-3.2 {ImgBmapConfigureModel procedure} -body {
146	146	image create bitmap i1 -data $data1
147	147	list [catch {i1 configure -data bogus} msg] $msg [image width i1] \
148	148	[image height i1]
149	149	} -result {1 {format error in bitmap data} 16 16}
150		test imageBmap-3.3 {ImgBmapConfigureMaster procedure, memory de-allocation} -body {
	150	test imageBmap-3.3 {ImgBmapConfigureModel procedure, memory de-allocation} -body {
151	151	image create bitmap i1 -data $data1 -maskdata $data2
152	152	i1 configure -maskdata $data2
153	153	} -cleanup {
154	154	image delete i1
155	155	} -result {}
156		test imageBmap-3.4 {ImgBmapConfigureMaster procedure} -body {
	156	test imageBmap-3.4 {ImgBmapConfigureModel procedure} -body {
157	157	image create bitmap i1
158	158	i1 configure -maskdata $data2
159	159	} -returnCodes error -result {can't have mask without bitmap}
160		test imageBmap-3.5 {ImgBmapConfigureMaster procedure} -body {
	160	test imageBmap-3.5 {ImgBmapConfigureModel procedure} -body {
161	161	image create bitmap i1 -data $data1 -maskdata {
162	162	#define foo_width 8
163	163	#define foo_height 16

166	166	0x81, 0x81, 0xff, 0xff, 0xff, 0xff, 0x81, 0x81};
167	167	}
168	168	} -returnCodes error -result {bitmap and mask have different sizes}
169		test imageBmap-3.6 {ImgBmapConfigureMaster procedure} -body {
	169	test imageBmap-3.6 {ImgBmapConfigureModel procedure} -body {
170	170	image create bitmap i1 -data $data1 -maskdata {
171	171	#define foo_width 16
172	172	#define foo_height 8

175	175	0x81, 0x81, 0xff, 0xff, 0xff, 0xff, 0x81, 0x81};
176	176	}
177	177	} -returnCodes error -result {bitmap and mask have different sizes}
178		test imageBmap-3.7 {ImgBmapConfigureMaster procedure} -setup {
	178	test imageBmap-3.7 {ImgBmapConfigureModel procedure} -setup {
179	179	destroy .c
180	180	pack [canvas .c]
181	181	} -body {

502	502	test imageBmap-12.1 {ImgBmapCmdDeletedProc procedure} -body {
503	503	image create bitmap i2 -file foo.bm -maskfile foo2.bm
504	504	rename i2 {}
505		list [lsearch -exact [imageNames] i2] [catch {i2 foo} msg] $msg
506		} -result {-1 1 {invalid command name "i2"}}
	505	list [expr {"i2" in [imageNames]}] [catch {i2 foo} msg] $msg
	506	} -result {0 1 {invalid command name "i2"}}
507	507
508	508	removeFile foo.bm
509	509	removeFile foo2.bm

+14

-32

tests/imgPhoto.test less more

58	58	set teapotPhotoFile [file join [file dirname [info script]] teapot.ppm]
59	59	testConstraint hasTeapotPhoto [file exists $teapotPhotoFile]
60	60
61		proc base64ok {} {
62		expr {
63		![catch {package require base64}]
64		}
65		}
66
67		testConstraint base64PackageNeeded [base64ok]
68
69	61	test imgPhoto-1.1 {options for photo images} -body {
70	62	image create photo photo1 -width 79 -height 83
71	63	list [photo1 cget -width] [photo1 cget -height] \

138	130	# set msg
139	131	# } {couldn't open "bogus.img": no such file or directory}
140	132
141		test imgPhoto-3.1 {ImgPhotoConfigureMaster procedure} -constraints {
	133	test imgPhoto-3.1 {ImgPhotoConfigureModel procedure} -constraints {
142	134	hasTeapotPhoto
143	135	} -body {
144	136	image create photo photo1 -file $teapotPhotoFile

146	138	} -cleanup {
147	139	image delete photo1
148	140	} -result {}
149		test imgPhoto-3.2 {ImgPhotoConfigureMaster procedure} -constraints {
	141	test imgPhoto-3.2 {ImgPhotoConfigureModel procedure} -constraints {
150	142	hasTeapotPhoto
151	143	} -body {
152	144	image create photo photo1 -file $teapotPhotoFile

155	147	} -cleanup {
156	148	image delete photo1
157	149	} -result {1 {couldn't open "bogus": no such file or directory} 256 256}
158		test imgPhoto-3.3 {ImgPhotoConfigureMaster procedure} -constraints {
	150	test imgPhoto-3.3 {ImgPhotoConfigureModel procedure} -constraints {
159	151	hasTeapotPhoto
160	152	} -setup {
161	153	destroy .c

820	812	file delete ./-teapotPhotoFile
821	813	} -result {}
822	814	test imgPhoto-4.76 {ImgPhotoCmd procedure: copy to same image} -constraints {
823		hasTeapotPhoto
	815	hasTeapotPhoto
824	816	} -setup {
825	817	imageCleanup
826	818	image create photo photo1 -file $teapotPhotoFile

959	951	} -body {
960	952	image create photo photo2 -file $teapotPhotoFile
961	953	rename photo2 {}
962		list [lsearch -exact [imageNames] photo2] [catch {photo2 foo} msg] $msg
963		} -result {-1 1 {invalid command name "photo2"}}
	954	list [expr {"photo2" in [imageNames]}] [catch {photo2 foo} msg] $msg
	955	} -result {0 1 {invalid command name "photo2"}}
964	956
965	957	test imgPhoto-10.1 {Tk_ImgPhotoPutBlock procedure} -setup {
966	958	imageCleanup

1305	1297	# Reject corrupted or truncated image [Bug b601ce3ab1].
1306	1298	# WARNING - tests 18.1-18.9 will cause a segfault on 8.5.19 and lower,
1307	1299	# and on 8.6.6 and lower.
1308		test imgPhoto-18.1 {Reject corrupted GIF (binary string)} -constraints {
1309		base64PackageNeeded
1310		} -setup {
1311		package require base64
1312		set data [base64::decode {
	1300	test imgPhoto-18.1 {Reject corrupted GIF (binary string)} -setup {
	1301	set data [binary decode base64 {
1313	1302	R0lGODlhAAQABP8zM/8z/zP/MzP/////M////yH5CiwheLrcLTBCd6Tv2qW16tdK4jhV
1314	1303	5qpraXIvM1JlNyAgOw==
1315	1304	}]

1335	1324	} -cleanup {
1336	1325	catch {image delete gif1}
1337	1326	} -returnCodes error -result {error reading color map\|not enough free memory for image buffer} -match regexp
1338		test imgPhoto-18.4 {Reject truncated GIF (binary string)} -constraints {
1339		base64PackageNeeded
1340		} -setup {
1341		package require base64
1342		set data [base64::decode {
	1327	test imgPhoto-18.4 {Reject truncated GIF (binary string)} -setup {
	1328	set data [binary decode base64 {
1343	1329	R0lGODlhEAAQAMIHAAAAADMz//8zM/8z/zP/MzP///8=
1344	1330	}]
1345	1331	} -body {

1364	1350	catch {image delete gif1}
1365	1351	} -returnCodes error -result {error reading color map}
1366	1352	test imgPhoto-18.7 {Reject corrupted GIF (> 4Gb) (binary string)} -constraints {
1367		base64PackageNeeded nonPortable
	1353	nonPortable
1368	1354	} -setup {
1369	1355	# About the non portability constraint of this test: see ticket [cc42cc18a5]
1370	1356	# If there is insufficient memory, the error message
1371	1357	# {not enough free memory for image buffer} should be returned.
1372	1358	# Instead, some systems (e.g. FreeBSD 11.1) terminate the test interpreter.
1373		package require base64
1374		set data [base64::decode {
	1359	set data [binary decode base64 {
1375	1360	R0lGODlhwmYz//8zM/8z/zP/MzP/////M////yH5Ciwhe
1376	1361	LrcLTBCd6Tv2qW16tdK4jhV5qpraXIvM1JlNyAgOw==
1377	1362	}]

1409	1394	} -cleanup {
1410	1395	catch {image delete gif1}
1411	1396	} -returnCodes error -result {error reading color map\|not enough free memory for image buffer} -match regexp
1412		test imgPhoto-18.10 {Valid GIF (binary string)} -constraints {
1413		base64PackageNeeded
1414		} -setup {
	1397	test imgPhoto-18.10 {Valid GIF (binary string)} -setup {
1415	1398	# Test the binary string reader with a valid GIF.
1416	1399	# This is not tested elsewhere.
1417	1400	# Tests 18.11, 18.12, with matching data, are included for completeness.
1418		package require base64
1419		set data [base64::decode {
	1401	set data [binary decode base64 {
1420	1402	R0lGODlhEAAQAMIHAAAAADMz//8zM/8z/zP/MzP/////M////yH5BAEKAAcALAAA
1421	1403	AAAQABAAAAMheLrcLTBCd6QV79qlterXB0riOFXmmapraXIvM1IdZTcJADs=
1422	1404	}]

+94

-103

tests/listbox.test less more

375	375	test listbox-3.6 {ListboxWidgetCmd procedure, "activate" option} -body {
376	376	.l activate -1
377	377	.l index active
378		} -result {0}
	378	} -result 0
379	379	test listbox-3.7 {ListboxWidgetCmd procedure, "activate" option} -body {
380	380	.l activate 30
381	381	.l index active
382		} -result {17}
	382	} -result 17
383	383	test listbox-3.8 {ListboxWidgetCmd procedure, "activate" option} -body {
384	384	.l activate end
385	385	.l index active
386		} -result {17}
	386	} -result 17
387	387	test listbox-3.9 {ListboxWidgetCmd procedure, "bbox" option} -body {
388	388	.l bbox
389	389	} -returnCodes error -result {wrong # args: should be ".l bbox index"}

507	507	} -cleanup {
508	508	destroy .top.l .top
509	509	unset -nocomplain lres res
510		} -result {1}
	510	} -result 1
511	511	test listbox-3.19 {ListboxWidgetCmd procedure, "cget" option} -body {
512	512	.l cget
513	513	} -returnCodes error -result {wrong # args: should be ".l cget option"}

519	519	} -returnCodes error -result {unknown option "-gorp"}
520	520	test listbox-3.22 {ListboxWidgetCmd procedure, "cget" option} -body {
521	521	.l cget -setgrid
522		} -result {0}
	522	} -result 0
523	523	test listbox-3.23 {ListboxWidgetCmd procedure, "configure" option} -body {
524	524	llength [.l configure]
525		} -result {28}
	525	} -result 28
526	526	test listbox-3.24 {ListboxWidgetCmd procedure, "configure" option} -body {
527	527	.l configure -gorp
528	528	} -returnCodes error -result {unknown option "-gorp"}

586	586	} -body {
587	587	listbox .l2
588	588	.l2 insert 0 el0 el1 el2 el3 el4 el5 el6 el7
589		.l2 delete -3 2
	589	.l2 delete -1 2
590	590	.l2 get 0 end
591	591	} -cleanup {
592	592	destroy .l2

596	596	} -body {
597	597	listbox .l2
598	598	.l2 insert 0 el0 el1 el2 el3 el4 el5 el6 el7
599		.l2 delete -3 -1
	599	.l2 delete -1 -1
600	600	.l2 get 0 end
601	601	} -cleanup {
602	602	destroy .l2

683	683	.l get -1
684	684	} -result {}
685	685	test listbox-3.50 {ListboxWidgetCmd procedure, "get" option} -body {
686		.l get -2 -1
	686	.l get -1 -1
687	687	} -result {}
688	688	test listbox-3.51 {ListboxWidgetCmd procedure, "get" option} -body {
689		.l get -2 3
	689	.l get -1 3
690	690	} -result {el0 el1 el2 el3}
691	691	test listbox-3.52 {ListboxWidgetCmd procedure, "get" option} -body {
692	692	.l get 12 end

782	782	test listbox-3.73 {ListboxWidgetCmd procedure, "nearest" option} -body {
783	783	.l yview 3
784	784	.l nearest 1000
785		} -result {7}
	785	} -result 7
786	786	test listbox-3.74 {ListboxWidgetCmd procedure, "scan" option} -body {
787	787	.l scan a b
788	788	} -returnCodes error -result {wrong # args: should be ".l scan mark\|dragto x y"}

829	829	.l yview 7
830	830	.l see 7
831	831	.l index @0,0
832		} -result {7}
	832	} -result 7
833	833	test listbox-3.84 {ListboxWidgetCmd procedure, "see" option} -body {
834	834	.l yview 7
835	835	.l see 11
836	836	.l index @0,0
837		} -result {7}
	837	} -result 7
838	838	test listbox-3.85 {ListboxWidgetCmd procedure, "see" option} -body {
839	839	.l yview 7
840	840	.l see 6
841	841	.l index @0,0
842		} -result {6}
	842	} -result 6
843	843	test listbox-3.86 {ListboxWidgetCmd procedure, "see" option} -body {
844	844	.l yview 7
845	845	.l see 5
846	846	.l index @0,0
847		} -result {3}
	847	} -result 3
848	848	test listbox-3.87 {ListboxWidgetCmd procedure, "see" option} -body {
849	849	.l yview 7
850	850	.l see 12
851	851	.l index @0,0
852		} -result {8}
	852	} -result 8
853	853	test listbox-3.88 {ListboxWidgetCmd procedure, "see" option} -body {
854	854	.l yview 7
855	855	.l see 13
856	856	.l index @0,0
857		} -result {11}
	857	} -result 11
858	858	test listbox-3.89 {ListboxWidgetCmd procedure, "see" option} -body {
859	859	.l yview 7
860	860	.l see -1
861	861	.l index @0,0
862		} -result {0}
	862	} -result 0
863	863	test listbox-3.90 {ListboxWidgetCmd procedure, "see" option} -body {
864	864	.l yview 7
865	865	.l see end
866	866	.l index @0,0
867		} -result {13}
	867	} -result 13
868	868	test listbox-3.91 {ListboxWidgetCmd procedure, "see" option} -body {
869	869	.l yview 7
870	870	.l see 322
871	871	.l index @0,0
872		} -result {13}
	872	} -result 13
873	873	test listbox-3.92 {ListboxWidgetCmd procedure, "see" option, partial last line} -body {
874	874	mkPartial
875	875	.partial.l see 4
876	876	.partial.l index @0,0
877		} -result {1}
	877	} -result 1
878	878	test listbox-3.93 {ListboxWidgetCmd procedure, "selection" option} -body {
879	879	.l select a
880	880	} -returnCodes error -result {wrong # args: should be ".l selection option index ?index?"}

897	897	test listbox-3.99 {ListboxWidgetCmd procedure, "selection" option} -body {
898	898	.l selection anchor -1
899	899	.l index anchor
900		} -result {0}
	900	} -result 0
901	901	test listbox-3.100 {ListboxWidgetCmd procedure, "selection" option} -body {
902	902	.l selection anchor end
903	903	.l index anchor
904		} -result {17}
	904	} -result 17
905	905	test listbox-3.101 {ListboxWidgetCmd procedure, "selection" option} -body {
906	906	.l selection anchor 44
907	907	.l index anchor
908		} -result {17}
	908	} -result 17
909	909	test listbox-3.102 {ListboxWidgetCmd procedure, "selection" option} -body {
910	910	.l selection clear 0 end
911	911	.l selection set 2 8

925	925	test listbox-3.105 {ListboxWidgetCmd procedure, "selection" option} -body {
926	926	.l selection set 0 end
927	927	.l selection includes -1
928		} -result {0}
	928	} -result 0
929	929	test listbox-3.106 {ListboxWidgetCmd procedure, "selection" option} -body {
930	930	.l selection clear 0 end
931	931	.l selection set end
932	932	.l selection includes end
933		} -result {1}
	933	} -result 1
934	934	test listbox-3.107 {ListboxWidgetCmd procedure, "selection" option} -body {
935	935	.l selection set 0 end
936	936	.l selection includes 44
937		} -result {0}
	937	} -result 0
938	938	test listbox-3.108 {ListboxWidgetCmd procedure, "selection" option} -setup {
939	939	destroy .l2
940	940	} -body {

942	942	.l2 selection includes 0
943	943	} -cleanup {
944	944	destroy .l2
945		} -result {0}
	945	} -result 0
946	946	test listbox-3.109 {ListboxWidgetCmd procedure, "selection" option} -body {
947	947	.l selection clear 0 end
948	948	.l selection set 2

964	964	} -returnCodes error -result {wrong # args: should be ".l size"}
965	965	test listbox-3.113 {ListboxWidgetCmd procedure, "size" option} -body {
966	966	.l size
967		} -result {18}
	967	} -result 18
968	968	test listbox-3.114 {ListboxWidgetCmd procedure, "xview" option} -setup {
969	969	destroy .l2
970	970	} -body {

1241	1241	.l cget -highlightthickness
1242	1242	} -cleanup {
1243	1243	deleteWindows
1244		} -result {0}
	1244	} -result 0
1245	1245	test listbox-4.3 {ConfigureListbox procedure} -setup {
1246	1246	deleteWindows
1247	1247	destroy .l

1572	1572	.l selection anchor 2
1573	1573	.l insert 2 A B
1574	1574	.l index anchor
1575		} -result {4}
	1575	} -result 4
1576	1576	test listbox-6.3 {InsertEls procedure} -body {
1577	1577	.l delete 0 end
1578	1578	.l insert 0 a b c d e f g h i j
1579	1579	.l selection anchor 2
1580	1580	.l insert 3 A B
1581	1581	.l index anchor
1582		} -result {2}
	1582	} -result 2
1583	1583	test listbox-6.4 {InsertEls procedure} -body {
1584	1584	.l delete 0 end
1585	1585	.l insert 0 a b c d e f g h i j

1587	1587	update
1588	1588	.l insert 2 A B
1589	1589	.l index @0,0
1590		} -result {5}
	1590	} -result 5
1591	1591	test listbox-6.5 {InsertEls procedure} -body {
1592	1592	.l delete 0 end
1593	1593	.l insert 0 a b c d e f g h i j

1595	1595	update
1596	1596	.l insert 3 A B
1597	1597	.l index @0,0
1598		} -result {3}
	1598	} -result 3
1599	1599	test listbox-6.6 {InsertEls procedure} -body {
1600	1600	.l delete 0 end
1601	1601	.l insert 0 a b c d e f g h i j
1602	1602	.l activate 5
1603	1603	.l insert 5 A B
1604	1604	.l index active
1605		} -result {7}
	1605	} -result 7
1606	1606	test listbox-6.7 {InsertEls procedure} -body {
1607	1607	.l delete 0 end
1608	1608	.l insert 0 a b c d e f g h i j
1609	1609	.l activate 5
1610	1610	.l insert 6 A B
1611	1611	.l index active
1612		} -result {5}
	1612	} -result 5
1613	1613	test listbox-6.8 {InsertEls procedure} -body {
1614	1614	.l delete 0 end
1615	1615	.l insert 0 a b c
1616	1616	.l index active
1617		} -result {2}
	1617	} -result 2
1618	1618	test listbox-6.9 {InsertEls procedure} -body {
1619	1619	.l delete 0 end
1620	1620	.l insert 0
1621	1621	.l index active
1622		} -result {0}
	1622	} -result 0
1623	1623	test listbox-6.10 {InsertEls procedure} -body {
1624	1624	.l delete 0 end
1625	1625	.l insert 0 a b "two words" c d e f g h i j

1727	1727	.l selection anchor 2
1728	1728	.l delete 0 1
1729	1729	.l index anchor
1730		} -result {0}
	1730	} -result 0
1731	1731	test listbox-7.6 {DeleteEls procedure} -body {
1732	1732	.l delete 0 end
1733	1733	.l insert 0 a b c d e f g h i j
1734	1734	.l selection anchor 2
1735	1735	.l delete 2
1736	1736	.l index anchor
1737		} -result {2}
	1737	} -result 2
1738	1738	test listbox-7.7 {DeleteEls procedure} -body {
1739	1739	.l delete 0 end
1740	1740	.l insert 0 a b c d e f g h i j
1741	1741	.l selection anchor 4
1742	1742	.l delete 2 5
1743	1743	.l index anchor
1744		} -result {2}
	1744	} -result 2
1745	1745	test listbox-7.8 {DeleteEls procedure} -body {
1746	1746	.l delete 0 end
1747	1747	.l insert 0 a b c d e f g h i j
1748	1748	.l selection anchor 3
1749	1749	.l delete 4 5
1750	1750	.l index anchor
1751		} -result {3}
	1751	} -result 3
1752	1752	test listbox-7.9 {DeleteEls procedure} -body {
1753	1753	.l delete 0 end
1754	1754	.l insert 0 a b c d e f g h i j

1756	1756	update
1757	1757	.l delete 1 2
1758	1758	.l index @0,0
1759		} -result {1}
	1759	} -result 1
1760	1760	test listbox-7.10 {DeleteEls procedure} -body {
1761	1761	.l delete 0 end
1762	1762	.l insert 0 a b c d e f g h i j

1764	1764	update
1765	1765	.l delete 3 4
1766	1766	.l index @0,0
1767		} -result {3}
	1767	} -result 3
1768	1768	test listbox-7.11 {DeleteEls procedure} -body {
1769	1769	.l delete 0 end
1770	1770	.l insert 0 a b c d e f g h i j

1772	1772	update
1773	1773	.l delete 4 6
1774	1774	.l index @0,0
1775		} -result {3}
	1775	} -result 3
1776	1776	test listbox-7.12 {DeleteEls procedure} -body {
1777	1777	.l delete 0 end
1778	1778	.l insert 0 a b c d e f g h i j

1780	1780	update
1781	1781	.l delete 3 end
1782	1782	.l index @0,0
1783		} -result {1}
	1783	} -result 1
1784	1784	test listbox-7.13 {DeleteEls procedure, updating view with partial last line} -body {
1785	1785	mkPartial
1786	1786	.partial.l yview 8
1787	1787	update
1788	1788	.partial.l delete 10 13
1789	1789	.partial.l index @0,0
1790		} -result {7}
	1790	} -result 7
1791	1791	test listbox-7.14 {DeleteEls procedure} -body {
1792	1792	.l delete 0 end
1793	1793	.l insert 0 a b c d e f g h i j
1794	1794	.l activate 6
1795	1795	.l delete 3 4
1796	1796	.l index active
1797		} -result {4}
	1797	} -result 4
1798	1798	test listbox-7.15 {DeleteEls procedure} -body {
1799	1799	.l delete 0 end
1800	1800	.l insert 0 a b c d e f g h i j
1801	1801	.l activate 6
1802	1802	.l delete 5 7
1803	1803	.l index active
1804		} -result {5}
	1804	} -result 5
1805	1805	test listbox-7.16 {DeleteEls procedure} -body {
1806	1806	.l delete 0 end
1807	1807	.l insert 0 a b c d e f g h i j
1808	1808	.l activate 6
1809	1809	.l delete 5 end
1810	1810	.l index active
1811		} -result {4}
	1811	} -result 4
1812	1812	test listbox-7.17 {DeleteEls procedure} -body {
1813	1813	.l delete 0 end
1814	1814	.l insert 0 a b c d e f g h i j
1815	1815	.l activate 6
1816	1816	.l delete 0 end
1817	1817	.l index active
1818		} -result {0}
	1818	} -result 0
1819	1819	test listbox-7.18 {DeleteEls procedure} -body {
1820	1820	.l delete 0 end
1821	1821	.l insert 0 a b c "two words" d e f g h i j

1986	1986	.l index end
1987	1987	} -cleanup {
1988	1988	destroy .l
1989		} -result {12}
	1989	} -result 12
1990	1990	test listbox-10.6 {GetListboxIndex procedure} -setup {
1991	1991	destroy .l
1992	1992	} -body {

2101	2101	.l index 3
2102	2102	} -cleanup {
2103	2103	destroy .l
2104		} -result {3}
	2104	} -result 3
2105	2105	test listbox-10.17 {GetListboxIndex procedure} -setup {
2106	2106	destroy .l
2107	2107	} -body {

2111	2111	.l index 20
2112	2112	} -cleanup {
2113	2113	destroy .l
2114		} -result {20}
	2114	} -result 20
2115	2115	test listbox-10.18 {GetListboxIndex procedure} -setup {
2116	2116	destroy .l
2117	2117	} -body {

2128	2128	pack [listbox .l]
2129	2129	.l insert 0 el0 el1 el2 el3 el4 el5 el6 el7 el8 el9 el10 el11
2130	2130	update
2131		.l index -2
2132		} -cleanup {
2133		destroy .l
2134		} -result -2
	2131	.l index -1
	2132	} -cleanup {
	2133	destroy .l
	2134	} -result -1
2135	2135	test listbox-10.20 {GetListboxIndex procedure} -setup {
2136	2136	destroy .l
2137	2137	} -body {

2225	2225	.partial.l index @0,0
2226	2226	} -cleanup {
2227	2227	destroy .l
2228		} -result {11}
	2228	} -result 11
2229	2229
2230	2230
2231	2231	# Listbox used in 12.* tests

2313	2313	test listbox-14.1 {NearestListboxElement procedure, partial last line} -body {
2314	2314	mkPartial
2315	2315	.partial.l nearest [winfo height .partial.l]
2316		} -result {4}
	2316	} -result 4
2317	2317	# Listbox used in 14.* tests
2318	2318	destroy .l
2319	2319	listbox .l -font $fixed -width 20 -height 10

2325	2325	fonts
2326	2326	} -body {
2327	2327	.l index @50,0
2328		} -result {4}
	2328	} -result 4
2329	2329	test listbox-14.3 {NearestListboxElement procedure} -constraints {
2330	2330	fonts
2331	2331	} -body {

2335	2335	fonts
2336	2336	} -body {
2337	2337	.l index @50,200
2338		} -result {13}
	2338	} -result 13
2339	2339
2340	2340
2341	2341	# Listbox used in 15.* 16.* and 17.* tests

2377	2377	.l delete 0 end
2378	2378	.l insert 0 a b c d e f
2379	2379	.l select clear 0 end
2380		.l select set -2 -1
	2380	.l select set -1 -1
2381	2381	.l curselection
2382	2382	} -result {}
2383	2383	test listbox-15.5 {ListboxSelect procedure, boundary conditions for indices} -body {

2414	2414	.l select clear 0 end
2415	2415	.l select set end 30
2416	2416	.l curselection
2417		} -result {5}
	2417	} -result 5
2418	2418	test listbox-15.10 {ListboxSelect procedure, boundary conditions for indices} -body {
2419	2419	.l delete 0 end
2420	2420	.l insert 0 a b c d e f

2450	2450	string compare 1$long\n2$long\n3$long\n4$long\n5$long $sel
2451	2451	} -cleanup {
2452	2452	catch {unset long sel}
2453		} -result {0}
	2453	} -result 0
2454	2454
2455	2455
2456	2456	test listbox-17.1 {ListboxLostSelection procedure} -setup {

2661	2661	test listbox-21.9 {ListboxListVarProc, test hscrollbar after listvar mod} -setup {
2662	2662	destroy .l
2663	2663	} -body {
	2664	set x {}
	2665	listbox .l -font $fixed -width 10 -xscrollcommand "record x" -listvar x
	2666	pack .l
	2667	update idletasks
	2668	set log {}
	2669	lappend x "0000000000"
	2670	update idletasks
	2671	lappend x "00000000000000000000"
	2672	update idletasks
	2673	set log
	2674	} -cleanup {
	2675	destroy .l
	2676	} -result [list {x 0 1} {x 0 0.5}]
	2677	test listbox-21.10 {ListboxListVarProc, test hscrollbar after listvar mod} -setup {
	2678	destroy .l
	2679	} -body {
2664	2680	catch {unset x}
2665	2681	listbox .l -font $fixed -width 10 -xscrollcommand "record x" -listvar x
	2682	pack .l
	2683	update idletasks
2666	2684	set log {}
2667		pack .l
2668		set timeout [after 500 {set log timeout}]
2669		vwait log
2670	2685	lappend x "0000000000"
2671		update
	2686	update idletasks
2672	2687	lappend x "00000000000000000000"
2673		update
	2688	update idletasks
	2689	set x [list "0000000000"]
	2690	update idletasks
2674	2691	set log
2675	2692	} -cleanup {
2676	2693	destroy .l
2677		after cancel $timeout
2678		} -result [list {x 0 1} {x 0 1} {x 0 0.5}]
2679		test listbox-21.10 {ListboxListVarProc, test hscrollbar after listvar mod} -setup {
2680		destroy .l
2681		} -body {
2682		catch {unset x}
2683		listbox .l -font $fixed -width 10 -xscrollcommand "record x" -listvar x
2684		set log {}
2685		pack .l
2686		set timeout [after 500 {set log timeout}]
2687		vwait log
2688		lappend x "0000000000"
2689		update
2690		lappend x "00000000000000000000"
2691		update
2692		set x [list "0000000000"]
2693		update
2694		set log
2695		} -cleanup {
2696		destroy .l
2697		after cancel timeout
2698		} -result [list {x 0 1} {x 0 1} {x 0 0.5} {x 0 1}]
	2694	} -result [list {x 0 1} {x 0 0.5} {x 0 1}]
2699	2695	test listbox-21.11 {ListboxListVarProc, bad list} -setup {
2700	2696	destroy .l
2701	2697	} -body {

2763	2759	update
2764	2760	set log {}
2765	2761	pack .l
2766		set timeout [after 500 {set log timeout}]
	2762	set timeout [after 500 {lappend log timeout3}]
2767	2763	vwait log
2768	2764	update
2769	2765	lappend x a b c d e f

2800	2796	destroy .l
2801	2797	} -body {
2802	2798	listbox .l -font $fixed -width 10 -xscrollcommand "record x"
	2799	pack .l
	2800	update idletasks
2803	2801	set log {}
2804		pack .l
2805		set timeout [after 500 {set log timeout}]
	2802	set timeout [after 500 {lappend log timeout4}]
	2803	.l insert end "0000000000"
2806	2804	vwait log
2807		.l insert end "0000000000"
2808		update
2809	2805	.l insert end "00000000000000000000"
2810	2806	vwait log
2811	2807	set log
2812	2808	} -cleanup {
2813	2809	destroy .l
2814	2810	after cancel $timeout
2815		} -result [list {x 0 1} {x 0 1} {x 0 0.5}]
	2811	} -result [list {x 0 1} {x 0 0.5}]
2816	2812
2817	2813
2818	2814	# ConfigureListboxItem

3220	3216	# cleanup
3221	3217	cleanupTests
3222	3218	return
3223
3224
3225
3226
3227

+2

-2

tests/main.test less more

54	54	removeFile script
55	55	} -result "script {} 0\n0\n"
56	56
57		# Procedure to simulate interactive typing of commands, line by line,
	57	# Procedure to simulate interactive typing of commands, line by line,
58	58	# for test 2.3
59	59	proc type {chan script} {
60	60	foreach line [split $script \n] {

93	93	test main-3.1 {Tk_ParseArgv: -help option} -constraints unix -body {
94	94	# Run only on unix as Win32 pops up native dialog
95	95	exec [interpreter] -help
96		} -returnCodes error -match glob -result {% application-specific initialization failed: Command-specific options:*}
	96	} -returnCodes error -match glob -result {application-specific initialization failed: Command-specific options:}
97	97
98	98	test main-3.2 {Tk_ParseArgv: -help option} -setup {
99	99	set maininterp [interp create]

+37

-37

tests/menu.test less more

275	275	# We need to test all of the options with all of the different types of
276	276	# menu entries. The following code sets up .m1 with 6 items. It then
277	277	# runs through the 2.31 - 2.228 tests below
278		# index 0 is tearoff, 1 command, 2 cascade, 3 separator, 4 checkbutton,
	278	# index 0 is tearoff, 1 command, 2 cascade, 3 separator, 4 checkbutton,
279	279	# 5 radiobutton
280	280	deleteWindows
281	281	menu .m1 -tearoff 1

770	770	} -returnCodes error -result {image "bogus" doesn't exist}
771	771
772	772	test menu-2.133 {entry configuration options 0 -image {} tearoff} -body {
773		.m1 entryconfigure 0 -image
	773	.m1 entryconfigure 0 -image
774	774	} -returnCodes error -result {unknown option "-image"}
775	775
776	776	test menu-2.134 {entry configuration options 1 -image {} command} -setup {
777	777	.m1 entryconfigure 1 -image {}
778	778	} -body {
779		.m1 entryconfigure 1 -image
	779	.m1 entryconfigure 1 -image
780	780	lindex [.m1 entryconfigure 1 -image] 4
781	781	} -result {}
782	782
783	783	test menu-2.135 {entry configuration options 2 -image {} cascade} -setup {
784	784	.m1 entryconfigure 2 -image {}
785	785	} -body {
786		.m1 entryconfigure 2 -image
	786	.m1 entryconfigure 2 -image
787	787	lindex [.m1 entryconfigure 2 -image] 4
788	788	} -result {}
789	789
790	790	test menu-2.136 {entry configuration options 3 -image {} separator} -body {
791		.m1 entryconfigure 3 -image
	791	.m1 entryconfigure 3 -image
792	792	} -returnCodes error -result {unknown option "-image"}
793	793
794	794	test menu-2.137 {entry configuration options 4 -image {} checkbutton} -body {
795		.m1 entryconfigure 4 -image
	795	.m1 entryconfigure 4 -image
796	796	lindex [.m1 entryconfigure 4 -image] 4
797	797	} -result {}
798	798
799	799	test menu-2.138 {entry configuration options 5 -image {} radiobutton} -body {
800		.m1 entryconfigure 5 -image
	800	.m1 entryconfigure 5 -image
801	801	lindex [.m1 entryconfigure 5 -image] 4
802	802	} -result {}
803	803

1051	1051	} -returnCodes error -result {image "bogus" doesn't exist}
1052	1052
1053	1053	test menu-2.193 {entry configuration options 0 -selectimage {} tearoff} -body {
1054		.m1 entryconfigure 0 -selectimage
	1054	.m1 entryconfigure 0 -selectimage
1055	1055	} -returnCodes error -result {unknown option "-selectimage"}
1056	1056
1057	1057	test menu-2.194 {entry configuration options 1 -selectimage {} command} -body {
1058		.m1 entryconfigure 1 -selectimage
	1058	.m1 entryconfigure 1 -selectimage
1059	1059	} -returnCodes error -result {unknown option "-selectimage"}
1060	1060
1061	1061	test menu-2.195 {entry configuration options 2 -selectimage {} cascade} -body {
1062		.m1 entryconfigure 2 -selectimage
	1062	.m1 entryconfigure 2 -selectimage
1063	1063	} -returnCodes error -result {unknown option "-selectimage"}
1064	1064
1065	1065	test menu-2.196 {entry configuration options 3 -selectimage {} separator} -body {
1066		.m1 entryconfigure 3 -selectimage
	1066	.m1 entryconfigure 3 -selectimage
1067	1067	} -returnCodes error -result {unknown option "-selectimage"}
1068	1068
1069	1069	test menu-2.197 {entry configuration options 4 -selectimage {} checkbutton} -body {
1070		.m1 entryconfigure 4 -selectimage
	1070	.m1 entryconfigure 4 -selectimage
1071	1071	lindex [.m1 entryconfigure 4 -selectimage] 4
1072	1072	} -result {}
1073	1073
1074	1074	test menu-2.198 {entry configuration options 5 -selectimage {} radiobutton} -body {
1075		.m1 entryconfigure 5 -selectimage
	1075	.m1 entryconfigure 5 -selectimage
1076	1076	lindex [.m1 entryconfigure 5 -selectimage] 4
1077	1077	} -result {}
1078	1078

1224	1224	destroy .m1
1225	1225	} -returnCodes error -result {wrong # args: should be ".m1 option ?arg ...?"}
1226	1226	test menu-3.2 {MenuWidgetCmd, Tcl_Preserve and Tcl_Release} -constraints {
1227		nonUnixUserInteraction
	1227	nonUnixUserInteraction
1228	1228	} -setup {
1229	1229	destroy .m1
1230	1230	} -body {

1236	1236	} -returnCodes ok -result {}
1237	1237	test menu-3.3 {MenuWidgetCmd procedure, "activate" option} -setup {
1238	1238	destroy .m1
1239		} -body {
	1239	} -body {
1240	1240	menu .m1
1241	1241	.m1 add command -label "test"
1242	1242	.m1 activate

1413	1413	} -body {
1414	1414	menu .m1
1415	1415	.m1 add command -label "foo"
1416		.m1 delete 1 0
	1416	.m1 delete 1 0
1417	1417	} -cleanup {
1418	1418	destroy .m1
1419	1419	} -result {}

1626	1626	nonUnixUserInteraction
1627	1627	} -setup {
1628	1628	destroy .m1
1629		} -body {
	1629	} -body {
1630	1630	menu .m1
1631	1631	.m1 add command -label "menu-3.53: hit Escape" -command "puts hello"
1632	1632	.m1 post 40 40

1653	1653	nonUnixUserInteraction
1654	1654	} -setup {
1655	1655	destroy .m1 .m2
1656		} -body {
	1656	} -body {
1657	1657	menu .m1
1658	1658	.m1 add command -label "menu-3.56 - hit Escape"
1659	1659	menu .m2

1755	1755	nonUnixUserInteraction
1756	1756	} -setup {
1757	1757	destroy .m1
1758		} -body {
	1758	} -body {
1759	1759	menu .m1
1760	1760	.m1 add command -label "menu-3.68 - hit Escape"
1761		.m1 post 40 40
	1761	.m1 post 40 40
1762	1762	.m1 unpost
1763	1763	} -cleanup {
1764	1764	destroy .m1

1897	1897	} -body {
1898	1898	catch {unset foo}
1899	1899	menu .m1
1900		.m1 add checkbutton -label "test" -variable foo(1) -onvalue on
	1900	.m1 add checkbutton -label "test" -variable foo(1) -onvalue on
1901	1901	list [catch {.m1 invoke 1} msg] $msg [catch {set foo(1)} msg2] $msg2 [catch {unset foo} msg3] $msg3
1902	1902	} -cleanup {
1903	1903	destroy .m1

1965	1965	} -body {
1966	1966	menu .m1
1967	1967	.m1 add cascade -label "test" -menu .m1.m2
1968		list [catch {.m1 invoke 1} msg] $msg
	1968	list [catch {.m1 invoke 1} msg] $msg
1969	1969	} -cleanup {
1970	1970	destroy .m1
1971	1971	} -result {0 {}}

2051	2051	set tearoff2 [tk::TearOffMenu .m1]
2052	2052	list [destroy $tearoff1] [destroy .m1]
2053	2053	} -returnCodes ok -result {{} {}}
2054		test menu-5.9 {DestroyMenuInstace - master menu} -setup {
	2054	test menu-5.9 {DestroyMenuInstace - main menu} -setup {
2055	2055	destroy .m1
2056	2056	} -body {
2057	2057	menu .m1

2122	2122	destroy .m1
2123	2123	} -cleanup {
2124	2124	deleteWindows
2125		} -returnCodes ok
	2125	} -returnCodes ok
2126	2126	test menu-6.5 {TkDestroyMenu} -setup {
2127	2127	destroy .m1 .m2
2128	2128	} -body {

2349	2349	menu .m1
2350	2350	.m1 add checkbutton -variable foo
2351	2351	list [.m1 delete 1] [destroy .m1]
2352		} -result {{} {}}
	2352	} -result {{} {}}
2353	2353	test menu-8.5 {DestroyMenuEntry} -setup {
2354	2354	destroy .m1
2355	2355	} -body {

2381	2381	destroy .m1
2382	2382	} -body {
2383	2383	menu .m1
2384		list [.m1 configure -postcommand "beep"] [.m1 cget -postcommand]
	2384	list [.m1 configure -postcommand "beep"] [.m1 cget -postcommand]
2385	2385	} -cleanup {
2386	2386	deleteWindows
2387	2387	} -result {{} beep}

2514	2514	test menu-11.4 {ConfigureMenuEntry} -setup {
2515	2515	deleteWindows
2516	2516	} -body {
2517		menu .m1
	2517	menu .m1
2518	2518	.m1 add command
2519	2519	list [.m1 entryconfigure 1 -accel "S"] [.m1 entrycget 1 -accel]
2520	2520	} -cleanup {

2588	2588	deleteWindows
2589	2589	} -body {
2590	2590	menu .m1
2591		menu .m2
	2591	menu .m2
2592	2592	.m2 add cascade -menu .m1
2593		menu .m3
	2593	menu .m3
2594	2594	.m3 add cascade -menu .m1
2595		menu .m4
	2595	menu .m4
2596	2596	.m4 add cascade -menu .m1
2597		menu .m5
	2597	menu .m5
2598	2598	.m5 add cascade
2599	2599	.m5 entryconfigure 1 -label "test" -menu .m1
2600	2600	} -cleanup {

2604	2604	deleteWindows
2605	2605	} -body {
2606	2606	menu .m1
2607		menu .m2
	2607	menu .m2
2608	2608	.m2 add cascade -menu .m1
2609		menu .m3
	2609	menu .m3
2610	2610	.m3 add cascade -menu .m1
2611		menu .m4
	2611	menu .m4
2612	2612	.m4 add cascade -menu .m1
2613	2613	.m3 entryconfigure 1 -label "test" -menu .m1
2614	2614	} -cleanup {

3235	3235
3236	3236	test menu-19.1 {TkPostCommand} -constraints nonUnixUserInteraction -setup {
3237	3237	deleteWindows
3238		} -body {
	3238	} -body {
3239	3239	menu .m1 -postcommand "set menu_test menu-19.1"
3240	3240	.m1 add command -label "menu-19.1 - hit Escape"
3241	3241	list [.m1 post 40 40] [.m1 unpost] [set menu_test]

3244	3244	} -result {menu-19.1 {} menu-19.1}
3245	3245	test menu-19.2 {TkPostCommand} -constraints nonUnixUserInteraction -setup {
3246	3246	deleteWindows
3247		} -body {
	3247	} -body {
3248	3248	menu .m1
3249	3249	.m1 add command -label "menu-19.2 - hit Escape"
3250	3250	list [.m1 post 40 40] [.m1 unpost]

3765	3765	test menu-32.2 {DeleteMenuCloneEntries} -setup {
3766	3766	deleteWindows
3767	3767	} -body {
3768
	3768
3769	3769	menu .m1
3770	3770	.m1 add command -label one
3771	3771	.m1 add command -label two

+6

-6

tests/menuDraw.test less more

75	75	menu .m1 -disabledforeground ""
76	76	} -cleanup {
77	77	deleteWindows
78		} -result {.m1}
	78	} -result {.m1}
79	79
80	80
81	81	test menuDraw-6.1 {TkMenuConfigureEntryDrawOptions - no tkfont specified} -setup {

320	320
321	321
322	322	test menuDraw-11.1 {TkMenuSelectImageProc - entry selected; redraw not pending} -constraints {
323		testImageType
	323	testImageType
324	324	} -setup {
325	325	deleteWindows
326	326	imageCleanup

337	337	imageCleanup
338	338	} -result {{} {}}
339	339	test menuDraw-11.2 {TkMenuSelectImageProc - entry selected; redraw pending} -constraints {
340		testImageType
	340	testImageType
341	341	} -setup {
342	342	deleteWindows
343	343	imageCleanup

353	353	imageCleanup
354	354	} -result {{} {}}
355	355	test menuDraw-11.3 {TkMenuSelectImageProc - entry not selected} -constraints {
356		testImageType
	356	testImageType
357	357	} -setup {
358	358	deleteWindows
359	359	imageCleanup

450	450	deleteWindows
451	451	} -result {}
452	452	test menuDraw-12.6 {Display menu - testing for extra space and menubars} -constraints {
453		unix
	453	unix
454	454	} -setup {
455	455	deleteWindows
456	456	} -body {

667	667	menu .m2
668	668	.m2 add command -label "Hit ESCAPE to get rid of this menu"
669	669	set tearoff [tk::TearOffMenu .m1 40 40]
670		$tearoff postcascade 0
	670	$tearoff postcascade 0
671	671	} -cleanup {
672	672	deleteWindows
673	673	} -result {}

+9

-9

tests/menubut.test less more

393	393	.mb1 configure -width 1i
394	394	} -cleanup {
395	395	deleteWindows
396		} -returnCodes error -result {expected integer but got "1i"}
	396	} -returnCodes error -result {expected integer but got "1i"}
397	397	test menubutton-4.2 {ConfigureMenuButton procedure} -setup {
398	398	deleteWindows
399	399	} -body {

450	450	".mb1 configure -width abc"}
451	451
452	452	test menubutton-4.7 {ConfigureMenuButton procedure} -constraints {
453		testImageType
	453	testImageType
454	454	} -setup {
455	455	deleteWindows
456	456	imageCleanup

463	463	imageCleanup
464	464	} -returnCodes error -result {bad screen distance "0.5x"}
465	465	test menubutton-4.8 {ConfigureMenuButton procedure} -constraints {
466		testImageType
	466	testImageType
467	467	} -setup {
468	468	deleteWindows
469	469	imageCleanup

498	498	deleteWindows
499	499	} -body {
500	500	menubutton .mb -text "Test"
501		.mb configure -direction badValue
	501	.mb configure -direction badValue
502	502	} -cleanup {
503	503	deleteWindows
504	504	} -returnCodes error -result {bad direction "badValue": must be above, below, flush, left, or right}

547	547	set extraWidth 0
548	548	}
549	549	test menubutton-7.1 {ComputeMenuButtonGeometry procedure} -constraints {
550		testImageType
	550	testImageType
551	551	} -setup {
552	552	deleteWindows
553	553	image create test image1

560	560	imageCleanup
561	561	} -result [list [expr {38 + $extraWidth}] 23]
562	562	test menubutton-7.2 {ComputeMenuButtonGeometry procedure} -constraints {
563		testImageType
	563	testImageType
564	564	} -setup {
565	565	deleteWindows
566	566	image create test image1

573	573	imageCleanup
574	574	} -result [list [expr {38 + $extraWidth}] 23]
575	575	test menubutton-7.3 {ComputeMenuButtonGeometry procedure} -constraints {
576		testImageType
	576	testImageType
577	577	} -setup {
578	578	deleteWindows
579	579	image create test image1

586	586	imageCleanup
587	587	} -result [list [expr {38 + $extraWidth}] 23]
588	588	test menubutton-7.4 {ComputeMenuButtonGeometry procedure} -constraints {
589		testImageType
	589	testImageType
590	590	} -setup {
591	591	deleteWindows
592	592	image create test image1

600	600	imageCleanup
601	601	} -result [list [expr {48 + $extraWidth}] 23]
602	602	test menubutton-7.5 {ComputeMenuButtonGeometry procedure} -constraints {
603		testImageType
	603	testImageType
604	604	} -setup {
605	605	deleteWindows
606	606	image create test image1

+92

-92

tests/message.test less more

11	11	eval tcltest::configure $argv
12	12
13	13
14		test message-1.1 {configuration option: "anchor"} -setup {
15		message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
	14	test message-1.1 {configuration option: "anchor"} -setup {
	15	message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
16	16	pack .m
17	17	update
18	18	} -body {

31	31	destroy .m
32	32	} -returnCodes {error} -result {bad anchor "bogus": must be n, ne, e, se, s, sw, w, nw, or center}
33	33
34		test message-1.3 {configuration option: "aspect"} -setup {
35		message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
36		pack .m
37		update
	34	test message-1.3 {configuration option: "aspect"} -setup {
	35	message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
	36	pack .m
	37	update
38	38	} -body {
39	39	.m configure -aspect 3
40	40	.m cget -aspect

51	51	destroy .m
52	52	} -returnCodes {error} -result {expected integer but got "bogus"}
53	53
54		test message-1.5 {configuration option: "background"} -setup {
55		message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
56		pack .m
57		update
	54	test message-1.5 {configuration option: "background"} -setup {
	55	message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
	56	pack .m
	57	update
58	58	} -body {
59	59	.m configure -background #ff0000
60	60	.m cget -background

71	71	destroy .m
72	72	} -returnCodes {error} -result {unknown color name "non-existent"}
73	73
74		test message-1.7 {configuration option: "bd"} -setup {
75		message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
76		pack .m
77		update
	74	test message-1.7 {configuration option: "bd"} -setup {
	75	message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
	76	pack .m
	77	update
78	78	} -body {
79	79	.m configure -bd 4
80	80	.m cget -bd

91	91	destroy .m
92	92	} -returnCodes {error} -result {bad screen distance "badValue"}
93	93
94		test message-1.9 {configuration option: "bg"} -setup {
95		message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
96		pack .m
97		update
98		} -body {
99		.m configure -bg #ff0000
	94	test message-1.9 {configuration option: "bg"} -setup {
	95	message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
	96	pack .m
	97	update
	98	} -body {
	99	.m configure -bg #ff0000
100	100	.m cget -bg
101	101	} -cleanup {
102	102	destroy .m

111	111	destroy .m
112	112	} -returnCodes {error} -result {unknown color name "non-existent"}
113	113
114		test message-1.11 {configuration option: "borderwidth"} -setup {
115		message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
116		pack .m
117		update
	114	test message-1.11 {configuration option: "borderwidth"} -setup {
	115	message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
	116	pack .m
	117	update
118	118	} -body {
119	119	.m configure -borderwidth 1.3
120	120	.m cget -borderwidth

131	131	destroy .m
132	132	} -returnCodes {error} -result {bad screen distance "badValue"}
133	133
134		test message-1.13 {configuration option: "cursor"} -setup {
135		message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
136		pack .m
137		update
	134	test message-1.13 {configuration option: "cursor"} -setup {
	135	message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
	136	pack .m
	137	update
138	138	} -body {
139	139	.m configure -cursor arrow
140	140	.m cget -cursor

151	151	destroy .m
152	152	} -returnCodes {error} -result {bad cursor spec "badValue"}
153	153
154		test message-1.15 {configuration option: "fg"} -setup {
155		message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
156		pack .m
157		update
	154	test message-1.15 {configuration option: "fg"} -setup {
	155	message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
	156	pack .m
	157	update
158	158	} -body {
159	159	.m configure -fg #00ff00
160	160	.m cget -fg

171	171	destroy .m
172	172	} -returnCodes {error} -result {unknown color name "badValue"}
173	173
174		test message-1.17 {configuration option: "font"} -setup {
175		message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
176		pack .m
177		update
	174	test message-1.17 {configuration option: "font"} -setup {
	175	message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
	176	pack .m
	177	update
178	178	} -body {
179	179	.m configure -font fixed
180	180	.m cget -font

191	191	destroy .m
192	192	} -returnCodes {error} -result {font "" doesn't exist}
193	193
194		test message-1.19 {configuration option: "-foreground"} -setup {
195		message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
196		pack .m
197		update
	194	test message-1.19 {configuration option: "-foreground"} -setup {
	195	message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
	196	pack .m
	197	update
198	198	} -body {
199	199	.m configure -foreground green
200		.m cget -foreground
	200	.m cget -foreground
201	201	} -cleanup {
202	202	destroy .m
203	203	} -result {green}

211	211	destroy .m
212	212	} -returnCodes {error} -result {unknown color name "badValue"}
213	213
214		test message-1.21 {configuration option: "highlightbackground"} -setup {
215		message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
216		pack .m
217		update
	214	test message-1.21 {configuration option: "highlightbackground"} -setup {
	215	message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
	216	pack .m
	217	update
218	218	} -body {
219	219	.m configure -highlightbackground #112233
220	220	.m cget -highlightbackground

231	231	destroy .m
232	232	} -returnCodes {error} -result {unknown color name "ugly"}
233	233
234		test message-1.23 {configuration option: "highlightcolor"} -setup {
235		message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
236		pack .m
237		update
	234	test message-1.23 {configuration option: "highlightcolor"} -setup {
	235	message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
	236	pack .m
	237	update
238	238	} -body {
239	239	.m configure -highlightcolor #123456
240		.m cget -highlightcolor
	240	.m cget -highlightcolor
241	241	} -cleanup {
242	242	destroy .m
243	243	} -result {#123456}

251	251	destroy .m
252	252	} -returnCodes {error} -result {unknown color name "non-existent"}
253	253
254		test message-1.25 {configuration option: "highlightthickness"} -setup {
255		message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
256		pack .m
257		update
	254	test message-1.25 {configuration option: "highlightthickness"} -setup {
	255	message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
	256	pack .m
	257	update
258	258	} -body {
259	259	.m configure -highlightthickness 2
260		.m cget -highlightthickness
	260	.m cget -highlightthickness
261	261	} -cleanup {
262	262	destroy .m
263	263	} -result {2}

271	271	destroy .m
272	272	} -returnCodes {error} -result {bad screen distance "badValue"}
273	273
274		test message-1.27 {configuration option: "justify"} -setup {
275		message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
276		pack .m
277		update
	274	test message-1.27 {configuration option: "justify"} -setup {
	275	message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
	276	pack .m
	277	update
278	278	} -body {
279	279	.m configure -justify right
280	280	.m cget -justify

291	291	destroy .m
292	292	} -returnCodes {error} -result {bad justification "bogus": must be left, right, or center}
293	293
294		test message-1.29 {configuration option: "padx"} -setup {
295		message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
296		pack .m
297		update
	294	test message-1.29 {configuration option: "padx"} -setup {
	295	message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
	296	pack .m
	297	update
298	298	} -body {
299	299	.m configure -padx 12m
300		.m cget -padx
	300	.m cget -padx
301	301	} -cleanup {
302	302	destroy .m
303	303	} -result {12m}

311	311	destroy .m
312	312	} -returnCodes {error} -result {bad screen distance "420x"}
313	313
314		test message-1.31 {configuration option: "pady"} -setup {
315		message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
316		pack .m
317		update
	314	test message-1.31 {configuration option: "pady"} -setup {
	315	message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
	316	pack .m
	317	update
318	318	} -body {
319	319	.m configure -pady 12m
320	320	.m cget -pady

331	331	destroy .m
332	332	} -returnCodes {error} -result {bad screen distance "420x"}
333	333
334		test message-1.33 {configuration option: "relief"} -setup {
335		message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
336		pack .m
337		update
	334	test message-1.33 {configuration option: "relief"} -setup {
	335	message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
	336	pack .m
	337	update
338	338	} -body {
339	339	.m configure -relief ridge
340		.m cget -relief
	340	.m cget -relief
341	341	} -cleanup {
342	342	destroy .m
343	343	} -result {ridge}

351	351	destroy .m
352	352	} -returnCodes {error} -result {bad relief "badValue": must be flat, groove, raised, ridge, solid, or sunken}
353	353
354		test message-1.35 {configuration options: "text"} -setup {
355		message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
356		pack .m
357		update
	354	test message-1.35 {configuration options: "text"} -setup {
	355	message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
	356	pack .m
	357	update
358	358	} -body {
359	359	.m configure -text "Sample text"
360	360	.m cget -text

362	362	destroy .m
363	363	} -result {Sample text}
364	364
365		test message-1.36 {configuration option: "textvariable"} -setup {
366		message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
367		pack .m
368		update
	365	test message-1.36 {configuration option: "textvariable"} -setup {
	366	message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
	367	pack .m
	368	update
369	369	} -body {
370	370	.m configure -textvariable i
371		.m cget -textvariable
	371	.m cget -textvariable
372	372	} -cleanup {
373	373	destroy .m
374	374	} -result {i}
375	375
376		test message-1.37 {configuration option: "width"} -setup {
377		message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
378		pack .m
379		update
	376	test message-1.37 {configuration option: "width"} -setup {
	377	message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
	378	pack .m
	379	update
380	380	} -body {
381	381	.m configure -width 2
382		.m cget -width
	382	.m cget -width
383	383	} -cleanup {
384	384	destroy .m
385	385	} -result {2}

402	402	message foo
403	403	} -returnCodes {error} -result {bad window path name "foo"}
404	404	test message-2.3 {Tk_MessageObjCmd procedure} -body {
405		catch {message foo}
	405	catch {message foo}
406	406	winfo child .
407	407	} -result {}
408	408

410	410	message .s -gorp dump
411	411	} -returnCodes {error} -result {unknown option "-gorp"}
412	412	test message-2.5 {Tk_MessageObjCmd procedure} -body {
413		catch {message .s -gorp dump}
	413	catch {message .s -gorp dump}
414	414	winfo child .
415		} -result {}
	415	} -result {}
416	416
417	417
418	418	test message-3.1 {MessageWidgetObjCmd procedure} -setup {
419	419	message .m
420	420	} -body {
421		.m
	421	.m
422	422	} -cleanup {
423	423	destroy .m
424	424	} -returnCodes error -result {wrong # args: should be ".m option ?arg ...?"}

441	441	message .m
442	442	} -body {
443	443	.m configure -text foobar
444		lindex [.m configure -text] 4
	444	lindex [.m configure -text] 4
445	445	} -cleanup {
446	446	destroy .m
447	447	} -result {foobar}

+45

-45

tests/msgbox.test less more

120	120	# (type) x (icon).
121	121	#
122	122	test msgbox-2.1 {tk_messageBox command} -constraints {
123		nonUnixUserInteraction
	123	nonUnixUserInteraction
124	124	} -body {
125	125	ChooseMsg . abort
126	126	tk_messageBox -title Hi -message "Please press abort" -type abortretryignore
127	127	} -result {abort}
128	128	test msgbox-2.2 {tk_messageBox command -icon option} -constraints {
129		nonUnixUserInteraction
	129	nonUnixUserInteraction
130	130	} -body {
131	131	ChooseMsg . abort
132	132	tk_messageBox -title Hi -message "Please press abort" \
133	133	-type abortretryignore -icon warning
134	134	} -result {abort}
135	135	test msgbox-2.3 {tk_messageBox command -icon option} -constraints {
136		nonUnixUserInteraction
	136	nonUnixUserInteraction
137	137	} -body {
138	138	ChooseMsg . abort
139	139	tk_messageBox -title Hi -message "Please press abort" \
140	140	-type abortretryignore -icon error
141	141	} -result {abort}
142	142	test msgbox-2.4 {tk_messageBox command -icon option} -constraints {
143		nonUnixUserInteraction
	143	nonUnixUserInteraction
144	144	} -body {
145	145	ChooseMsg . abort
146	146	tk_messageBox -title Hi -message "Please press abort" \
147	147	-type abortretryignore -icon info
148	148	} -result {abort}
149	149	test msgbox-2.5 {tk_messageBox command -icon option} -constraints {
150		nonUnixUserInteraction
	150	nonUnixUserInteraction
151	151	} -body {
152	152	ChooseMsg . abort
153	153	tk_messageBox -title Hi -message "Please press abort" \
154	154	-type abortretryignore -icon question
155	155	} -result {abort}
156	156	test msgbox-2.6 {tk_messageBox command} -constraints {
157		nonUnixUserInteraction
	157	nonUnixUserInteraction
158	158	} -body {
159	159	ChooseMsg . abort
160	160	tk_messageBox -title Hi -message "Please press abort" \
161	161	-type abortretryignore -default abort
162	162	} -result {abort}
163	163	test msgbox-2.7 {tk_messageBox command} -constraints {
164		nonUnixUserInteraction
	164	nonUnixUserInteraction
165	165	} -body {
166	166	ChooseMsg . retry
167	167	tk_messageBox -title Hi -message "Please press retry" \
168	168	-type abortretryignore -default retry
169	169	} -result {retry}
170	170	test msgbox-2.8 {tk_messageBox command} -constraints {
171		nonUnixUserInteraction
	171	nonUnixUserInteraction
172	172	} -body {
173	173	ChooseMsg . ignore
174	174	tk_messageBox -title Hi -message "Please press ignore" \
175	175	-type abortretryignore -default ignore
176	176	} -result {ignore}
177	177	test msgbox-2.9 {tk_messageBox command} -constraints {
178		nonUnixUserInteraction
	178	nonUnixUserInteraction
179	179	} -body {
180	180	ChooseMsg . ok
181	181	tk_messageBox -title Hi -message "Please press ok" -type ok
182	182	} -result {ok}
183	183	test msgbox-2.10 {tk_messageBox command -icon option} -constraints {
184		nonUnixUserInteraction
	184	nonUnixUserInteraction
185	185	} -body {
186	186	ChooseMsg . ok
187	187	tk_messageBox -title Hi -message "Please press ok" \
188	188	-type ok -icon warning
189	189	} -result {ok}
190	190	test msgbox-2.11 {tk_messageBox command -icon option} -constraints {
191		nonUnixUserInteraction
	191	nonUnixUserInteraction
192	192	} -body {
193	193	ChooseMsg . ok
194	194	tk_messageBox -title Hi -message "Please press ok" \
195	195	-type ok -icon error
196	196	} -result {ok}
197	197	test msgbox-2.12 {tk_messageBox command -icon option} -constraints {
198		nonUnixUserInteraction
	198	nonUnixUserInteraction
199	199	} -body {
200	200	ChooseMsg . ok
201	201	tk_messageBox -title Hi -message "Please press ok" \
202	202	-type ok -icon info
203	203	} -result {ok}
204	204	test msgbox-2.13 {tk_messageBox command -icon option} -constraints {
205		nonUnixUserInteraction
	205	nonUnixUserInteraction
206	206	} -body {
207	207	ChooseMsg . ok
208	208	tk_messageBox -title Hi -message "Please press ok" \
209	209	-type ok -icon question
210	210	} -result {ok}
211	211	test msgbox-2.14 {tk_messageBox command} -constraints {
212		nonUnixUserInteraction
	212	nonUnixUserInteraction
213	213	} -body {
214	214	ChooseMsg . ok
215	215	tk_messageBox -title Hi -message "Please press ok" \
216	216	-type ok -default ok
217	217	} -result {ok}
218	218	test msgbox-2.15 {tk_messageBox command} -constraints {
219		nonUnixUserInteraction
	219	nonUnixUserInteraction
220	220	} -body {
221	221	ChooseMsg . ok
222	222	tk_messageBox -title Hi -message "Please press ok" -type okcancel
223	223	} -result {ok}
224	224	test msgbox-2.16 {tk_messageBox command -icon option} -constraints {
225		nonUnixUserInteraction
	225	nonUnixUserInteraction
226	226	} -body {
227	227	ChooseMsg . ok
228	228	tk_messageBox -title Hi -message "Please press ok" \
229	229	-type okcancel -icon warning
230	230	} -result {ok}
231	231	test msgbox-2.17 {tk_messageBox command -icon option} -constraints {
232		nonUnixUserInteraction
	232	nonUnixUserInteraction
233	233	} -body {
234	234	ChooseMsg . ok
235	235	tk_messageBox -title Hi -message "Please press ok" \
236	236	-type okcancel -icon error
237	237	} -result {ok}
238	238	test msgbox-2.18 {tk_messageBox command -icon option} -constraints {
239		nonUnixUserInteraction
	239	nonUnixUserInteraction
240	240	} -body {
241	241	ChooseMsg . ok
242	242	tk_messageBox -title Hi -message "Please press ok" \
243	243	-type okcancel -icon info
244	244	} -result {ok}
245	245	test msgbox-2.19 {tk_messageBox command -icon option} -constraints {
246		nonUnixUserInteraction
	246	nonUnixUserInteraction
247	247	} -body {
248	248	ChooseMsg . ok
249	249	tk_messageBox -title Hi -message "Please press ok" \
250	250	-type okcancel -icon question
251	251	} -result {ok}
252	252	test msgbox-2.20 {tk_messageBox command} -constraints {
253		nonUnixUserInteraction
	253	nonUnixUserInteraction
254	254	} -body {
255	255	ChooseMsg . ok
256	256	tk_messageBox -title Hi -message "Please press ok" \
257	257	-type okcancel -default ok
258	258	} -result {ok}
259	259	test msgbox-2.21 {tk_messageBox command} -constraints {
260		nonUnixUserInteraction
	260	nonUnixUserInteraction
261	261	} -body {
262	262	ChooseMsg . cancel
263	263	tk_messageBox -title Hi -message "Please press cancel" \
264	264	-type okcancel -default cancel
265	265	} -result {cancel}
266	266	test msgbox-2.22 {tk_messageBox command} -constraints {
267		nonUnixUserInteraction
	267	nonUnixUserInteraction
268	268	} -body {
269	269	ChooseMsg . retry
270	270	tk_messageBox -title Hi -message "Please press retry" -type retrycancel
271	271	} -result {retry}
272	272	test msgbox-2.23 {tk_messageBox command -icon option} -constraints {
273		nonUnixUserInteraction
	273	nonUnixUserInteraction
274	274	} -body {
275	275	ChooseMsg . retry
276	276	tk_messageBox -title Hi -message "Please press retry" \
277	277	-type retrycancel -icon warning
278	278	} -result {retry}
279	279	test msgbox-2.24 {tk_messageBox command -icon option} -constraints {
280		nonUnixUserInteraction
	280	nonUnixUserInteraction
281	281	} -body {
282	282	ChooseMsg . retry
283	283	tk_messageBox -title Hi -message "Please press retry" \
284	284	-type retrycancel -icon error
285	285	} -result {retry}
286	286	test msgbox-2.25 {tk_messageBox command -icon option} -constraints {
287		nonUnixUserInteraction
	287	nonUnixUserInteraction
288	288	} -body {
289	289	ChooseMsg . retry
290	290	tk_messageBox -title Hi -message "Please press retry" \
291	291	-type retrycancel -icon info
292	292	} -result {retry}
293	293	test msgbox-2.26 {tk_messageBox command -icon option} -constraints {
294		nonUnixUserInteraction
	294	nonUnixUserInteraction
295	295	} -body {
296	296	ChooseMsg . retry
297	297	tk_messageBox -title Hi -message "Please press retry" \
298	298	-type retrycancel -icon question
299	299	} -result {retry}
300	300	test msgbox-2.27 {tk_messageBox command} -constraints {
301		nonUnixUserInteraction
	301	nonUnixUserInteraction
302	302	} -body {
303	303	ChooseMsg . retry
304	304	tk_messageBox -title Hi -message "Please press retry" \
305	305	-type retrycancel -default retry
306	306	} -result {retry}
307	307	test msgbox-2.28 {tk_messageBox command} -constraints {
308		nonUnixUserInteraction
	308	nonUnixUserInteraction
309	309	} -body {
310	310	ChooseMsg . cancel
311	311	tk_messageBox -title Hi -message "Please press cancel" \
312	312	-type retrycancel -default cancel
313	313	} -result {cancel}
314	314	test msgbox-2.29 {tk_messageBox command} -constraints {
315		nonUnixUserInteraction
	315	nonUnixUserInteraction
316	316	} -body {
317	317	ChooseMsg . yes
318	318	tk_messageBox -title Hi -message "Please press yes" -type yesno
319	319	} -result {yes}
320	320	test msgbox-2.30 {tk_messageBox command -icon option} -constraints {
321		nonUnixUserInteraction
	321	nonUnixUserInteraction
322	322	} -body {
323	323	ChooseMsg . yes
324	324	tk_messageBox -title Hi -message "Please press yes" \
325	325	-type yesno -icon warning
326	326	} -result {yes}
327	327	test msgbox-2.31 {tk_messageBox command -icon option} -constraints {
328		nonUnixUserInteraction
	328	nonUnixUserInteraction
329	329	} -body {
330	330	ChooseMsg . yes
331	331	tk_messageBox -title Hi -message "Please press yes" \
332	332	-type yesno -icon error
333	333	} -result {yes}
334	334	test msgbox-2.32 {tk_messageBox command -icon option} -constraints {
335		nonUnixUserInteraction
	335	nonUnixUserInteraction
336	336	} -body {
337	337	ChooseMsg . yes
338	338	tk_messageBox -title Hi -message "Please press yes" \
339	339	-type yesno -icon info
340	340	} -result {yes}
341	341	test msgbox-2.33 {tk_messageBox command -icon option} -constraints {
342		nonUnixUserInteraction
	342	nonUnixUserInteraction
343	343	} -body {
344	344	ChooseMsg . yes
345	345	tk_messageBox -title Hi -message "Please press yes" \
346	346	-type yesno -icon question
347	347	} -result {yes}
348	348	test msgbox-2.34 {tk_messageBox command} -constraints {
349		nonUnixUserInteraction
	349	nonUnixUserInteraction
350	350	} -body {
351	351	ChooseMsg . yes
352	352	tk_messageBox -title Hi -message "Please press yes" \
353	353	-type yesno -default yes
354	354	} -result {yes}
355	355	test msgbox-2.35 {tk_messageBox command} -constraints {
356		nonUnixUserInteraction
	356	nonUnixUserInteraction
357	357	} -body {
358	358	ChooseMsg . no
359	359	tk_messageBox -title Hi -message "Please press no" \
360	360	-type yesno -default no
361	361	} -result {no}
362	362	test msgbox-2.36 {tk_messageBox command} -constraints {
363		nonUnixUserInteraction
	363	nonUnixUserInteraction
364	364	} -body {
365	365	ChooseMsg . yes
366	366	tk_messageBox -title Hi -message "Please press yes" -type yesnocancel
367	367	} -result {yes}
368	368	test msgbox-2.37 {tk_messageBox command -icon option} -constraints {
369		nonUnixUserInteraction
	369	nonUnixUserInteraction
370	370	} -body {
371	371	ChooseMsg . yes
372	372	tk_messageBox -title Hi -message "Please press yes" \
373	373	-type yesnocancel -icon warning
374	374	} -result {yes}
375	375	test msgbox-2.38 {tk_messageBox command -icon option} -constraints {
376		nonUnixUserInteraction
	376	nonUnixUserInteraction
377	377	} -body {
378	378	ChooseMsg . yes
379	379	tk_messageBox -title Hi -message "Please press yes" \
380	380	-type yesnocancel -icon error
381	381	} -result {yes}
382	382	test msgbox-2.39 {tk_messageBox command -icon option} -constraints {
383		nonUnixUserInteraction
	383	nonUnixUserInteraction
384	384	} -body {
385	385	ChooseMsg . yes
386	386	tk_messageBox -title Hi -message "Please press yes" \
387	387	-type yesnocancel -icon info
388	388	} -result {yes}
389	389	test msgbox-2.40 {tk_messageBox command -icon option} -constraints {
390		nonUnixUserInteraction
	390	nonUnixUserInteraction
391	391	} -body {
392	392	ChooseMsg . yes
393	393	tk_messageBox -title Hi -message "Please press yes" \
394	394	-type yesnocancel -icon question
395	395	} -result {yes}
396	396	test msgbox-2.41 {tk_messageBox command} -constraints {
397		nonUnixUserInteraction
	397	nonUnixUserInteraction
398	398	} -body {
399	399	ChooseMsg . yes
400	400	tk_messageBox -title Hi -message "Please press yes" \
401	401	-type yesnocancel -default yes
402	402	} -result {yes}
403	403	test msgbox-2.42 {tk_messageBox command} -constraints {
404		nonUnixUserInteraction
	404	nonUnixUserInteraction
405	405	} -body {
406	406	ChooseMsg . no
407	407	tk_messageBox -title Hi -message "Please press no" \
408	408	-type yesnocancel -default no
409	409	} -result {no}
410	410	test msgbox-2.43 {tk_messageBox command} -constraints {
411		nonUnixUserInteraction
	411	nonUnixUserInteraction
412	412	} -body {
413	413	ChooseMsg . cancel
414	414	tk_messageBox -title Hi -message "Please press cancel" \

418	418
419	419	# These tests will hang your test suite if they fail.
420	420	test msgbox-3.1 {tk_messageBox handles withdrawn parent} -constraints {
421		nonUnixUserInteraction
	421	nonUnixUserInteraction
422	422	} -body {
423	423	wm withdraw .
424	424	ChooseMsg . "ok"

429	429	} -result {ok}
430	430
431	431	test msgbox-3.2 {tk_messageBox handles iconified parent} -constraints {
432		nonUnixUserInteraction
	432	nonUnixUserInteraction
433	433	} -body {
434	434	wm iconify .
435	435	ChooseMsg . "ok"

+5

-5

tests/oldpack.test less more

451	451	} -returnCodes error -result {wrong # args: should be "pack option arg ?arg ...?"}
452	452	test oldpack-8.3 {syntax errors} -body {
453	453	pack gorp foo
454		} -returnCodes error -result {bad option "gorp": must be configure, forget, info, propagate, or slaves}
	454	} -returnCodes error -result {bad option "gorp": must be configure, content, forget, info, propagate, or slaves}
455	455	test oldpack-8.4 {syntax errors} -body {
456	456	pack a .pack
457		} -returnCodes error -result {bad option "a": must be configure, forget, info, propagate, or slaves}
	457	} -returnCodes error -result {bad option "a": must be configure, content, forget, info, propagate, or slaves}
458	458	test oldpack-8.5 {syntax errors} -body {
459	459	pack after foobar
460	460	} -returnCodes error -result {bad window path name "foobar"}

526	526	pack append .pack .pack.blue {top fillx frame n} \
527	527	.pack.red {bottom filly frame s} .pack.green {left fill frame w} \
528	528	.pack.violet {right expand frame e}
529		list [pack slaves .pack] [pack info .pack.blue] [pack info .pack.red] \
	529	list [pack content .pack] [pack info .pack.blue] [pack info .pack.red] \
530	530	[pack info .pack.green] [pack info .pack.violet]
531	531	} -result {{.pack.blue .pack.red .pack.green .pack.violet} {-in .pack -anchor n -expand 0 -fill x -ipadx 0 -ipady 0 -padx 0 -pady 0 -side top} {-in .pack -anchor s -expand 0 -fill y -ipadx 0 -ipady 0 -padx 0 -pady 0 -side bottom} {-in .pack -anchor w -expand 0 -fill both -ipadx 0 -ipady 0 -padx 0 -pady 0 -side left} {-in .pack -anchor e -expand 1 -fill none -ipadx 0 -ipady 0 -padx 0 -pady 0 -side right}}
532	532	test oldpack-9.2 {information output} -body {
533	533	pack append .pack .pack.blue {padx 10 frame nw} \
534	534	.pack.red {pady 20 frame ne} .pack.green {frame se} \
535	535	.pack.violet {frame sw}
536		list [pack slaves .pack] [pack info .pack.blue] [pack info .pack.red] \
	536	list [pack content .pack] [pack info .pack.blue] [pack info .pack.red] \
537	537	[pack info .pack.green] [pack info .pack.violet]
538	538	} -result {{.pack.blue .pack.red .pack.green .pack.violet} {-in .pack -anchor nw -expand 0 -fill none -ipadx 0 -ipady 0 -padx 5 -pady 0 -side top} {-in .pack -anchor ne -expand 0 -fill none -ipadx 0 -ipady 0 -padx 0 -pady 10 -side top} {-in .pack -anchor se -expand 0 -fill none -ipadx 0 -ipady 0 -padx 0 -pady 0 -side top} {-in .pack -anchor sw -expand 0 -fill none -ipadx 0 -ipady 0 -padx 0 -pady 0 -side top}}
539	539	test oldpack-9.3 {information output} -body {
540	540	pack append .pack .pack.blue {frame center} .pack.red {frame center} \
541	541	.pack.green {frame c} .pack.violet {frame c}
542		list [pack slaves .pack] [pack info .pack.blue] [pack info .pack.red] \
	542	list [pack content .pack] [pack info .pack.blue] [pack info .pack.red] \
543	543	[pack info .pack.green] [pack info .pack.violet]
544	544	} -result {{.pack.blue .pack.red .pack.green .pack.violet} {-in .pack -anchor center -expand 0 -fill none -ipadx 0 -ipady 0 -padx 0 -pady 0 -side top} {-in .pack -anchor center -expand 0 -fill none -ipadx 0 -ipady 0 -padx 0 -pady 0 -side top} {-in .pack -anchor center -expand 0 -fill none -ipadx 0 -ipady 0 -padx 0 -pady 0 -side top} {-in .pack -anchor center -expand 0 -fill none -ipadx 0 -ipady 0 -padx 0 -pady 0 -side top}}
545	545

+1

-1

tests/option.file1 less more

12	12	*x 4: brown
13	13	# More comments, this time delimited by hash-marks.
14	14	# Comment-line with space.
15		*x6:
	15	*x6:
16	16	*x9: \ \ \\\101\n
17	17	# comment line as last line of file.

+1

-1

tests/option.file3 less more

12	12	*x 4: brówn
13	13	# More comments, this time delimited by hash-marks.
14	14	# Comment-line with space.
15		*x6:
	15	*x6:
16	16	*x9: \ \ \\\101\n
17	17	# comment line as last line of file.

+1

-1

tests/option.test less more

284	284
285	285	# Test the major priority levels (widgetDefault, etc.)
286	286
287		# Configurations for tests 13.*
	287	# Configurations for tests 13.*
288	288	option clear
289	289	option add $appName.op1.a 100 100
290	290	option add $appName.op1.A interactive interactive

+46

-37

tests/pack.test less more

10	10	tcltest::loadTestedCommands
11	11	namespace import -force tcltest::test
12	12
	13	testConstraint failsOnUbuntu [expr {![info exists ::env(CI)] \|\| ![string match Linux $::tcl_platform(os)]}]
	14	testConstraint failsOnXQuarz [expr {$tcl_platform(os) ne "Darwin" \|\| [tk windowingsystem] ne "x11" }]
13	15
14	16	# Create some test windows.
15	17

877	879	} -body {
878	880	pack .pack.a .pack.b .pack.c .pack.d -side top
879	881	pack .pack.a -after .pack.b
880		pack slaves .pack
	882	pack content .pack
881	883	} -result {.pack.b .pack.a .pack.c .pack.d}
882	884	test pack-9.2 {window ordering} -setup {
883	885	pack forget .pack.a .pack.b .pack.c .pack.d
884	886	} -body {
885	887	pack .pack.a .pack.b .pack.c .pack.d -side top
886	888	pack .pack.a -after .pack.a
887		pack slaves .pack
	889	pack content .pack
888	890	} -result {.pack.a .pack.b .pack.c .pack.d}
889	891	test pack-9.3 {window ordering} -setup {
890	892	pack forget .pack.a .pack.b .pack.c .pack.d
891	893	} -body {
892	894	pack .pack.a .pack.b .pack.c .pack.d -side top
893	895	pack .pack.a -before .pack.d
894		pack slaves .pack
	896	pack content .pack
895	897	} -result {.pack.b .pack.c .pack.a .pack.d}
896	898	test pack-9.4 {window ordering} -setup {
897	899	pack forget .pack.a .pack.b .pack.c .pack.d
898	900	} -body {
899	901	pack .pack.a .pack.b .pack.c .pack.d -side top
900	902	pack .pack.d -before .pack.a
901		pack slaves .pack
	903	pack content .pack
902	904	} -result {.pack.d .pack.a .pack.b .pack.c}
903	905	test pack-9.5 {window ordering} -setup {
904	906	pack forget .pack.a .pack.b .pack.c .pack.d

906	908	pack .pack.a .pack.b .pack.c .pack.d -side top
907	909	pack propagate .pack.c 0
908	910	pack .pack.a -in .pack.c
909		list [pack slaves .pack] [pack slaves .pack.c]
	911	list [pack content .pack] [pack content .pack.c]
910	912	} -result {{.pack.b .pack.c .pack.d} .pack.a}
911	913	test pack-9.6 {window ordering} -setup {
912	914	pack forget .pack.a .pack.b .pack.c .pack.d
913	915	} -body {
914	916	pack .pack.a .pack.b .pack.c .pack.d -side top
915	917	pack .pack.a -in .pack
916		pack slaves .pack
	918	pack content .pack
917	919	} -result {.pack.b .pack.c .pack.d .pack.a}
918	920	test pack-9.7 {window ordering} -setup {
919	921	pack forget .pack.a .pack.b .pack.c .pack.d
920	922	} -body {
921	923	pack .pack.a .pack.b .pack.c .pack.d -side top
922	924	pack .pack.a -padx 0
923		pack slaves .pack
	925	pack content .pack
924	926	} -result {.pack.a .pack.b .pack.c .pack.d}
925	927	test pack-9.8 {window ordering} -setup {
926	928	pack forget .pack.a .pack.b .pack.c .pack.d
927	929	} -body {
928	930	pack .pack.a .pack.b .pack.c
929	931	pack .pack.d
930		pack slaves .pack
	932	pack content .pack
931	933	} -result {.pack.a .pack.b .pack.c .pack.d}
932	934	test pack-9.9 {window ordering} -setup {
933	935	pack forget .pack.a .pack.b .pack.c .pack.d
934	936	} -body {
935	937	pack .pack.a .pack.b .pack.c .pack.d
936	938	pack .pack.b .pack.d .pack.c -before .pack.a
937		pack slaves .pack
	939	pack content .pack
938	940	} -result {.pack.b .pack.d .pack.c .pack.a}
939	941	test pack-9.10 {window ordering} -setup {
940	942	pack forget .pack.a .pack.b .pack.c .pack.d
941	943	} -body {
942	944	pack .pack.a .pack.b .pack.c .pack.d
943	945	pack .pack.a .pack.c .pack.d .pack.b -after .pack.a
944		pack slaves .pack
	946	pack content .pack
945	947	} -result {.pack.a .pack.c .pack.d .pack.b}
946	948
947	949

962	964	pack .pack.a -pady 14
963	965	pack info .pack.a
964	966	} -result {-in .pack -anchor n -expand 1 -fill both -ipadx 3 -ipady 4 -padx 1 -pady 14 -side bottom}
965		test pack-10.3 {bad -in window does not change master} -setup {
	967	test pack-10.3 {bad -in window does not change container window} -setup {
966	968	pack forget .pack.a .pack.b .pack.c .pack.d
967	969	} -body {
968	970	set result [list [winfo manager .pack.a]]
969	971	catch {pack .pack.a -in .pack.a}
970	972	lappend result [winfo manager .pack.a]
971	973	} -result {{} {}}
972		test pack-10.4 {bad -in window does not change master} -setup {
	974	test pack-10.4 {bad -in window does not change container window} -setup {
973	975	pack forget .pack.a .pack.b .pack.c .pack.d
974	976	} -body {
975	977	winfo manager .pack.a

1146	1148	pack forget .pack.a .pack.b .pack.c .pack.d
1147	1149	} -body {
1148	1150	pack configure .pack.b .pack.c
1149		pack slaves .pack
	1151	pack content .pack
1150	1152	} -result {.pack.b .pack.c}
1151	1153	test pack-12.5 {command options and errors} -setup {
1152	1154	pack forget .pack.a .pack.b .pack.c .pack.d

1310	1312	} -body {
1311	1313	pack .pack.a .pack.b .pack.c .pack.d
1312	1314	pack forget .pack.a .pack.d
1313		pack slaves .pack
	1315	pack content .pack
1314	1316	} -result {.pack.b .pack.c}
1315	1317	test pack-12.37 {command options and errors} -setup {
1316	1318	pack forget .pack.a .pack.b .pack.c .pack.d

1351	1353	test pack-12.42 {command options and errors} -setup {
1352	1354	pack forget .pack.a .pack.b .pack.c .pack.d
1353	1355	} -body {
1354		pack slaves
	1356	pack content
1355	1357	} -returnCodes error -result {wrong # args: should be "pack option arg ?arg ...?"}
1356	1358	test pack-12.43 {command options and errors} -setup {
1357	1359	pack forget .pack.a .pack.b .pack.c .pack.d
1358	1360	} -body {
1359		pack slaves a b
1360		} -returnCodes error -result {wrong # args: should be "pack slaves window"}
	1361	pack content a b
	1362	} -returnCodes error -result {wrong # args: should be "pack content window"}
1361	1363	test pack-12.44 {command options and errors} -setup {
1362	1364	pack forget .pack.a .pack.b .pack.c .pack.d
1363	1365	} -body {
1364		pack slaves .x
	1366	pack content .x
1365	1367	} -returnCodes error -result {bad window path name ".x"}
1366	1368	test pack-12.45 {command options and errors} -setup {
1367	1369	pack forget .pack.a .pack.b .pack.c .pack.d
1368	1370	} -body {
1369		pack slaves .pack.a
	1371	pack content .pack.a
1370	1372	} -returnCodes ok -result {}
1371	1373	test pack-12.46 {command options and errors} -setup {
1372	1374	pack forget .pack.a .pack.b .pack.c .pack.d
1373	1375	} -body {
1374	1376	pack lousy .pack
1375		} -returnCodes error -result {bad option "lousy": must be configure, forget, info, propagate, or slaves}
	1377	} -returnCodes error -result {bad option "lousy": must be configure, content, forget, info, propagate, or slaves}
1376	1378
1377	1379
1378	1380	test pack-13.1 {window deletion} -setup {

1384	1386	update
1385	1387	destroy .pack.d
1386	1388	update
1387		set result [list [pack slaves .pack] [winfo geometry .pack.a] \
	1389	set result [list [pack content .pack] [winfo geometry .pack.a] \
1388	1390	[winfo geometry .pack.b] [winfo geometry .pack.c]]
1389	1391	} -result {{.pack.right .pack.bottom .pack.a .pack.b .pack.c} 20x40+30+0 50x30+15+40 80x80+0+70}
1390	1392

1527	1529	} -result {{} pack {}}
1528	1530
1529	1531
1530		test pack-17.1 {PackLostSlaveProc procedure} -setup {
	1532	test pack-17.1 {PackLostContentProc procedure} -setup {
1531	1533	pack forget .pack.a .pack.b .pack.c .pack.d
1532	1534	} -body {
1533	1535	pack .pack.a

1536	1538	update
1537	1539	list [winfo manager .pack.a] [winfo geometry .pack.a]
1538	1540	} -result {place 20x40+40+10}
1539		test pack-17.2 {PackLostSlaveProc procedure} -setup {
	1541	test pack-17.2 {PackLostContentProc procedure} -setup {
1540	1542	pack forget .pack.a .pack.b .pack.c .pack.d
1541	1543	} -body {
1542	1544	pack .pack.a

1548	1550	pack info .pack.a
1549	1551	} -returnCodes error -result {window ".pack.a" isn't packed}
1550	1552
1551
1552		test pack-18.1 {unmap slaves when master unmapped} -constraints {
1553		tempNotPc
	1553	if {[tk windowingsystem] ne "aqua"} {
	1554	proc packUpdate {} {
	1555	update
	1556	}
	1557	} else {
	1558	proc packUpdate {} {
	1559	}
	1560	}
	1561
	1562	test pack-18.1 {unmap content when container unmapped} -constraints {
	1563	tempNotPc failsOnUbuntu failsOnXQuarz
1554	1564	} -setup {
1555	1565	eval destroy [winfo child .pack]
1556	1566	} -body {

1568	1578	eval destroy [winfo child .pack]
1569	1579	frame .pack.a -width 100 -height 50 -relief raised -bd 2
1570	1580	pack .pack.a
1571		update
	1581	update idletasks
1572	1582	set result [winfo ismapped .pack.a]
1573	1583	wm iconify .pack
1574		update
1575	1584	lappend result [winfo ismapped .pack.a]
1576	1585	.pack.a configure -width 200 -height 75
1577		update
	1586	update idletasks
1578	1587	lappend result [winfo width .pack.a ] [winfo height .pack.a] \
1579	1588	[winfo ismapped .pack.a]
1580	1589	wm deiconify .pack
1581		update
	1590	packUpdate
1582	1591	lappend result [winfo ismapped .pack.a]
1583	1592	} -result {1 0 200 75 0 1}
1584		test pack-18.2 {unmap slaves when master unmapped} -setup {
	1593
	1594	test pack-18.2 {unmap content when container unmapped} -constraints {failsOnUbuntu failsOnXQuarz} -setup {
1585	1595	eval destroy [winfo child .pack]
1586	1596	} -body {
1587	1597

1594	1604	frame .pack.b -width 70 -height 30 -relief sunken -bd 2
1595	1605	pack .pack.a
1596	1606	pack .pack.b -in .pack.a
1597		update
	1607	update idletasks
1598	1608	set result [winfo ismapped .pack.b]
1599	1609	wm iconify .pack
1600		update
1601	1610	lappend result [winfo ismapped .pack.b]
1602	1611	.pack.b configure -width 100 -height 30
1603		update
	1612	update idletasks
1604	1613	lappend result [winfo width .pack.b ] [winfo height .pack.b] \
1605	1614	[winfo ismapped .pack.b]
1606	1615	wm deiconify .pack
1607		update
	1616	packUpdate
1608	1617	lappend result [winfo ismapped .pack.b]
1609	1618	} -result {1 0 100 30 0 1}
1610	1619
1611	1620
1612	1621	test pack-19.1 {test respect for internalborder} -setup {
1613		catch {eval pack forget [pack slaves .pack]}
	1622	catch {eval pack forget [pack content .pack]}
1614	1623	destroy .pack.l .pack.lf
1615	1624	} -body {
1616	1625	wm geometry .pack 200x200

1628	1637	destroy .pack.l .pack.lf
1629	1638	} -result {196x188+2+10 177x186+5+7}
1630	1639	test pack-19.2 {test support for minreqsize} -setup {
1631		catch {eval pack forget [pack slaves .pack]}
	1640	catch {eval pack forget [pack content .pack]}
1632	1641	destroy .pack.l .pack.lf
1633	1642	} -body {
1634	1643	wm geometry .pack {}

+142

-142

tests/packgrid.test less more

9	9	tcltest::loadTestedCommands
10	10	namespace import -force tcltest::*
11	11
12		test packgrid-1.1 {pack and grid in same master} -setup {
	12	test packgrid-1.1 {pack and grid in same container window} -setup {
13	13	grid propagate . true
14	14	pack propagate . true
15	15	label .p -text PACK

23	23	destroy .g
24	24	} -result {cannot use geometry manager pack inside . which already has slaves managed by grid}
25	25
26		test packgrid-1.2 {pack and grid in same master} -setup {
	26	test packgrid-1.2 {pack and grid in same container window} -setup {
27	27	grid propagate . true
28	28	pack propagate . true
29	29	label .p -text PACK

37	37	destroy .g
38	38	} -result {cannot use geometry manager grid inside . which already has slaves managed by pack}
39	39
40		test packgrid-1.3 {pack and grid in same master} -setup {
41		grid propagate . false
42		pack propagate . true
43		label .p -text PACK
44		label .g -text GRID
45		} -body {
46		# Ok if one is non-propagating
47		grid .g
48		pack .p
49		} -cleanup {
50		destroy .p
51		destroy .g
52		} -result {}
53
54		test packgrid-1.4 {pack and grid in same master} -setup {
55		grid propagate . false
56		pack propagate . true
57		label .p -text PACK
58		label .g -text GRID
59		} -body {
60		# Ok if one is non-propagating
61		pack .p
62		grid .g
63		} -cleanup {
64		destroy .p
65		destroy .g
66		} -result {}
67
68		test packgrid-1.5 {pack and grid in same master} -setup {
69		grid propagate . true
70		pack propagate . false
71		label .p -text PACK
72		label .g -text GRID
73		} -body {
74		# Ok if one is non-propagating
75		grid .g
76		pack .p
77		} -cleanup {
78		destroy .p
79		destroy .g
80		} -result {}
81
82		test packgrid-1.6 {pack and grid in same master} -setup {
83		grid propagate . true
84		pack propagate . false
85		label .p -text PACK
86		label .g -text GRID
87		} -body {
88		# Ok if one is non-propagating
89		pack .p
90		grid .g
91		} -cleanup {
92		destroy .p
93		destroy .g
94		} -result {}
95
96		test packgrid-1.7 {pack and grid in same master} -setup {
	40	test packgrid-1.3 {pack and grid in same container window} -setup {
	41	grid propagate . false
	42	pack propagate . true
	43	label .p -text PACK
	44	label .g -text GRID
	45	} -body {
	46	# Ok if one is non-propagating
	47	grid .g
	48	pack .p
	49	} -cleanup {
	50	destroy .p
	51	destroy .g
	52	} -result {}
	53
	54	test packgrid-1.4 {pack and grid in same container window} -setup {
	55	grid propagate . false
	56	pack propagate . true
	57	label .p -text PACK
	58	label .g -text GRID
	59	} -body {
	60	# Ok if one is non-propagating
	61	pack .p
	62	grid .g
	63	} -cleanup {
	64	destroy .p
	65	destroy .g
	66	} -result {}
	67
	68	test packgrid-1.5 {pack and grid in same container window} -setup {
	69	grid propagate . true
	70	pack propagate . false
	71	label .p -text PACK
	72	label .g -text GRID
	73	} -body {
	74	# Ok if one is non-propagating
	75	grid .g
	76	pack .p
	77	} -cleanup {
	78	destroy .p
	79	destroy .g
	80	} -result {}
	81
	82	test packgrid-1.6 {pack and grid in same container window} -setup {
	83	grid propagate . true
	84	pack propagate . false
	85	label .p -text PACK
	86	label .g -text GRID
	87	} -body {
	88	# Ok if one is non-propagating
	89	pack .p
	90	grid .g
	91	} -cleanup {
	92	destroy .p
	93	destroy .g
	94	} -result {}
	95
	96	test packgrid-1.7 {pack and grid in same container window} -setup {
97	97	grid propagate . true
98	98	pack propagate . true
99	99	label .p -text PACK

102	102	# Basic conflict should stop widget from being handled
103	103	grid .g
104	104	catch { pack .p }
105		pack slaves .
106		} -cleanup {
107		destroy .p
108		destroy .g
109		} -result {}
110
111		test packgrid-1.8 {pack and grid in same master} -setup {
	105	pack content .
	106	} -cleanup {
	107	destroy .p
	108	destroy .g
	109	} -result {}
	110
	111	test packgrid-1.8 {pack and grid in same container window} -setup {
112	112	grid propagate . true
113	113	pack propagate . true
114	114	label .p -text PACK

117	117	# Basic conflict should stop widget from being handled
118	118	pack .p
119	119	catch { grid .g }
120		grid slaves .
121		} -cleanup {
122		destroy .p
123		destroy .g
124		} -result {}
125
126		test packgrid-2.1 {pack and grid in same master, change propagation} -setup {
127		grid propagate . false
128		pack propagate . true
129		label .p -text PACK
130		label .g -text GRID
131		pack .p
132		grid .g
133		update
134		} -body {
135		grid propagate . true
136		} -returnCodes error -cleanup {
137		destroy .p
138		destroy .g
139		} -result {cannot use geometry manager grid inside . which already has slaves managed by pack}
140
141		test packgrid-2.2 {pack and grid in same master, change propagation} -setup {
142		grid propagate . true
143		pack propagate . false
144		label .p -text PACK
145		label .g -text GRID
146		pack .p
147		grid .g
148		update
149		} -body {
150		pack propagate . true
151		} -returnCodes error -cleanup {
152		destroy .p
153		update
154		destroy .g
155		} -result {cannot use geometry manager pack inside . which already has slaves managed by grid}
156
157		test packgrid-2.3 {pack and grid in same master, change propagation} -setup {
158		grid propagate . false
159		pack propagate . false
160		label .p -text PACK
161		label .g -text GRID
162		pack .p
163		grid .g
164		update
165		} -body {
166		grid propagate . true
167		update
168		pack propagate . true
169		} -returnCodes error -cleanup {
170		destroy .p
171		destroy .g
172		} -result {cannot use geometry manager pack inside . which already has slaves managed by grid}
173
174		test packgrid-2.4 {pack and grid in same master, change propagation} -setup {
175		grid propagate . false
176		pack propagate . false
177		label .p -text PACK
178		label .g -text GRID
179		pack .p
180		grid .g
181		update
182		} -body {
183		pack propagate . true
184		grid propagate . true
185		} -returnCodes error -cleanup {
186		destroy .p
187		destroy .g
188		} -result {cannot use geometry manager grid inside . which already has slaves managed by pack}
189
190		test packgrid-3.1 {stealing slave} -setup {
	120	grid content .
	121	} -cleanup {
	122	destroy .p
	123	destroy .g
	124	} -result {}
	125
	126	test packgrid-2.1 {pack and grid in same container window, change propagation} -setup {
	127	grid propagate . false
	128	pack propagate . true
	129	label .p -text PACK
	130	label .g -text GRID
	131	pack .p
	132	grid .g
	133	update
	134	} -body {
	135	grid propagate . true
	136	} -returnCodes error -cleanup {
	137	destroy .p
	138	destroy .g
	139	} -result {cannot use geometry manager grid inside . which already has slaves managed by pack}
	140
	141	test packgrid-2.2 {pack and grid in same container window, change propagation} -setup {
	142	grid propagate . true
	143	pack propagate . false
	144	label .p -text PACK
	145	label .g -text GRID
	146	pack .p
	147	grid .g
	148	update
	149	} -body {
	150	pack propagate . true
	151	} -returnCodes error -cleanup {
	152	destroy .p
	153	update
	154	destroy .g
	155	} -result {cannot use geometry manager pack inside . which already has slaves managed by grid}
	156
	157	test packgrid-2.3 {pack and grid in same container window, change propagation} -setup {
	158	grid propagate . false
	159	pack propagate . false
	160	label .p -text PACK
	161	label .g -text GRID
	162	pack .p
	163	grid .g
	164	update
	165	} -body {
	166	grid propagate . true
	167	update
	168	pack propagate . true
	169	} -returnCodes error -cleanup {
	170	destroy .p
	171	destroy .g
	172	} -result {cannot use geometry manager pack inside . which already has slaves managed by grid}
	173
	174	test packgrid-2.4 {pack and grid in same container window, change propagation} -setup {
	175	grid propagate . false
	176	pack propagate . false
	177	label .p -text PACK
	178	label .g -text GRID
	179	pack .p
	180	grid .g
	181	update
	182	} -body {
	183	pack propagate . true
	184	grid propagate . true
	185	} -returnCodes error -cleanup {
	186	destroy .p
	187	destroy .g
	188	} -result {cannot use geometry manager grid inside . which already has slaves managed by pack}
	189
	190	test packgrid-3.1 {stealing content} -setup {
191	191	grid propagate . true
192	192	pack propagate . true
193	193	label .p -text PACK

201	201	destroy .g
202	202	} -result {}
203	203
204		test packgrid-3.2 {stealing slave} -setup {
	204	test packgrid-3.2 {stealing content} -setup {
205	205	grid propagate . true
206	206	pack propagate . true
207	207	label .p -text PACK

215	215	destroy .g
216	216	} -result {}
217	217
218		test packgrid-3.3 {stealing slave} -setup {
	218	test packgrid-3.3 {stealing content} -setup {
219	219	grid propagate . true
220	220	pack propagate . true
221	221	label .p -text PACK

230	230	destroy .g
231	231	} -result {cannot use geometry manager pack inside . which already has slaves managed by grid}
232	232
233		test packgrid-3.4 {stealing slave} -setup {
	233	test packgrid-3.4 {stealing content} -setup {
234	234	grid propagate . true
235	235	pack propagate . true
236	236	label .p -text PACK

245	245	destroy .g
246	246	} -result {cannot use geometry manager grid inside . which already has slaves managed by pack}
247	247
248		test packgrid-4.1 {slave stolen after master destruction - bug [aa7679685e]} -setup {
	248	test packgrid-4.1 {content stolen after container destruction - bug [aa7679685e]} -setup {
249	249	frame .f
250	250	button .b -text hello
251	251	} -body {

260	260	destroy .b
261	261	} -result {}
262	262
263		test packgrid-4.2 {slave stolen after master destruction - bug [aa7679685e]} -setup {
	263	test packgrid-4.2 {content stolen after container destruction - bug [aa7679685e]} -setup {
264	264	frame .f
265	265	button .b -text hello
266	266	} -body {

+231

-231

tests/panedwindow.test less more

497	497	.p add [frame .p.f]
498	498	list [catch {.p sash coord -1} msg] $msg \
499	499	[catch {.p sash coord 0} msg] $msg \
500		[catch {.p sash coord 1} msg] $msg
	500	[catch {.p sash coord 1} msg] $msg
501	501	} -cleanup {
502	502	deleteWindows
503	503	} -result [list 1 "invalid sash index" 1 "invalid sash index" 1 "invalid sash index"]

510	510	list [catch {.p sash coord -1} msg] $msg \
511	511	[catch {.p sash coord 0} msg] \
512	512	[catch {.p sash coord 1} msg] $msg \
513		[catch {.p sash coord 2} msg] $msg
	513	[catch {.p sash coord 2} msg] $msg
514	514	} -cleanup {
515	515	deleteWindows
516	516	} -result [list 1 "invalid sash index" 0 1 "invalid sash index" 1 "invalid sash index"]

621	621	} -cleanup {
622	622	deleteWindows
623	623	} -returnCodes error -result {expected integer but got "bar"}
624
	624
625	625
626	626	test panedwindow-9.1 {sash mark/sash dragto interaction} -setup {
627	627	deleteWindows

924	924	} -cleanup {
925	925	deleteWindows
926	926	} -result {68 100}
927
	927
928	928
929	929	test panedwindow-12.1 {horizontal panedwindow lays out widgets properly} -setup {
930	930	deleteWindows

1021	1021	} -cleanup {
1022	1022	deleteWindows
1023	1023	} -result [list 20 20]
1024		test panedwindow-12.7 {horizontal panedwindow reqheight is max slave height} -setup {
	1024	test panedwindow-12.7 {horizontal panedwindow reqheight is max pane height} -setup {
1025	1025	deleteWindows
1026	1026	} -body {
1027	1027	panedwindow .p -showhandle false -borderwidth 0 -sashpad 0 -sashwidth 4

1032	1032	} -cleanup {
1033	1033	deleteWindows
1034	1034	} -result {20 40}
1035		test panedwindow-12.8 {horizontal panedwindow reqheight is max slave height} -setup {
	1035	test panedwindow-12.8 {horizontal panedwindow reqheight is max pane height} -setup {
1036	1036	deleteWindows
1037	1037	} -body {
1038	1038	panedwindow .p -showhandle false -borderwidth 0 -sashpad 0 -sashwidth 4

1086	1086	} -cleanup {
1087	1087	deleteWindows
1088	1088	} -result [list 20 20]
1089		test panedwindow-12.12 {vertical panedwindow reqwidth is max slave width} -setup {
	1089	test panedwindow-12.12 {vertical panedwindow reqwidth is max pane width} -setup {
1090	1090	deleteWindows
1091	1091	} -body {
1092	1092	panedwindow .p -showhandle false -borderwidth 0 -sashpad 0 -sashwidth 4 \

1098	1098	} -cleanup {
1099	1099	deleteWindows
1100	1100	} -result {20 40}
1101		test panedwindow-12.13 {vertical panedwindow reqwidth is max slave width} -setup {
	1101	test panedwindow-12.13 {vertical panedwindow reqwidth is max pane width} -setup {
1102	1102	deleteWindows
1103	1103	} -body {
1104	1104	panedwindow .p -showhandle false -borderwidth 0 -sashpad 0 -sashwidth 4 \

1132	1132	deleteWindows
1133	1133	} -body {
1134	1134	# Check that the panedwindow correctly yields geometry management of
1135		# a slave when the slave is destroyed.
	1135	# a pane when the pane is destroyed.
1136	1136
1137	1137	# This test should not cause a core dump, and it should not cause
1138	1138	# a memory leak.

1143	1143	destroy .b
1144	1144	set result ""
1145	1145	} -result {}
1146		test panedwindow-13.2 {PanedWindowLostSlaveProc, widget yields management} -setup {
	1146	test panedwindow-13.2 {PanedWindowLostPaneProc, widget yields management} -setup {
1147	1147	deleteWindows
1148	1148	} -body {
1149	1149	# Check that the paned window correctly yields geometry management of
1150		# a slave when some other geometry manager steals the slave from us.
1151
	1150	# a pane when some other geometry manager steals the pane from us.
	1151
1152	1152	# This test should not cause a core dump, and it should not cause a
1153	1153	# memory leak.
1154	1154	panedwindow .p

1517	1517
1518	1518	# Get the requested width of the paned window
1519	1519	lappend result [winfo reqwidth .p]
1520
	1520
1521	1521	.p sash place 0 30 0
1522
	1522
1523	1523	# Get the reqwidth again, to make sure it hasn't changed
1524	1524	lappend result [winfo reqwidth .p]
1525	1525

1537	1537	}
1538	1538
1539	1539	.p sash place 0 100 0
1540
	1540
1541	1541	# Get the new sash coord; it should be clipped by the reqwidth of
1542	1542	# the panedwindow.
1543	1543	.p sash coord 0

1551	1551	foreach w {.f1 .f2} c {red blue} {
1552	1552	.p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew
1553	1553	}
1554
	1554
1555	1555	# Put the panedwindow up on the display and give it a width < reqwidth
1556	1556	place .p -x 0 -y 0 -width 32
1557	1557	update
1558	1558
1559	1559	.p sash place 0 100 0
1560
	1560
1561	1561	# Get the new sash coord; it should be clipped by the visible width of
1562	1562	# the panedwindow.
1563	1563	.p sash coord 0

1571	1571	foreach w {.f1 .f2} c {red blue} {
1572	1572	.p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew
1573	1573	}
1574
	1574
1575	1575	# Put the panedwindow up on the display and give it a width > reqwidth
1576	1576	place .p -x 0 -y 0 -width 102
1577	1577	update
1578	1578
1579	1579	.p sash place 0 200 0
1580
	1580
1581	1581	# Get the new sash coord; it should be clipped by the visible width of
1582	1582	# the panedwindow.
1583	1583	.p sash coord 0

1593	1593	}
1594	1594
1595	1595	.p sash place 0 100 0
1596
	1596
1597	1597	# Get the new sash coord; it should have moved as far as possible while
1598	1598	# respecting minsizes.
1599	1599	.p sash coord 0

1609	1609	}
1610	1610
1611	1611	.p sash place 0 100 0
1612
	1612
1613	1613	# Get the new sash coord; it should have moved as far as possible.
1614	1614	.p sash coord 0
1615	1615	} -cleanup {

1624	1624	}
1625	1625
1626	1626	.p sash place 0 100 0
1627
	1627
1628	1628	# Get the new sash coord; it should have moved as far as possible while
1629	1629	# respecting minsizes.
1630	1630	.p sash coord 1

1640	1640	}
1641	1641
1642	1642	.p sash place 0 100 0
1643
	1643
1644	1644	# Get the new sash coord; it should have moved as far as possible while
1645	1645	# respecting minsizes.
1646	1646	.p sash coord 1

1657	1657	}
1658	1658
1659	1659	.p sash place 0 100 0
1660
1661		# Get the new sash coord; it should have moved as far as possible,
	1660
	1661	# Get the new sash coord; it should have moved as far as possible,
1662	1662	# respecting minsizes.
1663	1663	.p sash coord 0
1664	1664	} -cleanup {

1674	1674	}
1675	1675
1676	1676	.p sash place 0 50 0
1677
1678		# Get the new sash coord; it should have moved as far as possible,
	1677
	1678	# Get the new sash coord; it should have moved as far as possible,
1679	1679	# respecting minsizes.
1680	1680	list [.p sash coord 0] [.p sash coord 1]
1681	1681	} -cleanup {

1692	1692
1693	1693	# Get the requested width of the paned window
1694	1694	lappend result [winfo reqwidth .p]
1695
	1695
1696	1696	.p sash place 0 10 0
1697
	1697
1698	1698	# Get the reqwidth again, to make sure it hasn't changed
1699	1699	lappend result [winfo reqwidth .p]
1700	1700

1712	1712	}
1713	1713
1714	1714	.p sash place 0 -100 0
1715
	1715
1716	1716	# Get the new sash coord; it should be clipped by the reqwidth of
1717	1717	# the panedwindow.
1718	1718	.p sash coord 0

1728	1728	}
1729	1729
1730	1730	.p sash place 0 0 0
1731
	1731
1732	1732	# Get the new sash coord; it should have moved as far as possible while
1733	1733	# respecting minsizes.
1734	1734	.p sash coord 0

1744	1744	}
1745	1745
1746	1746	.p sash place 1 0 0
1747
	1747
1748	1748	# Get the new sash coord; it should have moved as far as possible.
1749	1749	.p sash coord 1
1750	1750	} -cleanup {

1759	1759	}
1760	1760
1761	1761	.p sash place 1 0 0
1762
	1762
1763	1763	# Get the new sash coord; it should have moved as far as possible while
1764	1764	# respecting minsizes.
1765	1765	.p sash coord 0

1775	1775	}
1776	1776
1777	1777	.p sash place 1 0 0
1778
	1778
1779	1779	# Get the new sash coord; it should have moved as far as possible while
1780	1780	# respecting minsizes.
1781	1781	.p sash coord 0

1792	1792	}
1793	1793
1794	1794	.p sash place 1 0 0
1795
1796		# Get the new sash coord; it should have moved as far as possible,
	1795
	1796	# Get the new sash coord; it should have moved as far as possible,
1797	1797	# respecting minsizes.
1798	1798	.p sash coord 1
1799	1799	} -cleanup {

1809	1809	}
1810	1810
1811	1811	.p sash place 1 10 0
1812
1813		# Get the new sash coord; it should have moved as far as possible,
	1812
	1813	# Get the new sash coord; it should have moved as far as possible,
1814	1814	# respecting minsizes.
1815	1815	list [.p sash coord 0] [.p sash coord 1]
1816	1816	} -cleanup {

1830	1830
1831	1831	# Get the requested width of the paned window
1832	1832	lappend result [winfo reqheight .p]
1833
	1833
1834	1834	.p sash place 0 0 30
1835
	1835
1836	1836	# Get the reqwidth again, to make sure it hasn't changed
1837	1837	lappend result [winfo reqheight .p]
1838	1838

1851	1851	}
1852	1852
1853	1853	.p sash place 0 0 100
1854
	1854
1855	1855	# Get the new sash coord; it should be clipped by the reqheight of
1856	1856	# the panedwindow.
1857	1857	.p sash coord 0

1866	1866	foreach w {.f1 .f2} c {red blue} {
1867	1867	.p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew
1868	1868	}
1869
	1869
1870	1870	# Put the panedwindow up on the display and give it a height < reqheight
1871	1871	place .p -x 0 -y 0 -height 32
1872	1872	update
1873	1873
1874	1874	.p sash place 0 0 100
1875
	1875
1876	1876	# Get the new sash coord; it should be clipped by the visible height of
1877	1877	# the panedwindow.
1878	1878	.p sash coord 0

1887	1887	foreach w {.f1 .f2} c {red blue} {
1888	1888	.p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew
1889	1889	}
1890
	1890
1891	1891	# Put the panedwindow up on the display and give it a width > reqwidth
1892	1892	place .p -x 0 -y 0 -height 102
1893	1893	update
1894	1894
1895	1895	.p sash place 0 0 200
1896
	1896
1897	1897	# Get the new sash coord; it should be clipped by the visible width of
1898	1898	# the panedwindow.
1899	1899	.p sash coord 0

1910	1910	}
1911	1911
1912	1912	.p sash place 0 0 100
1913
	1913
1914	1914	# Get the new sash coord; it should have moved as far as possible while
1915	1915	# respecting minsizes.
1916	1916	.p sash coord 0

1927	1927	}
1928	1928
1929	1929	.p sash place 0 0 100
1930
	1930
1931	1931	# Get the new sash coord; it should have moved as far as possible while
1932	1932	# respecting minsizes.
1933	1933	.p sash coord 0

1944	1944	}
1945	1945
1946	1946	.p sash place 0 0 100
1947
	1947
1948	1948	# Get the new sash coord; it should have moved as far as possible while
1949	1949	# respecting minsizes.
1950	1950	.p sash coord 1

1961	1961	}
1962	1962
1963	1963	.p sash place 0 0 100
1964
	1964
1965	1965	# Get the new sash coord; it should have moved as far as possible while
1966	1966	# respecting minsizes.
1967	1967	.p sash coord 1

1979	1979	}
1980	1980
1981	1981	.p sash place 0 0 100
1982
1983		# Get the new sash coord; it should have moved as far as possible,
	1982
	1983	# Get the new sash coord; it should have moved as far as possible,
1984	1984	# respecting minsizes.
1985	1985	.p sash coord 0
1986	1986	} -cleanup {

1997	1997	}
1998	1998
1999	1999	.p sash place 0 0 50
2000
2001		# Get the new sash coord; it should have moved as far as possible,
	2000
	2001	# Get the new sash coord; it should have moved as far as possible,
2002	2002	# respecting minsizes.
2003	2003	list [.p sash coord 0] [.p sash coord 1]
2004	2004	} -cleanup {

2016	2016
2017	2017	# Get the requested width of the paned window
2018	2018	lappend result [winfo reqheight .p]
2019
	2019
2020	2020	.p sash place 0 0 10
2021
	2021
2022	2022	# Get the reqwidth again, to make sure it hasn't changed
2023	2023	lappend result [winfo reqheight .p]
2024	2024

2037	2037	}
2038	2038
2039	2039	.p sash place 0 0 -100
2040
	2040
2041	2041	# Get the new sash coord; it should be clipped by the reqwidth of
2042	2042	# the panedwindow.
2043	2043	.p sash coord 0

2054	2054	}
2055	2055
2056	2056	.p sash place 0 0 0
2057
	2057
2058	2058	# Get the new sash coord; it should have moved as far as possible while
2059	2059	# respecting minsizes.
2060	2060	.p sash coord 0

2071	2071	}
2072	2072
2073	2073	.p sash place 1 0 0
2074
	2074
2075	2075	# Get the new sash coord; it should have moved as far as possible.
2076	2076	.p sash coord 1
2077	2077	} -cleanup {

2087	2087	}
2088	2088
2089	2089	.p sash place 1 0 0
2090
	2090
2091	2091	# Get the new sash coord; it should have moved as far as possible while
2092	2092	# respecting minsizes.
2093	2093	.p sash coord 0

2104	2104	}
2105	2105
2106	2106	.p sash place 1 0 0
2107
	2107
2108	2108	# Get the new sash coord; it should have moved as far as possible while
2109	2109	# respecting minsizes.
2110	2110	.p sash coord 0

2122	2122	}
2123	2123
2124	2124	.p sash place 1 0 0
2125
2126		# Get the new sash coord; it should have moved as far as possible,
	2125
	2126	# Get the new sash coord; it should have moved as far as possible,
2127	2127	# respecting minsizes.
2128	2128	.p sash coord 1
2129	2129	} -cleanup {

2140	2140	}
2141	2141
2142	2142	.p sash place 1 0 10
2143
2144		# Get the new sash coord; it should have moved as far as possible,
	2143
	2144	# Get the new sash coord; it should have moved as far as possible,
2145	2145	# respecting minsizes.
2146	2146	list [.p sash coord 0] [.p sash coord 1]
2147	2147	} -cleanup {

2240	2240	deleteWindows
2241	2241	} -result [list [list 60 60] [list 80 60]]
2242	2242
2243		test panedwindow-19.7 {ComputeGeometry, one slave, reqsize set properly} -setup {
2244		deleteWindows
2245		} -body {
2246		# With just one slave, sashpad and sashwidth should not
	2243	test panedwindow-19.7 {ComputeGeometry, one pane, reqsize set properly} -setup {
	2244	deleteWindows
	2245	} -body {
	2246	# With just one pane, sashpad and sashwidth should not
2247	2247	# affect the panedwindow's geometry, since no sash should
2248	2248	# ever be drawn.
2249	2249	panedwindow .p -borderwidth 0 -sashpad 0 \

2281	2281	deleteWindows
2282	2282	} -result {{20 0} {40 0}}
2283	2283
2284		test panedwindow-19.10 {ComputeGeometry/ArrangePanes, slave coords} -setup {
	2284	test panedwindow-19.10 {ComputeGeometry/ArrangePanes, pane coords} -setup {
2285	2285	deleteWindows
2286	2286	} -body {
2287	2287	panedwindow .p -borderwidth 0 -sashpad 0 \

2302	2302	deleteWindows
2303	2303	} -result {{11 3 20 20} {53 3 20 20} {95 3 20 20}}
2304	2304
2305		test panedwindow-19.11 {ComputeGeometry, one slave, vertical} -setup {
2306		deleteWindows
2307		} -body {
2308		# With just one slave, sashpad and sashwidth should not
	2305	test panedwindow-19.11 {ComputeGeometry, one pane, vertical} -setup {
	2306	deleteWindows
	2307	} -body {
	2308	# With just one pane, sashpad and sashwidth should not
2309	2309	# affect the panedwindow's geometry, since no sash should
2310	2310	# ever be drawn.
2311	2311	panedwindow .p -borderwidth 0 -sashpad 0 \

2348	2348	deleteWindows
2349	2349	} -result {{0 20} {0 40}}
2350	2350
2351		test panedwindow-19.14 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
	2351	test panedwindow-19.14 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
2352	2352	deleteWindows
2353	2353	} -body {
2354	2354	panedwindow .p -borderwidth 0 -sashpad 0 \

2369	2369	} -cleanup {
2370	2370	deleteWindows
2371	2371	} -result {{3 11 20 20} {3 53 20 20} {3 95 20 20}}
2372		test panedwindow-19.15 {ComputeGeometry, one slave, reqsize set properly} -setup {
2373		deleteWindows
2374		} -body {
2375		# With just one slave, sashpad and sashwidth should not
	2372	test panedwindow-19.15 {ComputeGeometry, one pane, reqsize set properly} -setup {
	2373	deleteWindows
	2374	} -body {
	2375	# With just one pane, sashpad and sashwidth should not
2376	2376	# affect the panedwindow's geometry, since no sash should
2377	2377	# ever be drawn.
2378	2378	panedwindow .p -borderwidth 0 -sashpad 0 \

2410	2410	deleteWindows
2411	2411	} -result {{23 0} {49 0}}
2412	2412
2413		test panedwindow-19.18 {ComputeGeometry/ArrangePanes, slave coords} -setup {
	2413	test panedwindow-19.18 {ComputeGeometry/ArrangePanes, pane coords} -setup {
2414	2414	deleteWindows
2415	2415	} -body {
2416	2416	panedwindow .p -borderwidth 0 -sashpad 0 \

2431	2431	deleteWindows
2432	2432	} -result {{11 3 20 20} {59 3 20 20} {107 3 20 20}}
2433	2433
2434		test panedwindow-19.19 {ComputeGeometry, one slave, vertical} -setup {
2435		deleteWindows
2436		} -body {
2437		# With just one slave, sashpad and sashwidth should not
	2434	test panedwindow-19.19 {ComputeGeometry, one pane, vertical} -setup {
	2435	deleteWindows
	2436	} -body {
	2437	# With just one pane, sashpad and sashwidth should not
2438	2438	# affect the panedwindow's geometry, since no sash should
2439	2439	# ever be drawn.
2440	2440	panedwindow .p -borderwidth 0 -sashpad 0 \

2477	2477	deleteWindows
2478	2478	} -result {{0 23} {0 49}}
2479	2479
2480		test panedwindow-19.22 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
	2480	test panedwindow-19.22 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
2481	2481	deleteWindows
2482	2482	} -body {
2483	2483	panedwindow .p -borderwidth 0 -sashpad 0 \

2498	2498	} -cleanup {
2499	2499	deleteWindows
2500	2500	} -result {{3 11 20 20} {3 59 20 20} {3 107 20 20}}
2501		test panedwindow-19.23 {ComputeGeometry, one slave, reqsize set properly} -setup {
2502		deleteWindows
2503		} -body {
2504		# With just one slave, sashpad and sashwidth should not
	2501	test panedwindow-19.23 {ComputeGeometry, one pane, reqsize set properly} -setup {
	2502	deleteWindows
	2503	} -body {
	2504	# With just one pane, sashpad and sashwidth should not
2505	2505	# affect the panedwindow's geometry, since no sash should
2506	2506	# ever be drawn.
2507	2507	panedwindow .p -borderwidth 0 -sashpad 0 \

2539	2539	deleteWindows
2540	2540	} -result {{20 0} {43 0}}
2541	2541
2542		test panedwindow-19.26 {ComputeGeometry/ArrangePanes, slave coords} -setup {
	2542	test panedwindow-19.26 {ComputeGeometry/ArrangePanes, pane coords} -setup {
2543	2543	deleteWindows
2544	2544	} -body {
2545	2545	panedwindow .p -borderwidth 0 -sashpad 0 \

2560	2560	deleteWindows
2561	2561	} -result {{11 3 20 20} {56 3 20 20} {101 3 20 20}}
2562	2562
2563		test panedwindow-19.27 {ComputeGeometry, one slave, vertical} -setup {
2564		deleteWindows
2565		} -body {
2566		# With just one slave, sashpad and sashwidth should not
	2563	test panedwindow-19.27 {ComputeGeometry, one pane, vertical} -setup {
	2564	deleteWindows
	2565	} -body {
	2566	# With just one pane, sashpad and sashwidth should not
2567	2567	# affect the panedwindow's geometry, since no sash should
2568	2568	# ever be drawn.
2569	2569	panedwindow .p -borderwidth 0 -sashpad 0 \

2606	2606	deleteWindows
2607	2607	} -result {{0 20} {0 43}}
2608	2608
2609		test panedwindow-19.30 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
	2609	test panedwindow-19.30 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
2610	2610	deleteWindows
2611	2611	} -body {
2612	2612	panedwindow .p -borderwidth 0 -sashpad 0 \

2627	2627	} -cleanup {
2628	2628	deleteWindows
2629	2629	} -result {{3 11 20 20} {3 56 20 20} {3 101 20 20}}
2630		test panedwindow-19.31 {ComputeGeometry, one slave, reqsize set properly} -setup {
2631		deleteWindows
2632		} -body {
2633		# With just one slave, sashpad and sashwidth should not
	2630	test panedwindow-19.31 {ComputeGeometry, one pane, reqsize set properly} -setup {
	2631	deleteWindows
	2632	} -body {
	2633	# With just one pane, sashpad and sashwidth should not
2634	2634	# affect the panedwindow's geometry, since no sash should
2635	2635	# ever be drawn.
2636	2636	panedwindow .p -borderwidth 0 -sashpad 0 \

2668	2668	deleteWindows
2669	2669	} -result {{21 0} {47 0}}
2670	2670
2671		test panedwindow-19.34 {ComputeGeometry/ArrangePanes, slave coords} -setup {
	2671	test panedwindow-19.34 {ComputeGeometry/ArrangePanes, pane coords} -setup {
2672	2672	deleteWindows
2673	2673	} -body {
2674	2674	panedwindow .p -borderwidth 0 -sashpad 0 \

2689	2689	deleteWindows
2690	2690	} -result {{11 3 20 20} {59 3 20 20} {107 3 20 20}}
2691	2691
2692		test panedwindow-19.35 {ComputeGeometry, one slave, vertical} -setup {
2693		deleteWindows
2694		} -body {
2695		# With just one slave, sashpad and sashwidth should not
	2692	test panedwindow-19.35 {ComputeGeometry, one pane, vertical} -setup {
	2693	deleteWindows
	2694	} -body {
	2695	# With just one pane, sashpad and sashwidth should not
2696	2696	# affect the panedwindow's geometry, since no sash should
2697	2697	# ever be drawn.
2698	2698	panedwindow .p -borderwidth 0 -sashpad 0 \

2735	2735	deleteWindows
2736	2736	} -result {{0 21} {0 47}}
2737	2737
2738		test panedwindow-19.38 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
	2738	test panedwindow-19.38 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
2739	2739	deleteWindows
2740	2740	} -body {
2741	2741	panedwindow .p -borderwidth 0 -sashpad 0 \

2756	2756	} -cleanup {
2757	2757	deleteWindows
2758	2758	} -result {{3 11 20 20} {3 59 20 20} {3 107 20 20}}
2759		test panedwindow-19.39 {ComputeGeometry, one slave, reqsize set properly} -setup {
2760		deleteWindows
2761		} -body {
2762		# With just one slave, sashpad and sashwidth should not
	2759	test panedwindow-19.39 {ComputeGeometry, one pane, reqsize set properly} -setup {
	2760	deleteWindows
	2761	} -body {
	2762	# With just one pane, sashpad and sashwidth should not
2763	2763	# affect the panedwindow's geometry, since no sash should
2764	2764	# ever be drawn.
2765	2765	panedwindow .p -borderwidth 0 -sashpad 5 \

2797	2797	deleteWindows
2798	2798	} -result {{25 0} {55 0}}
2799	2799
2800		test panedwindow-19.42 {ComputeGeometry/ArrangePanes, slave coords} -setup {
	2800	test panedwindow-19.42 {ComputeGeometry/ArrangePanes, pane coords} -setup {
2801	2801	deleteWindows
2802	2802	} -body {
2803	2803	panedwindow .p -borderwidth 0 -sashpad 5 \

2818	2818	deleteWindows
2819	2819	} -result {{11 3 20 20} {63 3 20 20} {115 3 20 20}}
2820	2820
2821		test panedwindow-19.43 {ComputeGeometry, one slave, vertical} -setup {
2822		deleteWindows
2823		} -body {
2824		# With just one slave, sashpad and sashwidth should not
	2821	test panedwindow-19.43 {ComputeGeometry, one pane, vertical} -setup {
	2822	deleteWindows
	2823	} -body {
	2824	# With just one pane, sashpad and sashwidth should not
2825	2825	# affect the panedwindow's geometry, since no sash should
2826	2826	# ever be drawn.
2827	2827	panedwindow .p -borderwidth 0 -sashpad 5 \

2864	2864	deleteWindows
2865	2865	} -result {{0 25} {0 55}}
2866	2866
2867		test panedwindow-19.46 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
	2867	test panedwindow-19.46 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
2868	2868	deleteWindows
2869	2869	} -body {
2870	2870	panedwindow .p -borderwidth 0 -sashpad 5 \

2885	2885	} -cleanup {
2886	2886	deleteWindows
2887	2887	} -result {{3 11 20 20} {3 63 20 20} {3 115 20 20}}
2888		test panedwindow-19.47 {ComputeGeometry, one slave, reqsize set properly} -setup {
2889		deleteWindows
2890		} -body {
2891		# With just one slave, sashpad and sashwidth should not
	2888	test panedwindow-19.47 {ComputeGeometry, one pane, reqsize set properly} -setup {
	2889	deleteWindows
	2890	} -body {
	2891	# With just one pane, sashpad and sashwidth should not
2892	2892	# affect the panedwindow's geometry, since no sash should
2893	2893	# ever be drawn.
2894	2894	panedwindow .p -borderwidth 0 -sashpad 5 \

2926	2926	deleteWindows
2927	2927	} -result {{28 0} {64 0}}
2928	2928
2929		test panedwindow-19.50 {ComputeGeometry/ArrangePanes, slave coords} -setup {
	2929	test panedwindow-19.50 {ComputeGeometry/ArrangePanes, pane coords} -setup {
2930	2930	deleteWindows
2931	2931	} -body {
2932	2932	panedwindow .p -borderwidth 0 -sashpad 5 \

2947	2947	deleteWindows
2948	2948	} -result {{11 3 20 20} {69 3 20 20} {127 3 20 20}}
2949	2949
2950		test panedwindow-19.51 {ComputeGeometry, one slave, vertical} -setup {
2951		deleteWindows
2952		} -body {
2953		# With just one slave, sashpad and sashwidth should not
	2950	test panedwindow-19.51 {ComputeGeometry, one pane, vertical} -setup {
	2951	deleteWindows
	2952	} -body {
	2953	# With just one pane, sashpad and sashwidth should not
2954	2954	# affect the panedwindow's geometry, since no sash should
2955	2955	# ever be drawn.
2956	2956	panedwindow .p -borderwidth 0 -sashpad 5 \

2993	2993	deleteWindows
2994	2994	} -result {{0 28} {0 64}}
2995	2995
2996		test panedwindow-19.54 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
	2996	test panedwindow-19.54 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
2997	2997	deleteWindows
2998	2998	} -body {
2999	2999	panedwindow .p -borderwidth 0 -sashpad 5 \

3014	3014	} -cleanup {
3015	3015	deleteWindows
3016	3016	} -result {{3 11 20 20} {3 69 20 20} {3 127 20 20}}
3017		test panedwindow-19.55 {ComputeGeometry, one slave, reqsize set properly} -setup {
3018		deleteWindows
3019		} -body {
3020		# With just one slave, sashpad and sashwidth should not
	3017	test panedwindow-19.55 {ComputeGeometry, one pane, reqsize set properly} -setup {
	3018	deleteWindows
	3019	} -body {
	3020	# With just one pane, sashpad and sashwidth should not
3021	3021	# affect the panedwindow's geometry, since no sash should
3022	3022	# ever be drawn.
3023	3023	panedwindow .p -borderwidth 0 -sashpad 5 \

3055	3055	deleteWindows
3056	3056	} -result {{25 0} {58 0}}
3057	3057
3058		test panedwindow-19.58 {ComputeGeometry/ArrangePanes, slave coords} -setup {
	3058	test panedwindow-19.58 {ComputeGeometry/ArrangePanes, pane coords} -setup {
3059	3059	deleteWindows
3060	3060	} -body {
3061	3061	panedwindow .p -borderwidth 0 -sashpad 5 \

3076	3076	deleteWindows
3077	3077	} -result {{11 3 20 20} {66 3 20 20} {121 3 20 20}}
3078	3078
3079		test panedwindow-19.59 {ComputeGeometry, one slave, vertical} -setup {
3080		deleteWindows
3081		} -body {
3082		# With just one slave, sashpad and sashwidth should not
	3079	test panedwindow-19.59 {ComputeGeometry, one pane, vertical} -setup {
	3080	deleteWindows
	3081	} -body {
	3082	# With just one pane, sashpad and sashwidth should not
3083	3083	# affect the panedwindow's geometry, since no sash should
3084	3084	# ever be drawn.
3085	3085	panedwindow .p -borderwidth 0 -sashpad 5 \

3122	3122	deleteWindows
3123	3123	} -result {{0 25} {0 58}}
3124	3124
3125		test panedwindow-19.62 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
	3125	test panedwindow-19.62 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
3126	3126	deleteWindows
3127	3127	} -body {
3128	3128	panedwindow .p -borderwidth 0 -sashpad 5 \

3143	3143	} -cleanup {
3144	3144	deleteWindows
3145	3145	} -result {{3 11 20 20} {3 66 20 20} {3 121 20 20}}
3146		test panedwindow-19.63 {ComputeGeometry, one slave, reqsize set properly} -setup {
3147		deleteWindows
3148		} -body {
3149		# With just one slave, sashpad and sashwidth should not
	3146	test panedwindow-19.63 {ComputeGeometry, one pane, reqsize set properly} -setup {
	3147	deleteWindows
	3148	} -body {
	3149	# With just one pane, sashpad and sashwidth should not
3150	3150	# affect the panedwindow's geometry, since no sash should
3151	3151	# ever be drawn.
3152	3152	panedwindow .p -borderwidth 0 -sashpad 5 \

3184	3184	deleteWindows
3185	3185	} -result {{26 0} {62 0}}
3186	3186
3187		test panedwindow-19.66 {ComputeGeometry/ArrangePanes, slave coords} -setup {
	3187	test panedwindow-19.66 {ComputeGeometry/ArrangePanes, pane coords} -setup {
3188	3188	deleteWindows
3189	3189	} -body {
3190	3190	panedwindow .p -borderwidth 0 -sashpad 5 \

3205	3205	deleteWindows
3206	3206	} -result {{11 3 20 20} {69 3 20 20} {127 3 20 20}}
3207	3207
3208		test panedwindow-19.67 {ComputeGeometry, one slave, vertical} -setup {
3209		deleteWindows
3210		} -body {
3211		# With just one slave, sashpad and sashwidth should not
	3208	test panedwindow-19.67 {ComputeGeometry, one pane, vertical} -setup {
	3209	deleteWindows
	3210	} -body {
	3211	# With just one pane, sashpad and sashwidth should not
3212	3212	# affect the panedwindow's geometry, since no sash should
3213	3213	# ever be drawn.
3214	3214	panedwindow .p -borderwidth 0 -sashpad 5 \

3251	3251	deleteWindows
3252	3252	} -result {{0 26} {0 62}}
3253	3253
3254		test panedwindow-19.70 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
	3254	test panedwindow-19.70 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
3255	3255	deleteWindows
3256	3256	} -body {
3257	3257	panedwindow .p -borderwidth 0 -sashpad 5 \

3272	3272	} -cleanup {
3273	3273	deleteWindows
3274	3274	} -result {{3 11 20 20} {3 69 20 20} {3 127 20 20}}
3275		test panedwindow-19.71 {ComputeGeometry, one slave, reqsize set properly} -setup {
3276		deleteWindows
3277		} -body {
3278		# With just one slave, sashpad and sashwidth should not
	3275	test panedwindow-19.71 {ComputeGeometry, one pane, reqsize set properly} -setup {
	3276	deleteWindows
	3277	} -body {
	3278	# With just one pane, sashpad and sashwidth should not
3279	3279	# affect the panedwindow's geometry, since no sash should
3280	3280	# ever be drawn.
3281	3281	panedwindow .p -borderwidth 2 -sashpad 0 \

3313	3313	deleteWindows
3314	3314	} -result {{22 2} {42 2}}
3315	3315
3316		test panedwindow-19.74 {ComputeGeometry/ArrangePanes, slave coords} -setup {
	3316	test panedwindow-19.74 {ComputeGeometry/ArrangePanes, pane coords} -setup {
3317	3317	deleteWindows
3318	3318	} -body {
3319	3319	panedwindow .p -borderwidth 2 -sashpad 0 \

3334	3334	deleteWindows
3335	3335	} -result {{13 5 20 20} {55 5 20 20} {97 5 20 20}}
3336	3336
3337		test panedwindow-19.75 {ComputeGeometry, one slave, vertical} -setup {
3338		deleteWindows
3339		} -body {
3340		# With just one slave, sashpad and sashwidth should not
	3337	test panedwindow-19.75 {ComputeGeometry, one pane, vertical} -setup {
	3338	deleteWindows
	3339	} -body {
	3340	# With just one pane, sashpad and sashwidth should not
3341	3341	# affect the panedwindow's geometry, since no sash should
3342	3342	# ever be drawn.
3343	3343	panedwindow .p -borderwidth 2 -sashpad 0 \

3380	3380	deleteWindows
3381	3381	} -result {{2 22} {2 42}}
3382	3382
3383		test panedwindow-19.78 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
	3383	test panedwindow-19.78 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
3384	3384	deleteWindows
3385	3385	} -body {
3386	3386	panedwindow .p -borderwidth 2 -sashpad 0 \

3401	3401	} -cleanup {
3402	3402	deleteWindows
3403	3403	} -result {{5 13 20 20} {5 55 20 20} {5 97 20 20}}
3404		test panedwindow-19.79 {ComputeGeometry, one slave, reqsize set properly} -setup {
3405		deleteWindows
3406		} -body {
3407		# With just one slave, sashpad and sashwidth should not
	3404	test panedwindow-19.79 {ComputeGeometry, one pane, reqsize set properly} -setup {
	3405	deleteWindows
	3406	} -body {
	3407	# With just one pane, sashpad and sashwidth should not
3408	3408	# affect the panedwindow's geometry, since no sash should
3409	3409	# ever be drawn.
3410	3410	panedwindow .p -borderwidth 2 -sashpad 0 \

3442	3442	deleteWindows
3443	3443	} -result {{25 2} {51 2}}
3444	3444
3445		test panedwindow-19.82 {ComputeGeometry/ArrangePanes, slave coords} -setup {
	3445	test panedwindow-19.82 {ComputeGeometry/ArrangePanes, pane coords} -setup {
3446	3446	deleteWindows
3447	3447	} -body {
3448	3448	panedwindow .p -borderwidth 2 -sashpad 0 \

3463	3463	deleteWindows
3464	3464	} -result {{13 5 20 20} {61 5 20 20} {109 5 20 20}}
3465	3465
3466		test panedwindow-19.83 {ComputeGeometry, one slave, vertical} -setup {
3467		deleteWindows
3468		} -body {
3469		# With just one slave, sashpad and sashwidth should not
	3466	test panedwindow-19.83 {ComputeGeometry, one pane, vertical} -setup {
	3467	deleteWindows
	3468	} -body {
	3469	# With just one pane, sashpad and sashwidth should not
3470	3470	# affect the panedwindow's geometry, since no sash should
3471	3471	# ever be drawn.
3472	3472	panedwindow .p -borderwidth 2 -sashpad 0 \

3509	3509	deleteWindows
3510	3510	} -result {{2 25} {2 51}}
3511	3511
3512		test panedwindow-19.86 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
	3512	test panedwindow-19.86 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
3513	3513	deleteWindows
3514	3514	} -body {
3515	3515	panedwindow .p -borderwidth 2 -sashpad 0 \

3530	3530	} -cleanup {
3531	3531	deleteWindows
3532	3532	} -result {{5 13 20 20} {5 61 20 20} {5 109 20 20}}
3533		test panedwindow-19.87 {ComputeGeometry, one slave, reqsize set properly} -setup {
3534		deleteWindows
3535		} -body {
3536		# With just one slave, sashpad and sashwidth should not
	3533	test panedwindow-19.87 {ComputeGeometry, one pane, reqsize set properly} -setup {
	3534	deleteWindows
	3535	} -body {
	3536	# With just one pane, sashpad and sashwidth should not
3537	3537	# affect the panedwindow's geometry, since no sash should
3538	3538	# ever be drawn.
3539	3539	panedwindow .p -borderwidth 2 -sashpad 0 \

3571	3571	deleteWindows
3572	3572	} -result {{22 2} {45 2}}
3573	3573
3574		test panedwindow-19.90 {ComputeGeometry/ArrangePanes, slave coords} -setup {
	3574	test panedwindow-19.90 {ComputeGeometry/ArrangePanes, pane coords} -setup {
3575	3575	deleteWindows
3576	3576	} -body {
3577	3577	panedwindow .p -borderwidth 2 -sashpad 0 \

3592	3592	deleteWindows
3593	3593	} -result {{13 5 20 20} {58 5 20 20} {103 5 20 20}}
3594	3594
3595		test panedwindow-19.91 {ComputeGeometry, one slave, vertical} -setup {
3596		deleteWindows
3597		} -body {
3598		# With just one slave, sashpad and sashwidth should not
	3595	test panedwindow-19.91 {ComputeGeometry, one pane, vertical} -setup {
	3596	deleteWindows
	3597	} -body {
	3598	# With just one pane, sashpad and sashwidth should not
3599	3599	# affect the panedwindow's geometry, since no sash should
3600	3600	# ever be drawn.
3601	3601	panedwindow .p -borderwidth 2 -sashpad 0 \

3638	3638	deleteWindows
3639	3639	} -result {{2 22} {2 45}}
3640	3640
3641		test panedwindow-19.94 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
	3641	test panedwindow-19.94 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
3642	3642	deleteWindows
3643	3643	} -body {
3644	3644	panedwindow .p -borderwidth 2 -sashpad 0 \

3659	3659	} -cleanup {
3660	3660	deleteWindows
3661	3661	} -result {{5 13 20 20} {5 58 20 20} {5 103 20 20}}
3662		test panedwindow-19.95 {ComputeGeometry, one slave, reqsize set properly} -setup {
3663		deleteWindows
3664		} -body {
3665		# With just one slave, sashpad and sashwidth should not
	3662	test panedwindow-19.95 {ComputeGeometry, one pane, reqsize set properly} -setup {
	3663	deleteWindows
	3664	} -body {
	3665	# With just one pane, sashpad and sashwidth should not
3666	3666	# affect the panedwindow's geometry, since no sash should
3667	3667	# ever be drawn.
3668	3668	panedwindow .p -borderwidth 2 -sashpad 0 \

3700	3700	deleteWindows
3701	3701	} -result {{23 2} {49 2}}
3702	3702
3703		test panedwindow-19.98 {ComputeGeometry/ArrangePanes, slave coords} -setup {
	3703	test panedwindow-19.98 {ComputeGeometry/ArrangePanes, pane coords} -setup {
3704	3704	deleteWindows
3705	3705	} -body {
3706	3706	panedwindow .p -borderwidth 2 -sashpad 0 \

3721	3721	deleteWindows
3722	3722	} -result {{13 5 20 20} {61 5 20 20} {109 5 20 20}}
3723	3723
3724		test panedwindow-19.99 {ComputeGeometry, one slave, vertical} -setup {
3725		deleteWindows
3726		} -body {
3727		# With just one slave, sashpad and sashwidth should not
	3724	test panedwindow-19.99 {ComputeGeometry, one pane, vertical} -setup {
	3725	deleteWindows
	3726	} -body {
	3727	# With just one pane, sashpad and sashwidth should not
3728	3728	# affect the panedwindow's geometry, since no sash should
3729	3729	# ever be drawn.
3730	3730	panedwindow .p -borderwidth 2 -sashpad 0 \

3767	3767	deleteWindows
3768	3768	} -result {{2 23} {2 49}}
3769	3769
3770		test panedwindow-19.102 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
	3770	test panedwindow-19.102 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
3771	3771	deleteWindows
3772	3772	} -body {
3773	3773	panedwindow .p -borderwidth 2 -sashpad 0 \

3788	3788	} -cleanup {
3789	3789	deleteWindows
3790	3790	} -result {{5 13 20 20} {5 61 20 20} {5 109 20 20}}
3791		test panedwindow-19.103 {ComputeGeometry, one slave, reqsize set properly} -setup {
3792		deleteWindows
3793		} -body {
3794		# With just one slave, sashpad and sashwidth should not
	3791	test panedwindow-19.103 {ComputeGeometry, one pane, reqsize set properly} -setup {
	3792	deleteWindows
	3793	} -body {
	3794	# With just one pane, sashpad and sashwidth should not
3795	3795	# affect the panedwindow's geometry, since no sash should
3796	3796	# ever be drawn.
3797	3797	panedwindow .p -borderwidth 2 -sashpad 5 \

3829	3829	deleteWindows
3830	3830	} -result {{27 2} {57 2}}
3831	3831
3832		test panedwindow-19.106 {ComputeGeometry/ArrangePanes, slave coords} -setup {
	3832	test panedwindow-19.106 {ComputeGeometry/ArrangePanes, pane coords} -setup {
3833	3833	deleteWindows
3834	3834	} -body {
3835	3835	panedwindow .p -borderwidth 2 -sashpad 5 \

3850	3850	deleteWindows
3851	3851	} -result {{13 5 20 20} {65 5 20 20} {117 5 20 20}}
3852	3852
3853		test panedwindow-19.107 {ComputeGeometry, one slave, vertical} -setup {
3854		deleteWindows
3855		} -body {
3856		# With just one slave, sashpad and sashwidth should not
	3853	test panedwindow-19.107 {ComputeGeometry, one pane, vertical} -setup {
	3854	deleteWindows
	3855	} -body {
	3856	# With just one pane, sashpad and sashwidth should not
3857	3857	# affect the panedwindow's geometry, since no sash should
3858	3858	# ever be drawn.
3859	3859	panedwindow .p -borderwidth 2 -sashpad 5 \

3896	3896	deleteWindows
3897	3897	} -result {{2 27} {2 57}}
3898	3898
3899		test panedwindow-19.110 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
	3899	test panedwindow-19.110 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
3900	3900	deleteWindows
3901	3901	} -body {
3902	3902	panedwindow .p -borderwidth 2 -sashpad 5 \

3917	3917	} -cleanup {
3918	3918	deleteWindows
3919	3919	} -result {{5 13 20 20} {5 65 20 20} {5 117 20 20}}
3920		test panedwindow-19.111 {ComputeGeometry, one slave, reqsize set properly} -setup {
3921		deleteWindows
3922		} -body {
3923		# With just one slave, sashpad and sashwidth should not
	3920	test panedwindow-19.111 {ComputeGeometry, one pane, reqsize set properly} -setup {
	3921	deleteWindows
	3922	} -body {
	3923	# With just one pane, sashpad and sashwidth should not
3924	3924	# affect the panedwindow's geometry, since no sash should
3925	3925	# ever be drawn.
3926	3926	panedwindow .p -borderwidth 2 -sashpad 5 \

3958	3958	deleteWindows
3959	3959	} -result {{30 2} {66 2}}
3960	3960
3961		test panedwindow-19.114 {ComputeGeometry/ArrangePanes, slave coords} -setup {
	3961	test panedwindow-19.114 {ComputeGeometry/ArrangePanes, pane coords} -setup {
3962	3962	deleteWindows
3963	3963	} -body {
3964	3964	panedwindow .p -borderwidth 2 -sashpad 5 \

3979	3979	deleteWindows
3980	3980	} -result {{13 5 20 20} {71 5 20 20} {129 5 20 20}}
3981	3981
3982		test panedwindow-19.115 {ComputeGeometry, one slave, vertical} -setup {
3983		deleteWindows
3984		} -body {
3985		# With just one slave, sashpad and sashwidth should not
	3982	test panedwindow-19.115 {ComputeGeometry, one pane, vertical} -setup {
	3983	deleteWindows
	3984	} -body {
	3985	# With just one pane, sashpad and sashwidth should not
3986	3986	# affect the panedwindow's geometry, since no sash should
3987	3987	# ever be drawn.
3988	3988	panedwindow .p -borderwidth 2 -sashpad 5 \

4025	4025	deleteWindows
4026	4026	} -result {{2 30} {2 66}}
4027	4027
4028		test panedwindow-19.118 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
	4028	test panedwindow-19.118 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
4029	4029	deleteWindows
4030	4030	} -body {
4031	4031	panedwindow .p -borderwidth 2 -sashpad 5 \

4046	4046	} -cleanup {
4047	4047	deleteWindows
4048	4048	} -result {{5 13 20 20} {5 71 20 20} {5 129 20 20}}
4049		test panedwindow-19.119 {ComputeGeometry, one slave, reqsize set properly} -setup {
4050		deleteWindows
4051		} -body {
4052		# With just one slave, sashpad and sashwidth should not
	4049	test panedwindow-19.119 {ComputeGeometry, one pane, reqsize set properly} -setup {
	4050	deleteWindows
	4051	} -body {
	4052	# With just one pane, sashpad and sashwidth should not
4053	4053	# affect the panedwindow's geometry, since no sash should
4054	4054	# ever be drawn.
4055	4055	panedwindow .p -borderwidth 2 -sashpad 5 \

4087	4087	deleteWindows
4088	4088	} -result {{27 2} {60 2}}
4089	4089
4090		test panedwindow-19.122 {ComputeGeometry/ArrangePanes, slave coords} -setup {
	4090	test panedwindow-19.122 {ComputeGeometry/ArrangePanes, pane coords} -setup {
4091	4091	deleteWindows
4092	4092	} -body {
4093	4093	panedwindow .p -borderwidth 2 -sashpad 5 \

4108	4108	deleteWindows
4109	4109	} -result {{13 5 20 20} {68 5 20 20} {123 5 20 20}}
4110	4110
4111		test panedwindow-19.123 {ComputeGeometry, one slave, vertical} -setup {
4112		deleteWindows
4113		} -body {
4114		# With just one slave, sashpad and sashwidth should not
	4111	test panedwindow-19.123 {ComputeGeometry, one pane, vertical} -setup {
	4112	deleteWindows
	4113	} -body {
	4114	# With just one pane, sashpad and sashwidth should not
4115	4115	# affect the panedwindow's geometry, since no sash should
4116	4116	# ever be drawn.
4117	4117	panedwindow .p -borderwidth 2 -sashpad 5 \

4154	4154	deleteWindows
4155	4155	} -result {{2 27} {2 60}}
4156	4156
4157		test panedwindow-19.126 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
	4157	test panedwindow-19.126 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
4158	4158	deleteWindows
4159	4159	} -body {
4160	4160	panedwindow .p -borderwidth 2 -sashpad 5 \

4175	4175	} -cleanup {
4176	4176	deleteWindows
4177	4177	} -result {{5 13 20 20} {5 68 20 20} {5 123 20 20}}
4178		test panedwindow-19.127 {ComputeGeometry, one slave, reqsize set properly} -setup {
4179		deleteWindows
4180		} -body {
4181		# With just one slave, sashpad and sashwidth should not
	4178	test panedwindow-19.127 {ComputeGeometry, one pane, reqsize set properly} -setup {
	4179	deleteWindows
	4180	} -body {
	4181	# With just one pane, sashpad and sashwidth should not
4182	4182	# affect the panedwindow's geometry, since no sash should
4183	4183	# ever be drawn.
4184	4184	panedwindow .p -borderwidth 2 -sashpad 5 \

4216	4216	deleteWindows
4217	4217	} -result {{28 2} {64 2}}
4218	4218
4219		test panedwindow-19.130 {ComputeGeometry/ArrangePanes, slave coords} -setup {
	4219	test panedwindow-19.130 {ComputeGeometry/ArrangePanes, pane coords} -setup {
4220	4220	deleteWindows
4221	4221	} -body {
4222	4222	panedwindow .p -borderwidth 2 -sashpad 5 \

4237	4237	deleteWindows
4238	4238	} -result {{13 5 20 20} {71 5 20 20} {129 5 20 20}}
4239	4239
4240		test panedwindow-19.131 {ComputeGeometry, one slave, vertical} -setup {
4241		deleteWindows
4242		} -body {
4243		# With just one slave, sashpad and sashwidth should not
	4240	test panedwindow-19.131 {ComputeGeometry, one pane, vertical} -setup {
	4241	deleteWindows
	4242	} -body {
	4243	# With just one pane, sashpad and sashwidth should not
4244	4244	# affect the panedwindow's geometry, since no sash should
4245	4245	# ever be drawn.
4246	4246	panedwindow .p -borderwidth 2 -sashpad 5 \

4283	4283	deleteWindows
4284	4284	} -result {{2 28} {2 64}}
4285	4285
4286		test panedwindow-19.134 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
	4286	test panedwindow-19.134 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
4287	4287	deleteWindows
4288	4288	} -body {
4289	4289	panedwindow .p -borderwidth 2 -sashpad 5 \

4316	4316	} -cleanup {
4317	4317	deleteWindows
4318	4318	} -result {}
4319		test panedwindow-20.2 {destroyed slave causes geometry recomputation} -setup {
	4319	test panedwindow-20.2 {destroyed pane causes geometry recomputation} -setup {
4320	4320	deleteWindows
4321	4321	} -body {
4322	4322	panedwindow .p -borderwidth 0 -sashpad 0 -sashwidth 2

4327	4327	} -cleanup {
4328	4328	deleteWindows
4329	4329	} -result 20
4330
	4330
4331	4331
4332	4332	test panedwindow-21.1 {ArrangePanes, extra space is given to the last pane} -setup {
4333	4333	deleteWindows

4536	4536	} -result {50 150 1 1 211 50 150 1 89 300}
4537	4537
4538	4538
4539		test panedwindow-22.1 {PanedWindowReqProc, react to slave geometry changes} -setup {
	4539	test panedwindow-22.1 {PanedWindowReqProc, react to pane geometry changes} -setup {
4540	4540	deleteWindows
4541	4541	} -body {
4542	4542	# Basically just want to make sure that the PanedWindowReqProc is called

4549	4549	} -cleanup {
4550	4550	deleteWindows
4551	4551	} -result {40 80}
4552		test panedwindow-22.2 {PanedWindowReqProc, react to slave geometry changes} -setup {
	4552	test panedwindow-22.2 {PanedWindowReqProc, react to pane geometry changes} -setup {
4553	4553	deleteWindows
4554	4554	} -body {
4555	4555	panedwindow .p -orient horizontal -sashpad 0 -sashwidth 2

4823	4823	} -cleanup {
4824	4824	deleteWindows
4825	4825	} -result {.d .b .a .c}
4826		test panedwindow-23.22 {ConfigurePanes, slave specified multiple times} -setup {
	4826	test panedwindow-23.22 {ConfigurePanes, pane specified multiple times} -setup {
4827	4827	deleteWindows
4828	4828	} -body {
4829	4829	# This test should not cause a core dump

4838	4838	} -cleanup {
4839	4839	deleteWindows
4840	4840	} -result {.a .b .c}
4841		test panedwindow-23.23 {ConfigurePanes, slave specified multiple times} -setup {
	4841	test panedwindow-23.23 {ConfigurePanes, pane specified multiple times} -setup {
4842	4842	deleteWindows
4843	4843	} -body {
4844	4844	# This test should not cause a core dump

5145	5145	}
5146	5146	set result {}
5147	5147	} -result {}
5148		test panedwindow-25.2 {UnmapNotify and MapNotify events are propagated to slaves} -setup {
	5148	test panedwindow-25.2 {UnmapNotify and MapNotify events are propagated to panes} -setup {
5149	5149	deleteWindows
5150	5150	} -body {
5151	5151	panedwindow .pw

+63

-53

tests/place.test less more

11	11
12	12	# Used for constraining memory leak tests
13	13	testConstraint memory [llength [info commands memory]]
	14
	15	testConstraint failsOnUbuntu [expr {![info exists ::env(CI)] \|\| ![string match Linux $::tcl_platform(os)]}]
	16	testConstraint failsOnXQuarz [expr {$tcl_platform(os) ne "Darwin" \|\| [tk windowingsystem] ne "x11" }]
14	17
15	18	# XXX - This test file is woefully incomplete. At present, only a
16	19	# few of the features are tested.

52	55	} -result {-in {.t.a b} -x 1 -relx 0.2 -y 2 -rely 0.2 -width {} -relwidth 0.3 -height 4 -relheight {} -anchor w -bordermode ignore}
53	56
54	57
55		test place-2.1 {ConfigureSlave procedure, -height option} -body {
	58	test place-2.1 {ConfigureContent procedure, -height option} -body {
56	59	place .t.f2 -height abcd
57	60	} -returnCodes error -result {bad screen distance "abcd"}
58		test place-2.2 {ConfigureSlave procedure, -height option} -setup {
	61	test place-2.2 {ConfigureContent procedure, -height option} -setup {
59	62	place forget .t.f2
60	63	} -body {
61	64	place .t.f2 -in .t.f -height 40
62	65	update
63	66	winfo height .t.f2
64	67	} -result {40}
65		test place-2.3 {ConfigureSlave procedure, -height option} -setup {
	68	test place-2.3 {ConfigureContent procedure, -height option} -setup {
66	69	place forget .t.f2
67	70	} -body {
68	71	place .t.f2 -in .t.f -height 120

73	76	} -result {60}
74	77
75	78
76		test place-3.1 {ConfigureSlave procedure, -relheight option} -body {
	79	test place-3.1 {ConfigureContent procedure, -relheight option} -body {
77	80	place .t.f2 -relheight abcd
78	81	} -returnCodes error -result {expected floating-point number but got "abcd"}
79		test place-3.2 {ConfigureSlave procedure, -relheight option} -setup {
	82	test place-3.2 {ConfigureContent procedure, -relheight option} -setup {
80	83	place forget .t.f2
81	84	} -body {
82	85	place .t.f2 -in .t.f -relheight .5
83	86	update
84	87	winfo height .t.f2
85	88	} -result {40}
86		test place-3.3 {ConfigureSlave procedure, -relheight option} -setup {
	89	test place-3.3 {ConfigureContent procedure, -relheight option} -setup {
87	90	place forget .t.f2
88	91	} -body {
89	92	place .t.f2 -in .t.f -relheight .8

94	97	} -result {60}
95	98
96	99
97		test place-4.1 {ConfigureSlave procedure, bad -in options} -setup {
	100	test place-4.1 {ConfigureContent procedure, bad -in options} -setup {
98	101	place forget .t.f2
99	102	} -body {
100	103	place .t.f2 -in .t.f2
101	104	} -returnCodes error -result {can't place .t.f2 relative to itself}
102		test place-4.2 {ConfigureSlave procedure, bad -in option} -setup {
	105	test place-4.2 {ConfigureContent procedure, bad -in option} -setup {
103	106	place forget .t.f2
104	107	} -body {
105	108	set result [list [winfo manager .t.f2]]
106	109	catch {place .t.f2 -in .t.f2}
107	110	lappend result [winfo manager .t.f2]
108	111	} -result {{} {}}
109		test place-4.3 {ConfigureSlave procedure, bad -in option} -setup {
	112	test place-4.3 {ConfigureContent procedure, bad -in option} -setup {
110	113	place forget .t.f2
111	114	} -body {
112	115	winfo manager .t.f2
113	116	place .t.f2 -in .t.f2
114	117	} -returnCodes error -result {can't place .t.f2 relative to itself}
115		test place-4.4 {ConfigureSlave procedure, bad -in option} -setup {
	118	test place-4.4 {ConfigureContent procedure, bad -in option} -setup {
116	119	place forget .t.f2
117	120	} -body {
118	121	place .t.f2 -in .
119	122	} -returnCodes error -result {can't place .t.f2 relative to .}
120		test place-4.5 {ConfigureSlave procedure, bad -in option} -setup {
	123	test place-4.5 {ConfigureContent procedure, bad -in option} -setup {
121	124	} -body {
122	125	frame .t.f1
123	126	place .t.f1 -in .t.f1

138	141	place .t.f3 -in .t.f1
139	142	} -returnCodes error -result {can't put .t.f3 inside .t.f1, would cause management loop}
140	143
141		test place-5.1 {ConfigureSlave procedure, -relwidth option} -body {
	144	test place-5.1 {ConfigureContent procedure, -relwidth option} -body {
142	145	place .t.f2 -relwidth abcd
143	146	} -returnCodes error -result {expected floating-point number but got "abcd"}
144		test place-5.2 {ConfigureSlave procedure, -relwidth option} -setup {
	147	test place-5.2 {ConfigureContent procedure, -relwidth option} -setup {
145	148	place forget .t.f2
146	149	} -body {
147	150	place .t.f2 -in .t.f -relwidth .5
148	151	update
149	152	winfo width .t.f2
150	153	} -result {75}
151		test place-5.3 {ConfigureSlave procedure, -relwidth option} -setup {
	154	test place-5.3 {ConfigureContent procedure, -relwidth option} -setup {
152	155	place forget .t.f2
153	156	} -body {
154	157	place .t.f2 -in .t.f -relwidth .8

158	161	winfo width .t.f2
159	162	} -result {30}
160	163
161		test place-6.1 {ConfigureSlave procedure, -width option} -body {
	164	test place-6.1 {ConfigureContent procedure, -width option} -body {
162	165	place .t.f2 -width abcd
163	166	} -returnCodes error -result {bad screen distance "abcd"}
164		test place-6.2 {ConfigureSlave procedure, -width option} -setup {
	167	test place-6.2 {ConfigureContent procedure, -width option} -setup {
165	168	place forget .t.f2
166	169	} -body {
167	170	place .t.f2 -in .t.f -width 100
168	171	update
169	172	winfo width .t.f2
170	173	} -result {100}
171		test place-6.3 {ConfigureSlave procedure, -width option} -setup {
	174	test place-6.3 {ConfigureContent procedure, -width option} -setup {
172	175	place forget .t.f2
173	176	} -body {
174	177	place .t.f2 -in .t.f -width 120

257	260	list [winfo width .t.f2] [winfo height .t.f2]
258	261	} -result {30 60}
259	262
260
261		test place-8.1 {MasterStructureProc, mapping and unmapping slaves} -setup {
	263	if {[tk windowingsystem] ne "aqua"} {
	264	proc placeUpdate {} {
	265	update
	266	}
	267	} else {
	268	proc placeUpdate {} {
	269	}
	270	}
	271
	272	test place-8.1 {PlaceStructureProc, mapping and unmapping content} -constraints {failsOnUbuntu failsOnXQuarz} -setup {
262	273	place forget .t.f2
263	274	place forget .t.f
264	275	} -body {
265	276	place .t.f2 -relx 1.0 -rely 1.0 -anchor sw
266		update
	277	update idletasks
267	278	set result [winfo ismapped .t.f2]
268	279	wm iconify .t
269		update
270	280	lappend result [winfo ismapped .t.f2]
271	281	place .t.f2 -x 40 -y 30 -relx 0 -rely 0 -anchor nw
272		update
	282	update idletasks
273	283	lappend result [winfo x .t.f2] [winfo y .t.f2] [winfo ismapped .t.f2]
274	284	wm deiconify .t
275		update
	285	placeUpdate
276	286	lappend result [winfo ismapped .t.f2]
277	287	} -result {1 0 40 30 0 1}
278		test place-8.2 {MasterStructureProc, mapping and unmapping slaves} -setup {
	288	test place-8.2 {PlaceStructureProc, mapping and unmapping content} -constraints {failsOnUbuntu failsOnXQuarz} -setup {
279	289	place forget .t.f2
280	290	place forget .t.f
	291	update idletasks
281	292	} -body {
282	293	place .t.f -x 0 -y 0 -width 200 -height 100
283	294	place .t.f2 -in .t.f -relx 1.0 -rely 1.0 -anchor sw -width 50 -height 20
284		update
	295	update idletasks
285	296	set result [winfo ismapped .t.f2]
286	297	wm iconify .t
287		update
288	298	lappend result [winfo ismapped .t.f2]
289	299	place .t.f2 -x 40 -y 30 -relx 0 -rely 0 -anchor nw
290		update
	300	update idletasks
291	301	lappend result [winfo x .t.f2] [winfo y .t.f2] [winfo ismapped .t.f2]
292	302	wm deiconify .t
293		update
	303	placeUpdate
294	304	lappend result [winfo ismapped .t.f2]
295	305	} -result {1 0 42 32 0 1}
296	306	destroy .t

321	331	place badopt .foo
322	332	} -cleanup {
323	333	destroy .foo
324		} -returnCodes error -result {bad option "badopt": must be configure, forget, info, or slaves}
	334	} -returnCodes error -result {bad option "badopt": must be configure, content, forget, info, or slaves}
325	335	test place-9.6 {PlaceObjCmd, configure errors} -setup {
326	336	destroy .foo
327	337	} -body {

372	382	} -cleanup {
373	383	destroy .foo
374	384	} -returnCodes error -result {wrong # args: should be "place info pathName"}
375		test place-9.12 {PlaceObjCmd, slaves errors} -setup {
376		destroy .foo
377		} -body {
378		frame .foo
379		place slaves .foo bar
380		} -cleanup {
381		destroy .foo
382		} -returnCodes error -result {wrong # args: should be "place slaves pathName"}
383
384
385		test place-10.1 {ConfigureSlave} -setup {
	385	test place-9.12 {PlaceObjCmd, content errors} -setup {
	386	destroy .foo
	387	} -body {
	388	frame .foo
	389	place content .foo bar
	390	} -cleanup {
	391	destroy .foo
	392	} -returnCodes error -result {wrong # args: should be "place content pathName"}
	393
	394
	395	test place-10.1 {ConfigureContent} -setup {
386	396	destroy .foo
387	397	} -body {
388	398	frame .foo

390	400	} -cleanup {
391	401	destroy .foo
392	402	} -returnCodes error -result {unknown option "-badopt"}
393		test place-10.2 {ConfigureSlave} -setup {
	403	test place-10.2 {ConfigureContent} -setup {
394	404	destroy .foo
395	405	} -body {
396	406	frame .foo

398	408	} -cleanup {
399	409	destroy .foo
400	410	} -returnCodes error -result {value for "-anchor" missing}
401		test place-10.3 {ConfigureSlave} -setup {
	411	test place-10.3 {ConfigureContent} -setup {
402	412	destroy .foo
403	413	} -body {
404	414	frame .foo

406	416	} -cleanup {
407	417	destroy .foo
408	418	} -returnCodes error -result {bad bordermode "j": must be inside, outside, or ignore}
409		test place-10.4 {ConfigureSlave} -setup {
	419	test place-10.4 {ConfigureContent} -setup {
410	420	destroy .foo
411	421	} -body {
412	422	frame .foo

414	424	} -cleanup {
415	425	destroy .foo
416	426	} -returnCodes error -result {value for "-y" missing}
417
418
419		test place-11.1 {PlaceObjCmd, slaves command} -setup {
420		destroy .foo
421		} -body {
422		frame .foo
423		place slaves .foo
	427
	428
	429	test place-11.1 {PlaceObjCmd, content command} -setup {
	430	destroy .foo
	431	} -body {
	432	frame .foo
	433	place content .foo
424	434	} -cleanup {
425	435	destroy .foo
426	436	} -result {}
427		test place-11.2 {PlaceObjCmd, slaves command} -setup {
	437	test place-11.2 {PlaceObjCmd, content command} -setup {
428	438	destroy .foo .bar
429	439	} -body {
430	440	frame .foo
431	441	frame .bar
432	442	place .bar -in .foo
433		place slaves .foo
	443	place content .foo
434	444	} -cleanup {
435	445	destroy .foo .bar
436	446	} -result [list .bar]

492	502	return $res
493	503	}
494	504	} -body {
495		# Test all manners of forgetting a slave
	505	# Test all manners of forgetting content
496	506	frame .f
497	507	frame .f.f
498	508	stress {

+28

-13

tests/safe.test less more

27	27	# This probably means that tk wasn't installed properly.
28	28
29	29	## it indicates that something went wrong sourcing tk.tcl.
30		## Ensure that any changes that occured to tk.tcl will work or are properly
	30	## Ensure that any changes that occurred to tk.tcl will work or are properly
31	31	## prevented in a safe interpreter. -- hobbs
32	32
33	33	# The set of hidden commands is platform dependent:
34	34
35		set hidden_cmds {bell cd clipboard encoding exec exit fconfigure glob grab load menu open pwd selection socket source tcl:encoding:dirs toplevel unload wm}
36		lappend hidden_cmds {*}[apply {{} {
	35	set hidden_cmds [list bell cd clipboard encoding exec exit \
	36	fconfigure glob grab load menu open pwd selection \
	37	socket source toplevel unload wm]
	38	if {[package vsatisfies [package provide Tcl] 8.6.7-]} {
	39	lappend hidden_cmds tcl:encoding:dirs
	40	}
	41	if {[package vsatisfies [package provide Tcl] 8.7-]} {
	42	lappend hidden_cmds file tcl:encoding:system tcl:file:tempdir
37	43	foreach cmd {
38		atime attributes copy delete dirname executable exists extension
39		isdirectory isfile link lstat mkdir mtime nativename normalize owned
40		readable readlink rename rootname size stat tail tempfile type
41		volumes writable
42		} {lappend result tcl:file:$cmd}; return $result
43		}}]
	44	cmdtype nameofexecutable
	45	} {lappend hidden_cmds tcl:info:$cmd}
	46	foreach cmd {
	47	autopurge list purge status
	48	} {lappend hidden_cmds tcl:process:$cmd}
	49	foreach cmd {
	50	lmkimg lmkzip mkimg mkkey mkzip mount mount_data unmount
	51	} {lappend hidden_cmds tcl:zipfs:$cmd}
	52	}
	53	foreach cmd {
	54	atime attributes copy delete dirname executable exists extension
	55	isdirectory isfile link lstat mkdir mtime nativename normalize
	56	owned readable readlink rename rootname size stat tail tempfile
	57	type volumes writable
	58	} {lappend hidden_cmds tcl:file:$cmd}
44	59	if {[tk windowingsystem] ne "x11"} {
45		lappend hidden_cmds tk_chooseColor tk_chooseDirectory tk_getOpenFile \
46		tk_getSaveFile tk_messageBox
	60	lappend hidden_cmds tk_chooseColor tk_chooseDirectory \
	61	tk_getOpenFile tk_getSaveFile tk_messageBox
47	62	}
48	63	if {[llength [info commands send]]} {
49	64	lappend hidden_cmds send

181	196	destroy $w
182	197	} -result {}
183	198
184		test safe-5.1 {loading Tk in safe interps without master's clearance} -body {
	199	test safe-5.1 {loading Tk in safe interps without parent's clearance} -body {
185	200	set i [safe::interpCreate]
186	201	interp eval $i {load {} Tk}
187	202	} -cleanup {
188	203	safe::interpDelete $i
189		} -returnCodes error -result {not allowed}
	204	} -returnCodes error -match glob -result {*not allowed}
190	205	test safe-5.2 {multi-level Tk loading with clearance} -setup {
191	206	set safeParent [safe::interpCreate]
192	207	} -body {

+306

-306

tests/safePrimarySelection.test less more

15	15	# ------------------------------------------------------------------------------
16	16	# - Tests 3., 6. test that the fix for ticket de156e9efe implemented in branch
17	17	# bug-de156e9efe has been applied and still works. They test that a Safe Base
18		# slave interpreter cannot write to the PRIMARY selection.
19		# - The other tests verify that the master interpreter and an unsafe slave CAN
20		# write to the PRIMARY selection, and therefore that the test scripts
	18	# child interpreter cannot write to the PRIMARY selection.
	19	# - The other tests verify that the parent interpreter and an child interpreter
	20	# CAN write to the PRIMARY selection, and therefore that the test scripts
21	21	# themselves are valid.
22	22	# - A text, entry, ttk::entry, listbox, spinbox or ttk::spinbox widget can have
23	23	# option -exportselection 1, meaning (in an unsafe interpreter) that a

32	32	# ------------------------------------------------------------------------------
33	33	# Proc ::_test_tmp::unsafeInterp
34	34	# ------------------------------------------------------------------------------
35		# Command that creates an unsafe child interpreter and tries to load Tk.
	35	# Command that creates an child interpreter and tries to load Tk.
36	36	# - This is necessary for loading Tk if the tests are done in the build
37	37	# directory without installing Tk. In that case the usual auto_path loading
38	38	# mechanism cannot work because the tk binary is not where pkgIndex.tcl says
39	39	# it is.
40		# - This command is not needed for Safe Base slaves because safe::loadTk does
	40	# - This command is not needed for Safe Base children because safe::loadTk does
41	41	# something similar and works correctly.
42	42	# - Based on scripts in winSend.test.
43	43	# ------------------------------------------------------------------------------

207	207	}
208	208	}
209	209
210		# Do this once for the master interpreter.
	210	# Do this once for the parent interpreter.
211	211	eval $::_test_tmp::script
212	212
213		test safePrimarySelection-1.1 {master interpreter, text, no existing selection} -setup {
214		catch {interp delete slave2}
	213	test safePrimarySelection-1.1 {parent interpreter, text, no existing selection} -setup {
	214	catch {interp delete child2}
215	215	destroy {*}[winfo children .]
216	216	::_test_tmp::clearPrimarySelection
217	217	} -body {

222	222	::_test_tmp::clearPrimarySelection
223	223	} -result {PAYLOAD}
224	224
225		test safePrimarySelection-1.2 {master interpreter, entry, no existing selection} -setup {
226		catch {interp delete slave2}
	225	test safePrimarySelection-1.2 {parent interpreter, entry, no existing selection} -setup {
	226	catch {interp delete child2}
227	227	destroy {*}[winfo children .]
228	228	::_test_tmp::clearPrimarySelection
229	229	} -body {

234	234	::_test_tmp::clearPrimarySelection
235	235	} -result {PAYLOAD}
236	236
237		test safePrimarySelection-1.3 {master interpreter, ttk::entry, no existing selection} -setup {
238		catch {interp delete slave2}
	237	test safePrimarySelection-1.3 {parent interpreter, ttk::entry, no existing selection} -setup {
	238	catch {interp delete child2}
239	239	destroy {*}[winfo children .]
240	240	::_test_tmp::clearPrimarySelection
241	241	} -body {

246	246	::_test_tmp::clearPrimarySelection
247	247	} -result {PAYLOAD}
248	248
249		test safePrimarySelection-1.4 {master interpreter, listbox, no existing selection} -setup {
250		catch {interp delete slave2}
	249	test safePrimarySelection-1.4 {parent interpreter, listbox, no existing selection} -setup {
	250	catch {interp delete child2}
251	251	destroy {*}[winfo children .]
252	252	::_test_tmp::clearPrimarySelection
253	253	} -body {

258	258	::_test_tmp::clearPrimarySelection
259	259	} -result {PAYLOAD}
260	260
261		test safePrimarySelection-1.5 {master interpreter, spinbox as entry, no existing selection} -setup {
262		catch {interp delete slave2}
	261	test safePrimarySelection-1.5 {parent interpreter, spinbox as entry, no existing selection} -setup {
	262	catch {interp delete child2}
263	263	destroy {*}[winfo children .]
264	264	::_test_tmp::clearPrimarySelection
265	265	} -body {

270	270	::_test_tmp::clearPrimarySelection
271	271	} -result {PAYLOAD}
272	272
273		test safePrimarySelection-1.6 {master interpreter, spinbox spun, no existing selection} -setup {
274		catch {interp delete slave2}
	273	test safePrimarySelection-1.6 {parent interpreter, spinbox spun, no existing selection} -setup {
	274	catch {interp delete child2}
275	275	destroy {*}[winfo children .]
276	276	::_test_tmp::clearPrimarySelection
277	277	} -body {

282	282	::_test_tmp::clearPrimarySelection
283	283	} -result {2}
284	284
285		test safePrimarySelection-1.7 {master interpreter, spinbox spun/selected/spun, no existing selection} -setup {
286		catch {interp delete slave2}
	285	test safePrimarySelection-1.7 {parent interpreter, spinbox spun/selected/spun, no existing selection} -setup {
	286	catch {interp delete child2}
287	287	destroy {*}[winfo children .]
288	288	::_test_tmp::clearPrimarySelection
289	289	} -body {

294	294	::_test_tmp::clearPrimarySelection
295	295	} -result {3}
296	296
297		test safePrimarySelection-1.8 {master interpreter, ttk::spinbox as entry, no existing selection} -setup {
298		catch {interp delete slave2}
	297	test safePrimarySelection-1.8 {parent interpreter, ttk::spinbox as entry, no existing selection} -setup {
	298	catch {interp delete child2}
299	299	destroy {*}[winfo children .]
300	300	::_test_tmp::clearPrimarySelection
301	301	} -body {

306	306	::_test_tmp::clearPrimarySelection
307	307	} -result {PAYLOAD}
308	308
309		test safePrimarySelection-1.9 {master interpreter, ttk::spinbox spun, no existing selection} -setup {
310		catch {interp delete slave2}
	309	test safePrimarySelection-1.9 {parent interpreter, ttk::spinbox spun, no existing selection} -setup {
	310	catch {interp delete child2}
311	311	destroy {*}[winfo children .]
312	312	::_test_tmp::clearPrimarySelection
313	313	} -body {

318	318	::_test_tmp::clearPrimarySelection
319	319	} -result {2}
320	320
321		test safePrimarySelection-1.10 {master interpreter, ttk::spinbox spun/selected/spun, no existing selection} -setup {
322		catch {interp delete slave2}
	321	test safePrimarySelection-1.10 {parent interpreter, ttk::spinbox spun/selected/spun, no existing selection} -setup {
	322	catch {interp delete child2}
323	323	destroy {*}[winfo children .]
324	324	::_test_tmp::clearPrimarySelection
325	325	} -body {

330	330	::_test_tmp::clearPrimarySelection
331	331	} -result {3}
332	332
333		test safePrimarySelection-2.1 {unsafe slave interpreter, text, no existing selection} -setup {
334		catch {interp delete slave2}
335		destroy {*}[winfo children .]
336		::_test_tmp::clearPrimarySelection
337		} -body {
338		set int2 slave2
	333	test safePrimarySelection-2.1 {child interpreter, text, no existing selection} -setup {
	334	catch {interp delete child2}
	335	destroy {*}[winfo children .]
	336	::_test_tmp::clearPrimarySelection
	337	} -body {
	338	set int2 child2
339	339	::_test_tmp::unsafeInterp $int2
340	340	$int2 eval $::_test_tmp::script
341	341	$int2 eval ::_test_tmp::tryText

347	347	::_test_tmp::clearPrimarySelection
348	348	} -result {PAYLOAD}
349	349
350		test safePrimarySelection-2.2 {unsafe slave interpreter, entry, no existing selection} -setup {
351		catch {interp delete slave2}
352		destroy {*}[winfo children .]
353		::_test_tmp::clearPrimarySelection
354		} -body {
355		set int2 slave2
	350	test safePrimarySelection-2.2 {child interpreter, entry, no existing selection} -setup {
	351	catch {interp delete child2}
	352	destroy {*}[winfo children .]
	353	::_test_tmp::clearPrimarySelection
	354	} -body {
	355	set int2 child2
356	356	::_test_tmp::unsafeInterp $int2
357	357	$int2 eval $::_test_tmp::script
358	358	$int2 eval ::_test_tmp::tryEntry

364	364	::_test_tmp::clearPrimarySelection
365	365	} -result {PAYLOAD}
366	366
367		test safePrimarySelection-2.3 {unsafe slave interpreter, ttk::entry, no existing selection} -setup {
368		catch {interp delete slave2}
369		destroy {*}[winfo children .]
370		::_test_tmp::clearPrimarySelection
371		} -body {
372		set int2 slave2
	367	test safePrimarySelection-2.3 {child interpreter, ttk::entry, no existing selection} -setup {
	368	catch {interp delete child2}
	369	destroy {*}[winfo children .]
	370	::_test_tmp::clearPrimarySelection
	371	} -body {
	372	set int2 child2
373	373	::_test_tmp::unsafeInterp $int2
374	374	$int2 eval $::_test_tmp::script
375	375	$int2 eval ::_test_tmp::tryTtkEntry

381	381	::_test_tmp::clearPrimarySelection
382	382	} -result {PAYLOAD}
383	383
384		test safePrimarySelection-2.4 {unsafe slave interpreter, listbox, no existing selection} -setup {
385		catch {interp delete slave2}
386		destroy {*}[winfo children .]
387		::_test_tmp::clearPrimarySelection
388		} -body {
389		set int2 slave2
	384	test safePrimarySelection-2.4 {child interpreter, listbox, no existing selection} -setup {
	385	catch {interp delete child2}
	386	destroy {*}[winfo children .]
	387	::_test_tmp::clearPrimarySelection
	388	} -body {
	389	set int2 child2
390	390	::_test_tmp::unsafeInterp $int2
391	391	$int2 eval $::_test_tmp::script
392	392	$int2 eval ::_test_tmp::tryListbox

398	398	::_test_tmp::clearPrimarySelection
399	399	} -result {PAYLOAD}
400	400
401		test safePrimarySelection-2.5 {unsafe slave interpreter, spinbox as entry, no existing selection} -setup {
402		catch {interp delete slave2}
403		destroy {*}[winfo children .]
404		::_test_tmp::clearPrimarySelection
405		} -body {
406		set int2 slave2
	401	test safePrimarySelection-2.5 {child interpreter, spinbox as entry, no existing selection} -setup {
	402	catch {interp delete child2}
	403	destroy {*}[winfo children .]
	404	::_test_tmp::clearPrimarySelection
	405	} -body {
	406	set int2 child2
407	407	::_test_tmp::unsafeInterp $int2
408	408	$int2 eval $::_test_tmp::script
409	409	$int2 eval ::_test_tmp::trySpinbox 1

415	415	::_test_tmp::clearPrimarySelection
416	416	} -result {PAYLOAD}
417	417
418		test safePrimarySelection-2.6 {unsafe slave interpreter, spinbox spun, no existing selection} -setup {
419		catch {interp delete slave2}
420		destroy {*}[winfo children .]
421		::_test_tmp::clearPrimarySelection
422		} -body {
423		set int2 slave2
	418	test safePrimarySelection-2.6 {child interpreter, spinbox spun, no existing selection} -setup {
	419	catch {interp delete child2}
	420	destroy {*}[winfo children .]
	421	::_test_tmp::clearPrimarySelection
	422	} -body {
	423	set int2 child2
424	424	::_test_tmp::unsafeInterp $int2
425	425	$int2 eval $::_test_tmp::script
426	426	$int2 eval ::_test_tmp::trySpinbox 2

432	432	::_test_tmp::clearPrimarySelection
433	433	} -result {2}
434	434
435		test safePrimarySelection-2.7 {unsafe slave interpreter, spinbox spun/selected/spun, no existing selection} -setup {
436		catch {interp delete slave2}
437		destroy {*}[winfo children .]
438		::_test_tmp::clearPrimarySelection
439		} -body {
440		set int2 slave2
	435	test safePrimarySelection-2.7 {child interpreter, spinbox spun/selected/spun, no existing selection} -setup {
	436	catch {interp delete child2}
	437	destroy {*}[winfo children .]
	438	::_test_tmp::clearPrimarySelection
	439	} -body {
	440	set int2 child2
441	441	::_test_tmp::unsafeInterp $int2
442	442	$int2 eval $::_test_tmp::script
443	443	$int2 eval ::_test_tmp::trySpinbox 3

449	449	::_test_tmp::clearPrimarySelection
450	450	} -result {3}
451	451
452		test safePrimarySelection-2.8 {unsafe slave interpreter, ttk::spinbox as entry, no existing selection} -setup {
453		catch {interp delete slave2}
454		destroy {*}[winfo children .]
455		::_test_tmp::clearPrimarySelection
456		} -body {
457		set int2 slave2
	452	test safePrimarySelection-2.8 {child interpreter, ttk::spinbox as entry, no existing selection} -setup {
	453	catch {interp delete child2}
	454	destroy {*}[winfo children .]
	455	::_test_tmp::clearPrimarySelection
	456	} -body {
	457	set int2 child2
458	458	::_test_tmp::unsafeInterp $int2
459	459	$int2 eval $::_test_tmp::script
460	460	$int2 eval ::_test_tmp::tryTtkSpinbox 1

466	466	::_test_tmp::clearPrimarySelection
467	467	} -result {PAYLOAD}
468	468
469		test safePrimarySelection-2.9 {unsafe slave interpreter, ttk::spinbox spun, no existing selection} -setup {
470		catch {interp delete slave2}
471		destroy {*}[winfo children .]
472		::_test_tmp::clearPrimarySelection
473		} -body {
474		set int2 slave2
	469	test safePrimarySelection-2.9 {child interpreter, ttk::spinbox spun, no existing selection} -setup {
	470	catch {interp delete child2}
	471	destroy {*}[winfo children .]
	472	::_test_tmp::clearPrimarySelection
	473	} -body {
	474	set int2 child2
475	475	::_test_tmp::unsafeInterp $int2
476	476	$int2 eval $::_test_tmp::script
477	477	$int2 eval ::_test_tmp::tryTtkSpinbox 2

483	483	::_test_tmp::clearPrimarySelection
484	484	} -result {2}
485	485
486		test safePrimarySelection-2.10 {unsafe slave interpreter, ttk::spinbox spun/selected/spun, no existing selection} -setup {
487		catch {interp delete slave2}
488		destroy {*}[winfo children .]
489		::_test_tmp::clearPrimarySelection
490		} -body {
491		set int2 slave2
	486	test safePrimarySelection-2.10 {child interpreter, ttk::spinbox spun/selected/spun, no existing selection} -setup {
	487	catch {interp delete child2}
	488	destroy {*}[winfo children .]
	489	::_test_tmp::clearPrimarySelection
	490	} -body {
	491	set int2 child2
492	492	::_test_tmp::unsafeInterp $int2
493	493	$int2 eval $::_test_tmp::script
494	494	$int2 eval ::_test_tmp::tryTtkSpinbox 3

500	500	::_test_tmp::clearPrimarySelection
501	501	} -result {3}
502	502
503		test safePrimarySelection-3.1 {IMPORTANT, safe slave interpreter, text, no existing selection} -setup {
504		catch {interp delete slave2}
505		destroy {*}[winfo children .]
506		::_test_tmp::clearPrimarySelection
507		} -body {
508		set res0 [::_test_tmp::getPrimarySelection]
509		set int2 slave2
	503	test safePrimarySelection-3.1 {IMPORTANT, safe interpreter, text, no existing selection} -setup {
	504	catch {interp delete child2}
	505	destroy {*}[winfo children .]
	506	::_test_tmp::clearPrimarySelection
	507	} -body {
	508	set res0 [::_test_tmp::getPrimarySelection]
	509	set int2 child2
510	510	::safe::interpCreate $int2
511	511	::safe::loadTk $int2
512	512	$int2 eval $::_test_tmp::script

521	521	::_test_tmp::clearPrimarySelection
522	522	} -result {----}
523	523
524		test safePrimarySelection-3.2 {IMPORTANT, safe slave interpreter, entry, no existing selection} -setup {
525		catch {interp delete slave2}
526		destroy {*}[winfo children .]
527		::_test_tmp::clearPrimarySelection
528		} -body {
529		set res0 [::_test_tmp::getPrimarySelection]
530		set int2 slave2
	524	test safePrimarySelection-3.2 {IMPORTANT, safe interpreter, entry, no existing selection} -setup {
	525	catch {interp delete child2}
	526	destroy {*}[winfo children .]
	527	::_test_tmp::clearPrimarySelection
	528	} -body {
	529	set res0 [::_test_tmp::getPrimarySelection]
	530	set int2 child2
531	531	::safe::interpCreate $int2
532	532	::safe::loadTk $int2
533	533	$int2 eval $::_test_tmp::script

542	542	::_test_tmp::clearPrimarySelection
543	543	} -result {----}
544	544
545		test safePrimarySelection-3.3 {IMPORTANT, safe slave interpreter, ttk::entry, no existing selection} -setup {
546		catch {interp delete slave2}
547		destroy {*}[winfo children .]
548		::_test_tmp::clearPrimarySelection
549		} -body {
550		set res0 [::_test_tmp::getPrimarySelection]
551		set int2 slave2
	545	test safePrimarySelection-3.3 {IMPORTANT, safe interpreter, ttk::entry, no existing selection} -setup {
	546	catch {interp delete child2}
	547	destroy {*}[winfo children .]
	548	::_test_tmp::clearPrimarySelection
	549	} -body {
	550	set res0 [::_test_tmp::getPrimarySelection]
	551	set int2 child2
552	552	::safe::interpCreate $int2
553	553	::safe::loadTk $int2
554	554	$int2 eval $::_test_tmp::script

563	563	::_test_tmp::clearPrimarySelection
564	564	} -result {----}
565	565
566		test safePrimarySelection-3.4 {IMPORTANT, safe slave interpreter, listbox, no existing selection} -setup {
567		catch {interp delete slave2}
568		destroy {*}[winfo children .]
569		::_test_tmp::clearPrimarySelection
570		} -body {
571		set res0 [::_test_tmp::getPrimarySelection]
572		set int2 slave2
	566	test safePrimarySelection-3.4 {IMPORTANT, safe interpreter, listbox, no existing selection} -setup {
	567	catch {interp delete child2}
	568	destroy {*}[winfo children .]
	569	::_test_tmp::clearPrimarySelection
	570	} -body {
	571	set res0 [::_test_tmp::getPrimarySelection]
	572	set int2 child2
573	573	::safe::interpCreate $int2
574	574	::safe::loadTk $int2
575	575	$int2 eval $::_test_tmp::script

584	584	::_test_tmp::clearPrimarySelection
585	585	} -result {----}
586	586
587		test safePrimarySelection-3.5 {IMPORTANT, safe slave interpreter, spinbox as entry, no existing selection} -setup {
588		catch {interp delete slave2}
589		destroy {*}[winfo children .]
590		::_test_tmp::clearPrimarySelection
591		} -body {
592		set res0 [::_test_tmp::getPrimarySelection]
593		set int2 slave2
	587	test safePrimarySelection-3.5 {IMPORTANT, safe interpreter, spinbox as entry, no existing selection} -setup {
	588	catch {interp delete child2}
	589	destroy {*}[winfo children .]
	590	::_test_tmp::clearPrimarySelection
	591	} -body {
	592	set res0 [::_test_tmp::getPrimarySelection]
	593	set int2 child2
594	594	::safe::interpCreate $int2
595	595	::safe::loadTk $int2
596	596	$int2 eval $::_test_tmp::script

605	605	::_test_tmp::clearPrimarySelection
606	606	} -result {----}
607	607
608		test safePrimarySelection-3.6 {IMPORTANT, safe slave interpreter, spinbox spun, no existing selection} -setup {
609		catch {interp delete slave2}
610		destroy {*}[winfo children .]
611		::_test_tmp::clearPrimarySelection
612		} -body {
613		set res0 [::_test_tmp::getPrimarySelection]
614		set int2 slave2
	608	test safePrimarySelection-3.6 {IMPORTANT, safe interpreter, spinbox spun, no existing selection} -setup {
	609	catch {interp delete child2}
	610	destroy {*}[winfo children .]
	611	::_test_tmp::clearPrimarySelection
	612	} -body {
	613	set res0 [::_test_tmp::getPrimarySelection]
	614	set int2 child2
615	615	::safe::interpCreate $int2
616	616	::safe::loadTk $int2
617	617	$int2 eval $::_test_tmp::script

626	626	::_test_tmp::clearPrimarySelection
627	627	} -result {----}
628	628
629		test safePrimarySelection-3.7 {IMPORTANT, safe slave interpreter, spinbox spun/selected/spun, no existing selection} -setup {
630		catch {interp delete slave2}
631		destroy {*}[winfo children .]
632		::_test_tmp::clearPrimarySelection
633		} -body {
634		set res0 [::_test_tmp::getPrimarySelection]
635		set int2 slave2
	629	test safePrimarySelection-3.7 {IMPORTANT, safe interpreter, spinbox spun/selected/spun, no existing selection} -setup {
	630	catch {interp delete child2}
	631	destroy {*}[winfo children .]
	632	::_test_tmp::clearPrimarySelection
	633	} -body {
	634	set res0 [::_test_tmp::getPrimarySelection]
	635	set int2 child2
636	636	::safe::interpCreate $int2
637	637	::safe::loadTk $int2
638	638	$int2 eval $::_test_tmp::script

647	647	::_test_tmp::clearPrimarySelection
648	648	} -result {----}
649	649
650		test safePrimarySelection-3.8 {IMPORTANT, safe slave interpreter, ttk::spinbox as entry, no existing selection} -setup {
651		catch {interp delete slave2}
652		destroy {*}[winfo children .]
653		::_test_tmp::clearPrimarySelection
654		} -body {
655		set res0 [::_test_tmp::getPrimarySelection]
656		set int2 slave2
	650	test safePrimarySelection-3.8 {IMPORTANT, safe interpreter, ttk::spinbox as entry, no existing selection} -setup {
	651	catch {interp delete child2}
	652	destroy {*}[winfo children .]
	653	::_test_tmp::clearPrimarySelection
	654	} -body {
	655	set res0 [::_test_tmp::getPrimarySelection]
	656	set int2 child2
657	657	::safe::interpCreate $int2
658	658	::safe::loadTk $int2
659	659	$int2 eval $::_test_tmp::script

668	668	::_test_tmp::clearPrimarySelection
669	669	} -result {----}
670	670
671		test safePrimarySelection-3.9 {IMPORTANT, safe slave interpreter, ttk::spinbox spun, no existing selection} -setup {
672		catch {interp delete slave2}
673		destroy {*}[winfo children .]
674		::_test_tmp::clearPrimarySelection
675		} -body {
676		set res0 [::_test_tmp::getPrimarySelection]
677		set int2 slave2
	671	test safePrimarySelection-3.9 {IMPORTANT, safe interpreter, ttk::spinbox spun, no existing selection} -setup {
	672	catch {interp delete child2}
	673	destroy {*}[winfo children .]
	674	::_test_tmp::clearPrimarySelection
	675	} -body {
	676	set res0 [::_test_tmp::getPrimarySelection]
	677	set int2 child2
678	678	::safe::interpCreate $int2
679	679	::safe::loadTk $int2
680	680	$int2 eval $::_test_tmp::script

689	689	::_test_tmp::clearPrimarySelection
690	690	} -result {----}
691	691
692		test safePrimarySelection-3.10 {IMPORTANT, safe slave interpreter, ttk::spinbox spun/selected/spun, no existing selection} -setup {
693		catch {interp delete slave2}
694		destroy {*}[winfo children .]
695		::_test_tmp::clearPrimarySelection
696		} -body {
697		set res0 [::_test_tmp::getPrimarySelection]
698		set int2 slave2
	692	test safePrimarySelection-3.10 {IMPORTANT, safe interpreter, ttk::spinbox spun/selected/spun, no existing selection} -setup {
	693	catch {interp delete child2}
	694	destroy {*}[winfo children .]
	695	::_test_tmp::clearPrimarySelection
	696	} -body {
	697	set res0 [::_test_tmp::getPrimarySelection]
	698	set int2 child2
699	699	::safe::interpCreate $int2
700	700	::safe::loadTk $int2
701	701	$int2 eval $::_test_tmp::script

710	710	::_test_tmp::clearPrimarySelection
711	711	} -result {----}
712	712
713		test safePrimarySelection-4.1 {master interpreter, text, existing selection} -setup {
714		catch {interp delete slave2}
	713	test safePrimarySelection-4.1 {parent interpreter, text, existing selection} -setup {
	714	catch {interp delete child2}
715	715	destroy {*}[winfo children .]
716	716	::_test_tmp::setPrimarySelection
717	717	} -body {

722	722	::_test_tmp::clearPrimarySelection
723	723	} -result {PAYLOAD}
724	724
725		test safePrimarySelection-4.2 {master interpreter, entry, existing selection} -setup {
726		catch {interp delete slave2}
	725	test safePrimarySelection-4.2 {parent interpreter, entry, existing selection} -setup {
	726	catch {interp delete child2}
727	727	destroy {*}[winfo children .]
728	728	::_test_tmp::setPrimarySelection
729	729	} -body {

734	734	::_test_tmp::clearPrimarySelection
735	735	} -result {PAYLOAD}
736	736
737		test safePrimarySelection-4.3 {master interpreter, ttk::entry, existing selection} -setup {
738		catch {interp delete slave2}
	737	test safePrimarySelection-4.3 {parent interpreter, ttk::entry, existing selection} -setup {
	738	catch {interp delete child2}
739	739	destroy {*}[winfo children .]
740	740	::_test_tmp::setPrimarySelection
741	741	} -body {

746	746	::_test_tmp::clearPrimarySelection
747	747	} -result {PAYLOAD}
748	748
749		test safePrimarySelection-4.4 {master interpreter, listbox, existing selection} -setup {
750		catch {interp delete slave2}
	749	test safePrimarySelection-4.4 {parent interpreter, listbox, existing selection} -setup {
	750	catch {interp delete child2}
751	751	destroy {*}[winfo children .]
752	752	::_test_tmp::setPrimarySelection
753	753	} -body {

758	758	::_test_tmp::clearPrimarySelection
759	759	} -result {PAYLOAD}
760	760
761		test safePrimarySelection-4.5 {master interpreter, spinbox as entry, existing selection} -setup {
762		catch {interp delete slave2}
	761	test safePrimarySelection-4.5 {parent interpreter, spinbox as entry, existing selection} -setup {
	762	catch {interp delete child2}
763	763	destroy {*}[winfo children .]
764	764	::_test_tmp::setPrimarySelection
765	765	} -body {

770	770	::_test_tmp::clearPrimarySelection
771	771	} -result {PAYLOAD}
772	772
773		test safePrimarySelection-4.6 {master interpreter, spinbox spun, existing selection} -setup {
774		catch {interp delete slave2}
	773	test safePrimarySelection-4.6 {parent interpreter, spinbox spun, existing selection} -setup {
	774	catch {interp delete child2}
775	775	destroy {*}[winfo children .]
776	776	::_test_tmp::setPrimarySelection
777	777	} -body {

782	782	::_test_tmp::clearPrimarySelection
783	783	} -result {2}
784	784
785		test safePrimarySelection-4.7 {master interpreter, spinbox spun/selected/spun, existing selection} -setup {
786		catch {interp delete slave2}
	785	test safePrimarySelection-4.7 {parent interpreter, spinbox spun/selected/spun, existing selection} -setup {
	786	catch {interp delete child2}
787	787	destroy {*}[winfo children .]
788	788	::_test_tmp::setPrimarySelection
789	789	} -body {

794	794	::_test_tmp::clearPrimarySelection
795	795	} -result {3}
796	796
797		test safePrimarySelection-4.8 {master interpreter, ttk::spinbox as entry, existing selection} -setup {
798		catch {interp delete slave2}
	797	test safePrimarySelection-4.8 {parent interpreter, ttk::spinbox as entry, existing selection} -setup {
	798	catch {interp delete child2}
799	799	destroy {*}[winfo children .]
800	800	::_test_tmp::setPrimarySelection
801	801	} -body {

806	806	::_test_tmp::clearPrimarySelection
807	807	} -result {PAYLOAD}
808	808
809		test safePrimarySelection-4.9 {master interpreter, ttk::spinbox spun, existing selection} -setup {
810		catch {interp delete slave2}
	809	test safePrimarySelection-4.9 {parent interpreter, ttk::spinbox spun, existing selection} -setup {
	810	catch {interp delete child2}
811	811	destroy {*}[winfo children .]
812	812	::_test_tmp::setPrimarySelection
813	813	} -body {

818	818	::_test_tmp::clearPrimarySelection
819	819	} -result {2}
820	820
821		test safePrimarySelection-4.10 {master interpreter, ttk::spinbox spun/selected/spun, existing selection} -setup {
822		catch {interp delete slave2}
	821	test safePrimarySelection-4.10 {parent interpreter, ttk::spinbox spun/selected/spun, existing selection} -setup {
	822	catch {interp delete child2}
823	823	destroy {*}[winfo children .]
824	824	::_test_tmp::setPrimarySelection
825	825	} -body {

830	830	::_test_tmp::clearPrimarySelection
831	831	} -result {3}
832	832
833		test safePrimarySelection-5.1 {unsafe slave interpreter, text, existing selection} -setup {
834		catch {interp delete slave2}
835		destroy {*}[winfo children .]
836		::_test_tmp::setPrimarySelection
837		} -body {
838		set int2 slave2
	833	test safePrimarySelection-5.1 {child interpreter, text, existing selection} -setup {
	834	catch {interp delete child2}
	835	destroy {*}[winfo children .]
	836	::_test_tmp::setPrimarySelection
	837	} -body {
	838	set int2 child2
839	839	::_test_tmp::unsafeInterp $int2
840	840	$int2 eval $::_test_tmp::script
841	841	$int2 eval ::_test_tmp::tryText

847	847	::_test_tmp::clearPrimarySelection
848	848	} -result {PAYLOAD}
849	849
850		test safePrimarySelection-5.2 {unsafe slave interpreter, entry, existing selection} -setup {
851		catch {interp delete slave2}
852		destroy {*}[winfo children .]
853		::_test_tmp::setPrimarySelection
854		} -body {
855		set int2 slave2
	850	test safePrimarySelection-5.2 {child interpreter, entry, existing selection} -setup {
	851	catch {interp delete child2}
	852	destroy {*}[winfo children .]
	853	::_test_tmp::setPrimarySelection
	854	} -body {
	855	set int2 child2
856	856	::_test_tmp::unsafeInterp $int2
857	857	$int2 eval $::_test_tmp::script
858	858	$int2 eval ::_test_tmp::tryEntry

864	864	::_test_tmp::clearPrimarySelection
865	865	} -result {PAYLOAD}
866	866
867		test safePrimarySelection-5.3 {unsafe slave interpreter, ttk::entry, existing selection} -setup {
868		catch {interp delete slave2}
869		destroy {*}[winfo children .]
870		::_test_tmp::setPrimarySelection
871		} -body {
872		set int2 slave2
	867	test safePrimarySelection-5.3 {child interpreter, ttk::entry, existing selection} -setup {
	868	catch {interp delete child2}
	869	destroy {*}[winfo children .]
	870	::_test_tmp::setPrimarySelection
	871	} -body {
	872	set int2 child2
873	873	::_test_tmp::unsafeInterp $int2
874	874	$int2 eval $::_test_tmp::script
875	875	$int2 eval ::_test_tmp::tryTtkEntry

881	881	::_test_tmp::clearPrimarySelection
882	882	} -result {PAYLOAD}
883	883
884		test safePrimarySelection-5.4 {unsafe slave interpreter, listbox, existing selection} -setup {
885		catch {interp delete slave2}
886		destroy {*}[winfo children .]
887		::_test_tmp::setPrimarySelection
888		} -body {
889		set int2 slave2
	884	test safePrimarySelection-5.4 {child interpreter, listbox, existing selection} -setup {
	885	catch {interp delete child2}
	886	destroy {*}[winfo children .]
	887	::_test_tmp::setPrimarySelection
	888	} -body {
	889	set int2 child2
890	890	::_test_tmp::unsafeInterp $int2
891	891	$int2 eval $::_test_tmp::script
892	892	$int2 eval ::_test_tmp::tryListbox

898	898	::_test_tmp::clearPrimarySelection
899	899	} -result {PAYLOAD}
900	900
901		test safePrimarySelection-5.5 {unsafe slave interpreter, spinbox as entry, existing selection} -setup {
902		catch {interp delete slave2}
903		destroy {*}[winfo children .]
904		::_test_tmp::setPrimarySelection
905		} -body {
906		set int2 slave2
	901	test safePrimarySelection-5.5 {child interpreter, spinbox as entry, existing selection} -setup {
	902	catch {interp delete child2}
	903	destroy {*}[winfo children .]
	904	::_test_tmp::setPrimarySelection
	905	} -body {
	906	set int2 child2
907	907	::_test_tmp::unsafeInterp $int2
908	908	$int2 eval $::_test_tmp::script
909	909	$int2 eval ::_test_tmp::trySpinbox 1

915	915	::_test_tmp::clearPrimarySelection
916	916	} -result {PAYLOAD}
917	917
918		test safePrimarySelection-5.6 {unsafe slave interpreter, spinbox spun, existing selection} -setup {
919		catch {interp delete slave2}
920		destroy {*}[winfo children .]
921		::_test_tmp::setPrimarySelection
922		} -body {
923		set int2 slave2
	918	test safePrimarySelection-5.6 {child interpreter, spinbox spun, existing selection} -setup {
	919	catch {interp delete child2}
	920	destroy {*}[winfo children .]
	921	::_test_tmp::setPrimarySelection
	922	} -body {
	923	set int2 child2
924	924	::_test_tmp::unsafeInterp $int2
925	925	$int2 eval $::_test_tmp::script
926	926	$int2 eval ::_test_tmp::trySpinbox 2

932	932	::_test_tmp::clearPrimarySelection
933	933	} -result {2}
934	934
935		test safePrimarySelection-5.7 {unsafe slave interpreter, spinbox spun/selected/spun, existing selection} -setup {
936		catch {interp delete slave2}
937		destroy {*}[winfo children .]
938		::_test_tmp::setPrimarySelection
939		} -body {
940		set int2 slave2
	935	test safePrimarySelection-5.7 {child interpreter, spinbox spun/selected/spun, existing selection} -setup {
	936	catch {interp delete child2}
	937	destroy {*}[winfo children .]
	938	::_test_tmp::setPrimarySelection
	939	} -body {
	940	set int2 child2
941	941	::_test_tmp::unsafeInterp $int2
942	942	$int2 eval $::_test_tmp::script
943	943	$int2 eval ::_test_tmp::trySpinbox 3

949	949	::_test_tmp::clearPrimarySelection
950	950	} -result {3}
951	951
952		test safePrimarySelection-5.8 {unsafe slave interpreter, ttk::spinbox as entry, existing selection} -setup {
953		catch {interp delete slave2}
954		destroy {*}[winfo children .]
955		::_test_tmp::setPrimarySelection
956		} -body {
957		set int2 slave2
	952	test safePrimarySelection-5.8 {child interpreter, ttk::spinbox as entry, existing selection} -setup {
	953	catch {interp delete child2}
	954	destroy {*}[winfo children .]
	955	::_test_tmp::setPrimarySelection
	956	} -body {
	957	set int2 child2
958	958	::_test_tmp::unsafeInterp $int2
959	959	$int2 eval $::_test_tmp::script
960	960	$int2 eval ::_test_tmp::tryTtkSpinbox 1

966	966	::_test_tmp::clearPrimarySelection
967	967	} -result {PAYLOAD}
968	968
969		test safePrimarySelection-5.9 {unsafe slave interpreter, ttk::spinbox spun, existing selection} -setup {
970		catch {interp delete slave2}
971		destroy {*}[winfo children .]
972		::_test_tmp::setPrimarySelection
973		} -body {
974		set int2 slave2
	969	test safePrimarySelection-5.9 {child interpreter, ttk::spinbox spun, existing selection} -setup {
	970	catch {interp delete child2}
	971	destroy {*}[winfo children .]
	972	::_test_tmp::setPrimarySelection
	973	} -body {
	974	set int2 child2
975	975	::_test_tmp::unsafeInterp $int2
976	976	$int2 eval $::_test_tmp::script
977	977	$int2 eval ::_test_tmp::tryTtkSpinbox 2

983	983	::_test_tmp::clearPrimarySelection
984	984	} -result {2}
985	985
986		test safePrimarySelection-5.10 {unsafe slave interpreter, ttk::spinbox spun/selected/spun, existing selection} -setup {
987		catch {interp delete slave2}
988		destroy {*}[winfo children .]
989		::_test_tmp::setPrimarySelection
990		} -body {
991		set int2 slave2
	986	test safePrimarySelection-5.10 {child interpreter, ttk::spinbox spun/selected/spun, existing selection} -setup {
	987	catch {interp delete child2}
	988	destroy {*}[winfo children .]
	989	::_test_tmp::setPrimarySelection
	990	} -body {
	991	set int2 child2
992	992	::_test_tmp::unsafeInterp $int2
993	993	$int2 eval $::_test_tmp::script
994	994	$int2 eval ::_test_tmp::tryTtkSpinbox 3

1000	1000	::_test_tmp::clearPrimarySelection
1001	1001	} -result {3}
1002	1002
1003		test safePrimarySelection-6.1 {IMPORTANT, safe slave interpreter, text, existing selection} -setup {
1004		catch {interp delete slave2}
1005		destroy {*}[winfo children .]
1006		::_test_tmp::setPrimarySelection
1007		} -body {
1008		set res0 [::_test_tmp::getPrimarySelection]
1009		set int2 slave2
	1003	test safePrimarySelection-6.1 {IMPORTANT, safe interpreter, text, existing selection} -setup {
	1004	catch {interp delete child2}
	1005	destroy {*}[winfo children .]
	1006	::_test_tmp::setPrimarySelection
	1007	} -body {
	1008	set res0 [::_test_tmp::getPrimarySelection]
	1009	set int2 child2
1010	1010	::safe::interpCreate $int2
1011	1011	::safe::loadTk $int2
1012	1012	$int2 eval $::_test_tmp::script

1021	1021	::_test_tmp::clearPrimarySelection
1022	1022	} -result {OLD_VALUE----OLD_VALUE}
1023	1023
1024		test safePrimarySelection-6.2 {IMPORTANT, safe slave interpreter, entry, existing selection} -setup {
1025		catch {interp delete slave2}
1026		destroy {*}[winfo children .]
1027		::_test_tmp::setPrimarySelection
1028		} -body {
1029		set res0 [::_test_tmp::getPrimarySelection]
1030		set int2 slave2
	1024	test safePrimarySelection-6.2 {IMPORTANT, safe interpreter, entry, existing selection} -setup {
	1025	catch {interp delete child2}
	1026	destroy {*}[winfo children .]
	1027	::_test_tmp::setPrimarySelection
	1028	} -body {
	1029	set res0 [::_test_tmp::getPrimarySelection]
	1030	set int2 child2
1031	1031	::safe::interpCreate $int2
1032	1032	::safe::loadTk $int2
1033	1033	$int2 eval $::_test_tmp::script

1042	1042	::_test_tmp::clearPrimarySelection
1043	1043	} -result {OLD_VALUE----OLD_VALUE}
1044	1044
1045		test safePrimarySelection-6.3 {IMPORTANT, safe slave interpreter, ttk::entry, existing selection} -setup {
1046		catch {interp delete slave2}
1047		destroy {*}[winfo children .]
1048		::_test_tmp::setPrimarySelection
1049		} -body {
1050		set res0 [::_test_tmp::getPrimarySelection]
1051		set int2 slave2
	1045	test safePrimarySelection-6.3 {IMPORTANT, safe interpreter, ttk::entry, existing selection} -setup {
	1046	catch {interp delete child2}
	1047	destroy {*}[winfo children .]
	1048	::_test_tmp::setPrimarySelection
	1049	} -body {
	1050	set res0 [::_test_tmp::getPrimarySelection]
	1051	set int2 child2
1052	1052	::safe::interpCreate $int2
1053	1053	::safe::loadTk $int2
1054	1054	$int2 eval $::_test_tmp::script

1063	1063	::_test_tmp::clearPrimarySelection
1064	1064	} -result {OLD_VALUE----OLD_VALUE}
1065	1065
1066		test safePrimarySelection-6.4 {IMPORTANT, safe slave interpreter, listbox, existing selection} -setup {
1067		catch {interp delete slave2}
1068		destroy {*}[winfo children .]
1069		::_test_tmp::setPrimarySelection
1070		} -body {
1071		set res0 [::_test_tmp::getPrimarySelection]
1072		set int2 slave2
	1066	test safePrimarySelection-6.4 {IMPORTANT, safe interpreter, listbox, existing selection} -setup {
	1067	catch {interp delete child2}
	1068	destroy {*}[winfo children .]
	1069	::_test_tmp::setPrimarySelection
	1070	} -body {
	1071	set res0 [::_test_tmp::getPrimarySelection]
	1072	set int2 child2
1073	1073	::safe::interpCreate $int2
1074	1074	::safe::loadTk $int2
1075	1075	$int2 eval $::_test_tmp::script

1084	1084	::_test_tmp::clearPrimarySelection
1085	1085	} -result {OLD_VALUE----OLD_VALUE}
1086	1086
1087		test safePrimarySelection-6.5 {IMPORTANT, safe slave interpreter, spinbox as entry, existing selection} -setup {
1088		catch {interp delete slave2}
1089		destroy {*}[winfo children .]
1090		::_test_tmp::setPrimarySelection
1091		} -body {
1092		set res0 [::_test_tmp::getPrimarySelection]
1093		set int2 slave2
	1087	test safePrimarySelection-6.5 {IMPORTANT, safe interpreter, spinbox as entry, existing selection} -setup {
	1088	catch {interp delete child2}
	1089	destroy {*}[winfo children .]
	1090	::_test_tmp::setPrimarySelection
	1091	} -body {
	1092	set res0 [::_test_tmp::getPrimarySelection]
	1093	set int2 child2
1094	1094	::safe::interpCreate $int2
1095	1095	::safe::loadTk $int2
1096	1096	$int2 eval $::_test_tmp::script

1105	1105	::_test_tmp::clearPrimarySelection
1106	1106	} -result {OLD_VALUE----OLD_VALUE}
1107	1107
1108		test safePrimarySelection-6.6 {IMPORTANT, safe slave interpreter, spinbox spun, existing selection} -setup {
1109		catch {interp delete slave2}
1110		destroy {*}[winfo children .]
1111		::_test_tmp::setPrimarySelection
1112		} -body {
1113		set res0 [::_test_tmp::getPrimarySelection]
1114		set int2 slave2
	1108	test safePrimarySelection-6.6 {IMPORTANT, safe interpreter, spinbox spun, existing selection} -setup {
	1109	catch {interp delete child2}
	1110	destroy {*}[winfo children .]
	1111	::_test_tmp::setPrimarySelection
	1112	} -body {
	1113	set res0 [::_test_tmp::getPrimarySelection]
	1114	set int2 child2
1115	1115	::safe::interpCreate $int2
1116	1116	::safe::loadTk $int2
1117	1117	$int2 eval $::_test_tmp::script

1126	1126	::_test_tmp::clearPrimarySelection
1127	1127	} -result {OLD_VALUE----OLD_VALUE}
1128	1128
1129		test safePrimarySelection-6.7 {IMPORTANT, safe slave interpreter, spinbox spun/selected/spun, existing selection} -setup {
1130		catch {interp delete slave2}
1131		destroy {*}[winfo children .]
1132		::_test_tmp::setPrimarySelection
1133		} -body {
1134		set res0 [::_test_tmp::getPrimarySelection]
1135		set int2 slave2
	1129	test safePrimarySelection-6.7 {IMPORTANT, safe interpreter, spinbox spun/selected/spun, existing selection} -setup {
	1130	catch {interp delete child2}
	1131	destroy {*}[winfo children .]
	1132	::_test_tmp::setPrimarySelection
	1133	} -body {
	1134	set res0 [::_test_tmp::getPrimarySelection]
	1135	set int2 child2
1136	1136	::safe::interpCreate $int2
1137	1137	::safe::loadTk $int2
1138	1138	$int2 eval $::_test_tmp::script

1147	1147	::_test_tmp::clearPrimarySelection
1148	1148	} -result {OLD_VALUE----OLD_VALUE}
1149	1149
1150		test safePrimarySelection-6.8 {IMPORTANT, safe slave interpreter, ttk::spinbox as entry, existing selection} -setup {
1151		catch {interp delete slave2}
1152		destroy {*}[winfo children .]
1153		::_test_tmp::setPrimarySelection
1154		} -body {
1155		set res0 [::_test_tmp::getPrimarySelection]
1156		set int2 slave2
	1150	test safePrimarySelection-6.8 {IMPORTANT, safe interpreter, ttk::spinbox as entry, existing selection} -setup {
	1151	catch {interp delete child2}
	1152	destroy {*}[winfo children .]
	1153	::_test_tmp::setPrimarySelection
	1154	} -body {
	1155	set res0 [::_test_tmp::getPrimarySelection]
	1156	set int2 child2
1157	1157	::safe::interpCreate $int2
1158	1158	::safe::loadTk $int2
1159	1159	$int2 eval $::_test_tmp::script

1168	1168	::_test_tmp::clearPrimarySelection
1169	1169	} -result {OLD_VALUE----OLD_VALUE}
1170	1170
1171		test safePrimarySelection-6.9 {IMPORTANT, safe slave interpreter, ttk::spinbox spun, existing selection} -setup {
1172		catch {interp delete slave2}
1173		destroy {*}[winfo children .]
1174		::_test_tmp::setPrimarySelection
1175		} -body {
1176		set res0 [::_test_tmp::getPrimarySelection]
1177		set int2 slave2
	1171	test safePrimarySelection-6.9 {IMPORTANT, safe interpreter, ttk::spinbox spun, existing selection} -setup {
	1172	catch {interp delete child2}
	1173	destroy {*}[winfo children .]
	1174	::_test_tmp::setPrimarySelection
	1175	} -body {
	1176	set res0 [::_test_tmp::getPrimarySelection]
	1177	set int2 child2
1178	1178	::safe::interpCreate $int2
1179	1179	::safe::loadTk $int2
1180	1180	$int2 eval $::_test_tmp::script

1189	1189	::_test_tmp::clearPrimarySelection
1190	1190	} -result {OLD_VALUE----OLD_VALUE}
1191	1191
1192		test safePrimarySelection-6.10 {IMPORTANT, safe slave interpreter, ttk::spinbox spun/selected/spun, existing selection} -setup {
1193		catch {interp delete slave2}
1194		destroy {*}[winfo children .]
1195		::_test_tmp::setPrimarySelection
1196		} -body {
1197		set res0 [::_test_tmp::getPrimarySelection]
1198		set int2 slave2
	1192	test safePrimarySelection-6.10 {IMPORTANT, safe interpreter, ttk::spinbox spun/selected/spun, existing selection} -setup {
	1193	catch {interp delete child2}
	1194	destroy {*}[winfo children .]
	1195	::_test_tmp::setPrimarySelection
	1196	} -body {
	1197	set res0 [::_test_tmp::getPrimarySelection]
	1198	set int2 child2
1199	1199	::safe::interpCreate $int2
1200	1200	::safe::loadTk $int2
1201	1201	$int2 eval $::_test_tmp::script

+1

-1

tests/scale.test less more

323	323	scale
324	324	} -returnCodes error -result {wrong # args: should be "scale pathName ?-option value ...?"}
325	325	test scale-2.2 {Tk_ScaleCmd procedure} -body {
326		scale foo
	326	scale foo
327	327	} -returnCodes error -result {bad window path name "foo"}
328	328	test scale-2.3 {Tk_ScaleCmd procedure} -body {
329	329	catch {scale foo}

+23

-20

tests/scrollbar.test less more

6	6	# Copyright (c) 1998-1999 by Scriptics Corporation.
7	7	# All rights reserved.
8	8
9		package require tcltest 2.1
	9	package require tcltest 2.2
10	10	eval tcltest::configure $argv
11	11	tcltest::loadTestedCommands
	12
	13	testConstraint failsOnUbuntu [expr {![info exists ::env(CI)] \|\| ![string match Linux $::tcl_platform(os)]}]
	14	testConstraint failsOnXQuarz [expr {$tcl_platform(os) ne "Darwin" \|\| [tk windowingsystem] ne "x11" }]
12	15
13	16	proc scroll args {
14	17	global scrollInfo

22	25	return [expr {[winfo height $w] - 2*[testmetrics cyvscroll $w]}]
23	26	} else {
24	27	return [expr {[winfo width $w] - 2*[testmetrics cxhscroll $w]}]
25		}
	28	}
26	29	} else {
27	30	if {[tk windowingsystem] eq "x11"} {
28	31	# Calculations here assume that the arrow area is a square.

59	62	foreach {width height} [wm minsize .] {
60	63	set height [expr {($height < 200) ? 200 : $height}]
61	64	set width [expr {($width < 1) ? 1 : $width}]
62		}
	65	}
63	66
64	67	frame .f -height $height -width $width
65	68	pack .f -side left

269	272	format {%.6g} [.s fraction 4 21]
270	273	} [format %.6g [expr {(21.0 - ([winfo height .s] - [getTroughSize .s])/2.0) \
271	274	/([getTroughSize .s] - 1)}]]
272		test scrollbar-3.36 {ScrollbarWidgetCmd procedure, "fraction" option} x11 {
	275	test scrollbar-3.36 {ScrollbarWidgetCmd procedure, "fraction" option} {x11 failsOnUbuntu failsOnXQuarz} {
273	276	format {%.6g} [.s fraction 4 179]
274	277	} {1}
275	278	test scrollbar-3.37 {ScrollbarWidgetCmd procedure, "fraction" option} {testmetrics} {
276	279	format {%.6g} [.s fraction 4 [expr {200 - [testmetrics cyvscroll .s]}]]
277	280	} {1}
278		test scrollbar-3.38 {ScrollbarWidgetCmd procedure, "fraction" option} x11 {
	281	test scrollbar-3.38 {ScrollbarWidgetCmd procedure, "fraction" option} {x11 failsOnUbuntu failsOnXQuarz} {
279	282	format {%.6g} [.s fraction 4 178]
280	283	} {0.993711}
281	284	test scrollbar-3.39 {ScrollbarWidgetCmd procedure, "fraction" option} {testmetrics win} {

340	343	test scrollbar-3.50.1 {ScrollbarWidgetCmd procedure, "identify" option} notAqua {
341	344	.s identify 5 5
342	345	} {arrow1}
343		test scrollbar-3.50.1 {ScrollbarWidgetCmd procedure, "identify" option} aqua {
	346	test scrollbar-3.50.2 {ScrollbarWidgetCmd procedure, "identify" option} aqua {
344	347	# macOS scrollbars have no arrows nowadays
345	348	.s identify 5 5
346	349	} {trough1}

379	382	set result
380	383	} {0.0 0.3}
381	384	test scrollbar-3.60 {ScrollbarWidgetCmd procedure, "set" option} {
382		.s set 1.1 .4
	385	.s set 1.1 .4
383	386	.s get
384	387	} {1.0 1.0}
385	388	test scrollbar-3.61 {ScrollbarWidgetCmd procedure, "set" option} {
386		.s set .5 -.3
	389	.s set .5 -.3
387	390	.s get
388	391	} {0.5 0.5}
389	392	test scrollbar-3.62 {ScrollbarWidgetCmd procedure, "set" option} {
390		.s set .5 87
	393	.s set .5 87
391	394	.s get
392	395	} {0.5 1.0}
393	396	test scrollbar-3.63 {ScrollbarWidgetCmd procedure, "set" option} {

411	414	list [catch {.s set 1 2 3 jkl} msg] $msg
412	415	} {1 {expected integer but got "jkl"}}
413	416	test scrollbar-3.68 {ScrollbarWidgetCmd procedure, "set" option} {
414		.s set -10 50 20 30
	417	.s set -10 50 20 30
415	418	.s get
416	419	} {0 50 0 0}
417	420	test scrollbar-3.69 {ScrollbarWidgetCmd procedure, "set" option} {
418		.s set 100 -10 20 30
	421	.s set 100 -10 20 30
419	422	.s get
420	423	} {100 0 20 30}
421	424	test scrollbar-3.70 {ScrollbarWidgetCmd procedure, "set" option} {
422		.s set 100 50 30 20
	425	.s set 100 50 30 20
423	426	.s get
424	427	} {100 50 30 30}
425	428	test scrollbar-3.71 {ScrollbarWidgetCmd procedure, "set" option} {

490	493	# macOS scrollbars have no arrows nowadays
491	494	.s identify 8 4
492	495	} {trough1}
493		test scrollbar-6.12.1 {ScrollbarPosition procedure} x11 {
	496	test scrollbar-6.12.1 {ScrollbarPosition procedure} {x11 failsOnUbuntu failsOnXQuarz} {
494	497	.s identify 8 19
495	498	} {arrow1}
496	499	test scrollbar-6.12.2 {ScrollbarPosition procedure} aqua {

498	501	.s identify 8 19
499	502	} {trough1}
500	503	test scrollbar-6.14 {ScrollbarPosition procedure} win {
501		.s identify [expr {[winfo width .s] / 2}] 0
	504	.s identify [expr {[winfo width .s] / 2}] 0
502	505	} {arrow1}
503	506	test scrollbar-6.15 {ScrollbarPosition procedure} {testmetrics win} {
504	507	.s identify [expr {[winfo width .s] / 2}] [expr {[testmetrics cyvscroll .s] - 1}]

548	551	.s identify [expr {[winfo width .s] / 2}] [expr {[winfo height .s]
549	552	- [testmetrics cyvscroll .s] - 1}]
550	553	} {trough2}
551		test scrollbar-6.29.1 {ScrollbarPosition procedure} x11 {
	554	test scrollbar-6.29.1 {ScrollbarPosition procedure} {x11 failsOnUbuntu failsOnXQuarz} {
552	555	.s identify 8 180
553	556	} {arrow2}
554	557	test scrollbar-6.29.2 {ScrollbarPosition procedure} aqua {

572	575	test scrollbar-6.34 {ScrollbarPosition procedure} unix {
573	576	.s identify 4 100
574	577	} {trough2}
575		test scrollbar-6.35 {ScrollbarPosition procedure} unix {
	578	test scrollbar-6.35 {ScrollbarPosition procedure} {unix failsOnUbuntu failsOnXQuarz} {
576	579	.s identify 18 100
577	580	} {trough2}
578	581	test scrollbar-6.37 {ScrollbarPosition procedure} win {

609	612	} {trough2}
610	613	test scrollbar-6.43 {ScrollbarPosition procedure} {testmetrics win} {
611	614	.t.s identify [expr {int(.4 / [.t.s delta 1 0]) + [testmetrics cxhscroll .t.s]
612		- 1}] [expr {[winfo height .t.s] / 2}]
	615	- 1}] [expr {[winfo height .t.s] / 2}]
613	616	} {slider}
614		test scrollbar-6.44 {ScrollbarPosition procedure} unix {
	617	test scrollbar-6.44 {ScrollbarPosition procedure} {unix failsOnUbuntu failsOnXQuarz} {
615	618	.t.s identify 100 18
616	619	} {trough2}
617	620	test scrollbar-6.46 {ScrollbarPosition procedure} win {

758	761	update ; # shall not trigger error invalid command name ".top.s"
759	762	} -cleanup {
760	763	destroy .top.s .top
761		} -result {}
	764	} -result {}
762	765	test scrollbar-11.2 {bug fix: [011706ec42] Scrollbar unsafe wrt widget destruction} -body {
763	766	proc destroy_scrollbar {{y 0}} {
764	767	if {[winfo exists .top.s]} {

777	780	update ; # shall not trigger error invalid command name ".top.s"
778	781	} -cleanup {
779	782	destroy .top.s .top
780		} -result {}
	783	} -result {}
781	784
782	785	catch {destroy .s}
783	786	catch {destroy .t}

+10

-9

tests/select.test less more

22	22	testConstraint cliboardManagerPresent 1
23	23	}
24	24	}
	25	testConstraint failsOnUbuntu [expr {![info exists ::env(CI)] \|\| ![string match Linux $::tcl_platform(os)]}]
25	26
26	27	global longValue selValue selInfo
27	28

894	895	test select-9.2 {SelCvtToX and SelCvtFromX procedures} -setup {
895	896	setup
896	897	setupbg
897		} -constraints x11 -body {
	898	} -constraints {x11 failsOnUbuntu} -body {
898	899	set selValue "1024 0xffff 2048 -2 "
899	900	set selInfo ""
900	901	selection handle -selection PRIMARY -format INTEGER -type TEST \

907	908	test select-9.3 {SelCvtToX and SelCvtFromX procedures} -setup {
908	909	setup
909	910	setupbg
910		} -constraints x11 -body {
	911	} -constraints {x11 failsOnUbuntu} -body {
911	912	set selValue " "
912	913	set selInfo ""
913	914	selection handle -selection PRIMARY -format INTEGER -type TEST \

920	921	test select-9.4 {SelCvtToX and SelCvtFromX procedures} -setup {
921	922	setup
922	923	setupbg
923		} -constraints x11 -body {
	924	} -constraints {x11 failsOnUbuntu} -body {
924	925	set selValue "16 foobar 32"
925	926	set selInfo ""
926	927	selection handle -selection PRIMARY -format INTEGER -type TEST \

951	952
952	953	# most control paths have been exercised above
953	954	test select-10.1 {ConvertSelection procedure, race with selection clear} -constraints {
954		x11
	955	x11
955	956	} -setup {
956	957	setup
957	958	} -body {

1005	1006	# testing timers
1006	1007	# This one hangs in Exceed
1007	1008	test select-10.4 {ConvertSelection procedure} -constraints {
1008		x11 noExceed
	1009	x11 noExceed failsOnUbuntu
1009	1010	} -setup {
1010	1011	setup
1011	1012	setupbg

1020	1021	lappend result $selInfo
1021	1022	} -result {{selection owner didn't respond} {STRING 0 4000 STRING 4000 4000 STRING 8000 4000 STRING 12000 4000 STRING 16000 4000 STRING 0 4000 STRING 4000 4000}}
1022	1023	test select-10.5 {ConvertSelection procedure, reentrancy issues} -constraints {
1023		x11
	1024	x11 failsOnUbuntu
1024	1025	} -setup {
1025	1026	setup
1026	1027	setupbg

1035	1036	lappend result $selInfo
1036	1037	} -result {{PRIMARY selection doesn't exist or form "STRING" not defined} {.f1 STRING 0 4000}}
1037	1038	test select-10.6 {ConvertSelection procedure, reentrancy issues} -constraints {
1038		x11
	1039	x11 failsOnUbuntu
1039	1040	} -setup {
1040	1041	setup
1041	1042	setupbg

1058	1059	##############################################################################
1059	1060
1060	1061	# testing reentrancy
1061		test select-11.1 {TkSelPropProc procedure} -constraints x11 -setup {
	1062	test select-11.1 {TkSelPropProc procedure} -constraints {x11 failsOnUbuntu} -setup {
1062	1063	setup
1063	1064	setupbg
1064	1065	} -body {

1130	1131	} -result {{Targets value} {TARGETS.f1 0 4000} {MULTIPLE TARGETS TIMESTAMP TK_APPLICATION TK_WINDOW}}
1131	1132
1132	1133	test select-13.1 {SelectionSize procedure, handler deleted} -constraints {
1133		x11
	1134	x11 failsOnUbuntu
1134	1135	} -setup {
1135	1136	setup
1136	1137	setupbg

+7

-6

tests/send.test 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		package require tcltest 2.1
	12	package require tcltest 2.2
13	13	eval tcltest::configure $argv
14	14	tcltest::loadTestedCommands
15	15
16	16	testConstraint xhost [llength [auto_execok xhost]]
	17	testConstraint failsOnUbuntu [expr {![info exists ::env(CI)] \|\| ![string match Linux $::tcl_platform(os)]}]
17	18
18	19	# Compute a script that will load Tk into a child interpreter.
19	20

285	286
286	287	catch {interp delete t_s_2}
287	288
288		test send-8.15 {Tk_SendCmd procedure, local interp, error info} {secureserver testsend} {
	289	test send-8.15 {Tk_SendCmd procedure, local interp, error info} {secureserver testsend failsOnUbuntu} {
289	290	catch {error foo}
290	291	list [catch {send t_s_1 {if 1 {open bogus_file_name}}} msg] $msg $errorInfo $errorCode
291	292	} {1 {couldn't open "bogus_file_name": no such file or directory} {couldn't open "bogus_file_name": no such file or directory

295	296	"if 1 {open bogus_file_name}"
296	297	invoked from within
297	298	"send t_s_1 {if 1 {open bogus_file_name}}"} {POSIX ENOENT {no such file or directory}}}
298		test send-8.16 {Tk_SendCmd procedure, bogusCommWindow} {secureserver testsend} {
	299	test send-8.16 {Tk_SendCmd procedure, bogusCommWindow} {secureserver testsend failsOnUbuntu} {
299	300	testsend prop root InterpRegistry "10234 bogus\n"
300	301	set result [list [catch {send bogus bogus command} msg] $msg]
301	302	winfo interps

521	522	set x
522	523	} {1 {target application died}}
523	524
524		test send-11.1 {AppendPropCarefully and AppendErrorProc procedures} {secureserver testsend} {
	525	test send-11.1 {AppendPropCarefully and AppendErrorProc procedures} -constraints {secureserver testsend} -body {
525	526	testsend prop root InterpRegistry "0x21447 dummy\n"
526		list [catch {send dummy foo} msg] $msg
527		} {1 {no application named "dummy"}}
	527	send dummy foo
	528	} -returnCodes 1 -match regexp -result {^(target application died\|no application named "dummy")$}
528	529	test send-11.2 {AppendPropCarefully and AppendErrorProc procedures} {secureserver testsend} {
529	530	testsend prop comm Comm "c\n-r0x123 44\n-n tktest\n-s concat a b c\n"
530	531	update

+279

-244

tests/spinbox.test less more

10	10	eval tcltest::configure $argv
11	11	tcltest::loadTestedCommands
12	12
	13	testConstraint failsOnUbuntu [expr {![info exists ::env(CI)] \|\| ![string match Linux $::tcl_platform(os)]}]
	14	testConstraint failsOnUbuntuNoXft [expr {[testConstraint failsOnUbuntu] \|\| (![catch {tk::pkgconfig get fontsystem} fs] && ($fs eq "xft"))}]
	15
13	16	# For xscrollcommand
	17	set scrollInfo {}
14	18	proc scroll args {
15	19	global scrollInfo
16	20	set scrollInfo $args
17	21	}
18		# For trace variable
	22	# For trace variable
19	23	proc override args {
20	24	global x
21	25	set x 12345

92	96	.e cget -bd
93	97	} -cleanup {
94	98	destroy .e
95		} -result {4}
	99	} -result 4
96	100	test spinbox-1.6 {configuration option: "bd" for spinbox} -setup {
97	101	spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
98	102	-relief sunken

136	140	.e cget -borderwidth
137	141	} -cleanup {
138	142	destroy .e
139		} -result {1}
	143	} -result 1
140	144	test spinbox-1.10 {configuration option: "borderwidth" for spinbox} -setup {
141	145	spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
142	146	-relief sunken

280	284	.e cget -exportselection
281	285	} -cleanup {
282	286	destroy .e
283		} -result {1}
	287	} -result 1
284	288	test spinbox-1.23 {configuration option: "exportselection" for spinbox} -setup {
285	289	spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
286	290	-relief sunken

456	460	.e cget -highlightthickness
457	461	} -cleanup {
458	462	destroy .e
459		} -result {6}
	463	} -result 6
460	464	test spinbox-1.39 {configuration option: "highlightthickness" for spinbox} -setup {
461	465	spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
462	466	-relief sunken

478	482	.e cget -highlightthickness
479	483	} -cleanup {
480	484	destroy .e
481		} -result {0}
	485	} -result 0
482	486
483	487	test spinbox-1.41 {configuration option: "increment"} -setup {
484	488	spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \

534	538	.e cget -insertborderwidth
535	539	} -cleanup {
536	540	destroy .e
537		} -result {1}
	541	} -result 1
538	542	test spinbox-1.46 {configuration option: "insertborderwidth" for spinbox} -setup {
539	543	spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
540	544	-relief sunken

556	560	.e cget -insertofftime
557	561	} -cleanup {
558	562	destroy .e
559		} -result {100}
	563	} -result 100
560	564	test spinbox-1.48 {configuration option: "insertofftime" for spinbox} -setup {
561	565	spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
562	566	-relief sunken

578	582	.e cget -insertontime
579	583	} -cleanup {
580	584	destroy .e
581		} -result {100}
	585	} -result 100
582	586	test spinbox-1.50 {configuration option: "insertontime" for spinbox} -setup {
583	587	spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
584	588	-relief sunken

690	694	.e cget -repeatdelay
691	695	} -cleanup {
692	696	destroy .e
693		} -result {500}
	697	} -result 500
694	698	test spinbox-1.60 {configuration option: "repeatdelay" for spinbox} -setup {
695	699	spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
696	700	-relief sunken

756	760	.e cget -selectborderwidth
757	761	} -cleanup {
758	762	destroy .e
759		} -result {1}
	763	} -result 1
760	764	test spinbox-1.66 {configuration option: "selectborderwidth" for spinbox} -setup {
761	765	spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
762	766	-relief sunken

936	940	.e cget -width
937	941	} -cleanup {
938	942	destroy .e
939		} -result {402}
	943	} -result 402
940	944	test spinbox-1.82 {configuration option: "width" for spinbox} -setup {
941	945	spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
942	946	-relief sunken

958	962	.e cget -wrap
959	963	} -cleanup {
960	964	destroy .e
961		} -result {1}
	965	} -result 1
962	966	test spinbox-1.84 {configuration option: "wrap" for spinbox} -setup {
963	967	spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
964	968	-relief sunken

1016	1020
1017	1021
1018	1022	test spinbox-3.1 {SpinboxWidgetCmd procedure} -setup {
1019		spinbox .e
	1023	spinbox .e
1020	1024	pack .e
1021	1025	update
1022	1026	} -body {

1025	1029	destroy .e
1026	1030	} -returnCodes error -result {wrong # args: should be ".e option ?arg ...?"}
1027	1031	test spinbox-3.2 {SpinboxWidgetCmd procedure, "bbox" widget command} -setup {
1028		spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	1032	spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
1029	1033	pack .e
1030	1034	update
1031	1035	} -body {

1034	1038	destroy .e
1035	1039	} -returnCodes error -result {wrong # args: should be ".e bbox index"}
1036	1040	test spinbox-3.3 {SpinboxWidgetCmd procedure, "bbox" widget command} -setup {
1037		spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	1041	spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
1038	1042	pack .e
1039	1043	update
1040	1044	} -body {

1043	1047	destroy .e
1044	1048	} -returnCodes error -result {wrong # args: should be ".e bbox index"}
1045	1049	test spinbox-3.4 {SpinboxWidgetCmd procedure, "bbox" widget command} -setup {
1046		spinbox .e
	1050	spinbox .e
1047	1051	pack .e
1048	1052	update
1049	1053	} -body {

1052	1056	destroy .e
1053	1057	} -returnCodes error -result {bad spinbox index "bogus"}
1054	1058	test spinbox-3.5 {SpinboxWidgetCmd procedure, "bbox" widget command} -setup {
1055		spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	1059	spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
1056	1060	pack .e
1057	1061	update
1058	1062	} -body {

1061	1065	destroy .e
1062	1066	} -result [list 5 5 0 $cy]
1063	1067
1064		# Oryginaly the result was count using measurements
	1068	# Oryginaly the result was count using measurements
1065	1069	# and metrics. It was changed to less verbose solution - the result is the one
1066	1070	# that passes fonts constraint (this concerns tests 3.6, 3.7, 3.8, 3.10)
1067	1071	test spinbox-3.6 {SpinboxWidgetCmd procedure, "bbox" widget command} -constraints {

1080	1084	test spinbox-3.7 {SpinboxWidgetCmd procedure, "bbox" widget command} -constraints {
1081	1085	fonts
1082	1086	} -setup {
1083		spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	1087	spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
1084	1088	pack .e
1085	1089	update
1086	1090	} -body {

1093	1097	test spinbox-3.8 {SpinboxWidgetCmd procedure, "bbox" widget command} -constraints {
1094	1098	fonts
1095	1099	} -setup {
1096		spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	1100	spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
1097	1101	pack .e
1098	1102	update
1099	1103	} -body {

1104	1108	destroy .e
1105	1109	} -result {31 5 7 13}
1106	1110	test spinbox-3.9 {SpinboxWidgetCmd procedure, "bbox" widget command} -setup {
1107		spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	1111	spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
1108	1112	pack .e
1109	1113	update
1110	1114	} -body {

1116	1120	test spinbox-3.10 {SpinboxWidgetCmd procedure, "bbox" widget command} -constraints {
1117	1121	fonts
1118	1122	} -setup {
1119		spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	1123	spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
1120	1124	pack .e
1121	1125	update
1122	1126	} -body {

1126	1130	destroy .e
1127	1131	} -result {{5 5 7 13} {12 5 7 13} {75 5 12 13} {122 5 7 13}}
1128	1132	test spinbox-3.11 {SpinboxWidgetCmd procedure, "cget" widget command} -setup {
1129		spinbox .e
	1133	spinbox .e
1130	1134	} -body {
1131	1135	.e cget
1132	1136	} -cleanup {
1133	1137	destroy .e
1134	1138	} -returnCodes error -result {wrong # args: should be ".e cget option"}
1135	1139	test spinbox-3.12 {SpinboxWidgetCmd procedure, "cget" widget command} -setup {
1136		spinbox .e
	1140	spinbox .e
1137	1141	} -body {
1138	1142	.e cget a b
1139	1143	} -cleanup {
1140	1144	destroy .e
1141	1145	} -returnCodes error -result {wrong # args: should be ".e cget option"}
1142	1146	test spinbox-3.13 {SpinboxWidgetCmd procedure, "cget" widget command} -setup {
1143		spinbox .e
	1147	spinbox .e
1144	1148	} -body {
1145	1149	.e cget -gorp
1146	1150	} -cleanup {
1147	1151	destroy .e
1148	1152	} -returnCodes error -result {unknown option "-gorp"}
1149	1153	test spinbox-3.14 {SpinboxWidgetCmd procedure, "cget" widget command} -setup {
1150		spinbox .e
	1154	spinbox .e
1151	1155	} -body {
1152	1156	.e configure -bd 4
1153	1157	.e cget -bd
1154	1158	} -cleanup {
1155	1159	destroy .e
1156		} -result {4}
	1160	} -result 4
1157	1161	test spinbox-3.15 {SpinboxWidgetCmd procedure, "configure" widget command} -setup {
1158		spinbox .e
	1162	spinbox .e
1159	1163	pack .e
1160	1164	update
1161	1165	} -body {
1162	1166	llength [.e configure]
1163	1167	} -cleanup {
1164	1168	destroy .e
1165		} -result {49}
	1169	} -result 49
1166	1170	test spinbox-3.16 {SpinboxWidgetCmd procedure, "configure" widget command} -setup {
1167		spinbox .e
	1171	spinbox .e
1168	1172	} -body {
1169	1173	.e configure -foo
1170	1174	} -cleanup {
1171	1175	destroy .e
1172	1176	} -returnCodes error -result {unknown option "-foo"}
1173	1177	test spinbox-3.17 {SpinboxWidgetCmd procedure, "configure" widget command} -setup {
1174		spinbox .e
	1178	spinbox .e
1175	1179	} -body {
1176	1180	.e configure -bd 4
1177	1181	.e configure -bg #ffffff
1178	1182	lindex [.e configure -bd] 4
1179	1183	} -cleanup {
1180	1184	destroy .e
1181		} -result {4}
	1185	} -result 4
1182	1186	test spinbox-3.18 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
1183		spinbox .e
	1187	spinbox .e
1184	1188	} -body {
1185	1189	.e delete
1186	1190	} -cleanup {
1187	1191	destroy .e
1188	1192	} -returnCodes error -result {wrong # args: should be ".e delete firstIndex ?lastIndex?"}
1189	1193	test spinbox-3.19 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
1190		spinbox .e
	1194	spinbox .e
1191	1195	} -body {
1192	1196	.e delete a b c
1193	1197	} -cleanup {
1194	1198	destroy .e
1195	1199	} -returnCodes error -result {wrong # args: should be ".e delete firstIndex ?lastIndex?"}
1196	1200	test spinbox-3.20 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
1197		spinbox .e
	1201	spinbox .e
1198	1202	} -body {
1199	1203	.e delete foo
1200	1204	} -cleanup {
1201	1205	destroy .e
1202	1206	} -returnCodes error -result {bad spinbox index "foo"}
1203	1207	test spinbox-3.21 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
1204		spinbox .e
	1208	spinbox .e
1205	1209	} -body {
1206	1210	.e delete 0 bar
1207	1211	} -cleanup {

1210	1214	test spinbox-3.22 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
1211	1215	spinbox .e
1212	1216	pack .e
1213		update
	1217	update
1214	1218	} -body {
1215	1219	.e insert end "01234567890"
1216	1220	.e delete 2 4
1217	1221	.e get
1218	1222	} -cleanup {
1219	1223	destroy .e
1220		} -result {014567890}
	1224	} -result 014567890
1221	1225	test spinbox-3.23 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
1222		spinbox .e
	1226	spinbox .e
1223	1227	} -body {
1224	1228	.e insert end "01234567890"
1225	1229	.e delete 6
1226	1230	.e get
1227	1231	} -cleanup {
1228	1232	destroy .e
1229		} -result {0123457890}
	1233	} -result 0123457890
1230	1234	test spinbox-3.24 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
1231	1235	spinbox .e
1232	1236	pack .e
1233		update
	1237	update
1234	1238	set x {}
1235	1239	} -body {
1236	1240	# UTF

1251	1255	test spinbox-3.25 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
1252	1256	spinbox .e
1253	1257	pack .e
1254		update
	1258	update
1255	1259	} -body {
1256	1260	.e insert end "01234567890"
1257	1261	.e delete 6 5
1258	1262	.e get
1259	1263	} -cleanup {
1260	1264	destroy .e
1261		} -result {01234567890}
	1265	} -result 01234567890
1262	1266	test spinbox-3.26 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
1263	1267	spinbox .e
1264	1268	pack .e
1265		update
	1269	update
1266	1270	} -body {
1267	1271	.e insert end "01234567890"
1268	1272	.e configure -state disabled

1271	1275	.e get
1272	1276	} -cleanup {
1273	1277	destroy .e
1274		} -result {01234567890}
	1278	} -result 01234567890
1275	1279	test spinbox-3.26.1 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
1276	1280	spinbox .e
1277	1281	pack .e
1278		update
	1282	update
1279	1283	} -body {
1280	1284	.e insert end "01234567890"
1281	1285	.e configure -state readonly

1284	1288	.e get
1285	1289	} -cleanup {
1286	1290	destroy .e
1287		} -result {01234567890}
	1291	} -result 01234567890
1288	1292	test spinbox-3.27 {SpinboxWidgetCmd procedure, "get" widget command} -setup {
1289		spinbox .e
	1293	spinbox .e
1290	1294	} -body {
1291	1295	.e get foo
1292	1296	} -cleanup {
1293	1297	destroy .e
1294	1298	} -returnCodes error -result {wrong # args: should be ".e get"}
1295	1299	test spinbox-3.28 {SpinboxWidgetCmd procedure, "icursor" widget command} -setup {
1296		spinbox .e
	1300	spinbox .e
1297	1301	} -body {
1298	1302	.e icursor
1299	1303	} -cleanup {
1300	1304	destroy .e
1301	1305	} -returnCodes error -result {wrong # args: should be ".e icursor pos"}
1302	1306	test spinbox-3.29 {SpinboxWidgetCmd procedure, "icursor" widget command} -setup {
1303		spinbox .e
	1307	spinbox .e
1304	1308	} -body {
1305	1309	.e icursor foo
1306	1310	} -cleanup {
1307	1311	destroy .e
1308	1312	} -returnCodes error -result {bad spinbox index "foo"}
1309	1313	test spinbox-3.30 {SpinboxWidgetCmd procedure, "icursor" widget command} -setup {
1310		spinbox .e
	1314	spinbox .e
1311	1315	} -body {
1312	1316	.e insert end "01234567890"
1313	1317	.e icursor 4
1314	1318	.e index insert
1315	1319	} -cleanup {
1316	1320	destroy .e
1317		} -result {4}
	1321	} -result 4
1318	1322	test spinbox-3.31 {SpinboxWidgetCmd procedure, "index" widget command} -setup {
1319		spinbox .e
	1323	spinbox .e
1320	1324	} -body {
1321	1325	.e in
1322	1326	} -cleanup {
1323	1327	destroy .e
1324	1328	} -returnCodes error -result {ambiguous option "in": must be bbox, cget, configure, delete, get, icursor, identify, index, insert, invoke, scan, selection, set, validate, or xview}
1325	1329	test spinbox-3.32 {SpinboxWidgetCmd procedure, "index" widget command} -setup {
1326		spinbox .e
	1330	spinbox .e
1327	1331	} -body {
1328	1332	.e index
1329	1333	} -cleanup {
1330	1334	destroy .e
1331	1335	} -returnCodes error -result {wrong # args: should be ".e index string"}
1332	1336	test spinbox-3.33 {SpinboxWidgetCmd procedure, "index" widget command} -setup {
1333		spinbox .e
	1337	spinbox .e
1334	1338	} -body {
1335	1339	.e index foo
1336	1340	} -cleanup {

1339	1343	test spinbox-3.34 {SpinboxWidgetCmd procedure, "index" widget command} -setup {
1340	1344	spinbox .e
1341	1345	pack .e
1342		update
	1346	update
1343	1347	} -body {
1344	1348	.e index 0
1345	1349	} -cleanup {

1348	1352	test spinbox-3.35 {SpinboxWidgetCmd procedure, "index" widget command} -setup {
1349	1353	spinbox .e
1350	1354	pack .e
1351		update
	1355	update
1352	1356	} -body {
1353	1357	# UTF
1354	1358	.e insert 0 abc\u4e4e\u0153def

1357	1361	destroy .e
1358	1362	} -result {3 4 8}
1359	1363	test spinbox-3.36 {SpinboxWidgetCmd procedure, "insert" widget command} -setup {
1360		spinbox .e
	1364	spinbox .e
1361	1365	} -body {
1362	1366	.e insert a
1363	1367	} -cleanup {
1364	1368	destroy .e
1365	1369	} -returnCodes error -result {wrong # args: should be ".e insert index text"}
1366	1370	test spinbox-3.37 {SpinboxWidgetCmd procedure, "insert" widget command} -setup {
1367		spinbox .e
	1371	spinbox .e
1368	1372	} -body {
1369	1373	.e insert a b c
1370	1374	} -cleanup {
1371	1375	destroy .e
1372	1376	} -returnCodes error -result {wrong # args: should be ".e insert index text"}
1373	1377	test spinbox-3.38 {SpinboxWidgetCmd procedure, "insert" widget command} -setup {
1374		spinbox .e
	1378	spinbox .e
1375	1379	} -body {
1376	1380	.e insert foo Text
1377	1381	} -cleanup {

1380	1384	test spinbox-3.39 {SpinboxWidgetCmd procedure, "insert" widget command} -setup {
1381	1385	spinbox .e
1382	1386	pack .e
1383		update
	1387	update
1384	1388	} -body {
1385	1389	.e insert end "01234567890"
1386	1390	.e insert 3 xxx

1391	1395	test spinbox-3.40 {SpinboxWidgetCmd procedure, "insert" widget command} -setup {
1392	1396	spinbox .e
1393	1397	pack .e
1394		update
	1398	update
1395	1399	} -body {
1396	1400	.e insert end "01234567890"
1397	1401	.e configure -state disabled

1400	1404	.e get
1401	1405	} -cleanup {
1402	1406	destroy .e
1403		} -result {01234567890}
	1407	} -result 01234567890
1404	1408	test spinbox-3.40.1 {SpinboxWidgetCmd procedure, "insert" widget command} -setup {
1405	1409	spinbox .e
1406	1410	pack .e
1407		update
	1411	update
1408	1412	} -body {
1409	1413	.e insert end "01234567890"
1410	1414	.e configure -state readonly

1413	1417	.e get
1414	1418	} -cleanup {
1415	1419	destroy .e
1416		} -result {01234567890}
	1420	} -result 01234567890
1417	1421	test spinbox-3.41 {SpinboxWidgetCmd procedure, "insert" widget command} -setup {
1418		spinbox .e
	1422	spinbox .e
1419	1423	} -body {
1420	1424	.e insert a b c
1421	1425	} -cleanup {
1422	1426	destroy .e
1423	1427	} -returnCodes error -result {wrong # args: should be ".e insert index text"}
1424	1428	test spinbox-3.42 {SpinboxWidgetCmd procedure, "scan" widget command} -setup {
1425		spinbox .e
	1429	spinbox .e
1426	1430	pack .e
1427	1431	update
1428	1432	} -body {

1433	1437	test spinbox-3.43 {SpinboxWidgetCmd procedure, "scan" widget command} -setup {
1434	1438	spinbox .e
1435	1439	pack .e
1436		update
	1440	update
1437	1441	} -body {
1438	1442	.e scan a b c
1439	1443	} -cleanup {

1442	1446	test spinbox-3.44 {SpinboxWidgetCmd procedure, "scan" widget command} -setup {
1443	1447	spinbox .e
1444	1448	pack .e
1445		update
	1449	update
1446	1450	} -body {
1447	1451	.e scan foobar 20
1448	1452	} -cleanup {

1451	1455	test spinbox-3.45 {SpinboxWidgetCmd procedure, "scan" widget command} -setup {
1452	1456	spinbox .e
1453	1457	pack .e
1454		update
	1458	update
1455	1459	} -body {
1456	1460	.e scan mark 20.1
1457	1461	} -cleanup {

1462	1466	test spinbox-3.46 {SpinboxWidgetCmd procedure, "scan" widget command} -constraints {
1463	1467	fonts
1464	1468	} -setup {
1465		spinbox .e -font {Helvetica -12} -borderwidth 2 -highlightthickness 2
	1469	spinbox .e -font {Helvetica -12} -borderwidth 2 -highlightthickness 2
1466	1470	pack .e
1467	1471	update
1468	1472	} -body {

1473	1477	.e index @0
1474	1478	} -cleanup {
1475	1479	destroy .e
1476		} -result {2}
	1480	} -result 2
1477	1481	test spinbox-3.47 {SpinboxWidgetCmd procedure, "select" widget command} -setup {
1478		spinbox .e
	1482	spinbox .e
1479	1483	} -body {
1480	1484	.e select
1481	1485	} -cleanup {
1482	1486	destroy .e
1483	1487	} -returnCodes error -result {wrong # args: should be ".e selection option ?index?"}
1484	1488	test spinbox-3.48 {SpinboxWidgetCmd procedure, "select" widget command} -setup {
1485		spinbox .e
	1489	spinbox .e
1486	1490	} -body {
1487	1491	.e select foo
1488	1492	} -cleanup {

1490	1494	} -returnCodes error -result {bad selection option "foo": must be adjust, clear, element, from, present, range, or to}
1491	1495
1492	1496	test spinbox-3.49 {SpinboxWidgetCmd procedure, "select clear" widget command} -setup {
1493		spinbox .e
	1497	spinbox .e
1494	1498	} -body {
1495	1499	.e select clear gorp
1496	1500	} -cleanup {
1497	1501	destroy .e
1498	1502	} -returnCodes error -result {wrong # args: should be ".e selection clear"}
1499	1503	test spinbox-3.50 {SpinboxWidgetCmd procedure, "select clear" widget command} -setup {
1500		spinbox .e
	1504	spinbox .e
1501	1505	} -body {
1502	1506	.e insert end "0123456789"
1503	1507	.e select from 1
1504	1508	.e select to 4
1505	1509	update
1506	1510	.e select clear
1507		selection get
	1511	selection get
1508	1512	} -cleanup {
1509	1513	destroy .e
1510	1514	} -returnCodes error -result {PRIMARY selection doesn't exist or form "STRING" not defined}
1511	1515	test spinbox-3.50.1 {SpinboxWidgetCmd procedure, "select clear" widget command} -setup {
1512	1516	spinbox .e
1513	1517	pack .e
1514		update
	1518	update
1515	1519	} -body {
1516	1520	.e insert end "0123456789"
1517	1521	.e select from 1

1525	1529	} -result {.e}
1526	1530
1527	1531	test spinbox-3.51 {SpinboxWidgetCmd procedure, "selection present" widget command} -setup {
1528		spinbox .e
	1532	spinbox .e
1529	1533	} -body {
1530	1534	.e selection present foo
1531	1535	} -cleanup {

1534	1538	test spinbox-3.52 {SpinboxWidgetCmd procedure, "selection present" widget command} -setup {
1535	1539	spinbox .e
1536	1540	pack .e
1537		update
	1541	update
1538	1542	} -body {
1539	1543	.e insert end 0123456789
1540	1544	.e select from 3

1542	1546	.e selection present
1543	1547	} -cleanup {
1544	1548	destroy .e
1545		} -result {1}
	1549	} -result 1
1546	1550	test spinbox-3.53 {SpinboxWidgetCmd procedure, "selection present" widget command} -setup {
1547	1551	spinbox .e
1548	1552	pack .e
1549		update
	1553	update
1550	1554	} -body {
1551	1555	.e insert end 0123456789
1552	1556	.e select from 3

1555	1559	.e selection present
1556	1560	} -cleanup {
1557	1561	destroy .e
1558		} -result {1}
	1562	} -result 1
1559	1563	test spinbox-3.54 {SpinboxWidgetCmd procedure, "selection present" widget command} -setup {
1560	1564	spinbox .e
1561	1565	pack .e
1562		update
	1566	update
1563	1567	} -body {
1564	1568	.e insert end 0123456789
1565	1569	.e select from 3

1568	1572	.e selection present
1569	1573	} -cleanup {
1570	1574	destroy .e
1571		} -result {0}
	1575	} -result 0
1572	1576	test spinbox-3.55 {SpinboxWidgetCmd procedure, "selection adjust" widget command} -setup {
1573	1577	spinbox .e
1574	1578	} -body {

1596	1600	selection get
1597	1601	} -cleanup {
1598	1602	destroy .e
1599		} -result {123}
	1603	} -result 123
1600	1604	test spinbox-3.58 {SpinboxWidgetCmd procedure, "selection adjust" widget command} -setup {
1601	1605	spinbox .e
1602	1606	pack .e

1610	1614	selection get
1611	1615	} -cleanup {
1612	1616	destroy .e
1613		} -result {234}
	1617	} -result 234
1614	1618	test spinbox-3.59 {SpinboxWidgetCmd procedure, "selection from" widget command} -setup {
1615	1619	spinbox .e
1616	1620	} -body {

1698	1702	} -result {2 4}
1699	1703
1700	1704	test spinbox-3.65 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
1701		spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	1705	spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
1702	1706	pack .e
1703	1707	update
1704	1708	} -body {

1710	1714	destroy .e
1711	1715	} -result {0.053763 0.268817}
1712	1716	test spinbox-3.66 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
1713		spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	1717	spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
1714	1718	pack .e
1715	1719	update
1716	1720	} -body {

1719	1723	destroy .e
1720	1724	} -returnCodes error -result {bad spinbox index "gorp"}
1721	1725	test spinbox-3.67 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
1722		spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	1726	spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
1723	1727	pack .e
1724	1728	update
1725	1729	} -body {

1733	1737	destroy .e
1734	1738	} -result {0.107527 0.322581}
1735	1739	test spinbox-3.68 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
1736		spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	1740	spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
1737	1741	pack .e
1738	1742	update
1739	1743	} -body {

1742	1746	destroy .e
1743	1747	} -returnCodes error -result {wrong # args: should be ".e xview moveto fraction"}
1744	1748	test spinbox-3.69 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
1745		spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	1749	spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
1746	1750	pack .e
1747	1751	update
1748	1752	} -body {

1751	1755	destroy .e
1752	1756	} -returnCodes error -result {expected floating-point number but got "foo"}
1753	1757	test spinbox-3.70 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
1754		spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	1758	spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
1755	1759	pack .e
1756	1760	update
1757	1761	} -body {

1763	1767	destroy .e
1764	1768	} -result {0.505376 0.720430}
1765	1769	test spinbox-3.71 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
1766		spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	1770	spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
1767	1771	pack .e
1768	1772	update
1769	1773	} -body {

1774	1778	destroy .e
1775	1779	} -returnCodes error -result {wrong # args: should be ".e xview scroll number units\|pages"}
1776	1780	test spinbox-3.72 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
1777		spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	1781	spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
1778	1782	pack .e
1779	1783	} -body {
1780	1784	.e insert end "This is quite a long text string, so long that it "

1785	1789	destroy .e
1786	1790	} -returnCodes error -result {expected integer but got "gorp"}
1787	1791	test spinbox-3.73 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
1788		spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	1792	spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
1789	1793	pack .e
1790	1794	} -body {
1791	1795	.e insert end "This is quite a long text string, so long that it "

1798	1802	destroy .e
1799	1803	} -result {0.193548 0.408602}
1800	1804	test spinbox-3.74 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
1801		spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	1805	spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
1802	1806	pack .e
1803	1807	update
1804	1808	} -body {

1812	1816	destroy .e
1813	1817	} -result {0.397849 0.612903}
1814	1818	test spinbox-3.75 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
1815		spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	1819	spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
1816	1820	pack .e
1817	1821	} -body {
1818	1822	.e insert end "This is quite a long text string, so long that it "

1820	1824	update
1821	1825	.e xview 30
1822	1826	update
1823		.e xview scroll 2 units
	1827	.e xview scroll 2 units
1824	1828	.e index @0
1825	1829	} -cleanup {
1826	1830	destroy .e
1827		} -result {32}
	1831	} -result 32
1828	1832	test spinbox-3.76 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
1829		spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	1833	spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
1830	1834	pack .e
1831	1835	} -body {
1832	1836	.e insert end "This is quite a long text string, so long that it "

1834	1838	update
1835	1839	.e xview 30
1836	1840	update
1837		.e xview scroll -1 units
	1841	.e xview scroll -1 units
1838	1842	.e index @0
1839	1843	} -cleanup {
1840	1844	destroy .e
1841		} -result {29}
	1845	} -result 29
1842	1846	test spinbox-3.77 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
1843		spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	1847	spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
1844	1848	pack .e
1845	1849	} -body {
1846	1850	.e insert end "This is quite a long text string, so long that it "

1851	1855	destroy .e
1852	1856	} -returnCodes error -result {bad argument "foobars": must be units or pages}
1853	1857	test spinbox-3.78 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
1854		spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	1858	spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
1855	1859	pack .e
1856	1860	} -body {
1857	1861	.e insert end "This is quite a long text string, so long that it "

1862	1866	destroy .e
1863	1867	} -returnCodes error -result {unknown option "eat": must be moveto or scroll}
1864	1868	test spinbox-3.79 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
1865		spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	1869	spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
1866	1870	pack .e
1867	1871	update
1868	1872	} -body {

1870	1874	.e insert end "runs off the end of the window quite a bit."
1871	1875	.e xview 0
1872	1876	update
1873		.e xview -4
	1877	.e xview -1
1874	1878	.e index @0
1875	1879	} -cleanup {
1876	1880	destroy .e
1877		} -result {0}
	1881	} -result 0
1878	1882	test spinbox-3.80 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
1879		spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	1883	spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
1880	1884	pack .e
1881	1885	} -body {
1882	1886	.e insert end "This is quite a long text string, so long that it "

1886	1890	.e index @0
1887	1891	} -cleanup {
1888	1892	destroy .e
1889		} -result {73}
	1893	} -result 73
1890	1894	test spinbox-3.81 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
1891		spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	1895	spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
1892	1896	pack .e
1893	1897	} -body {
1894	1898	.e insert end "This is quite a long text string, so long that it "

1910	1914	} -result {0.095745 0.106383 0.117021}
1911	1915
1912	1916	test spinbox-3.82 {SpinboxWidgetCmd procedure} -setup {
1913		spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
	1917	spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
1914	1918	pack .e
1915	1919	update
1916	1920	} -body {

1925	1929	.e get
1926	1930	} -cleanup {
1927	1931	destroy .e
1928		} -result {12345}
	1932	} -result 12345
1929	1933	test spinbox-5.2 {ConfigureSpinbox procedure, -textvariable} -body {
1930	1934	set x 12345
1931	1935	spinbox .e -textvariable x

1981	1985	destroy .e1 .e2
1982	1986	} -result {{This is so} {This is so} 1234}
1983	1987	test spinbox-5.6 {ConfigureSpinbox procedure} -setup {
1984		spinbox .e
	1988	spinbox .e
1985	1989	pack .e
1986	1990	} -body {
1987	1991	.e insert end "0123456789"
1988	1992	.e select from 1
1989	1993	.e select to 5
1990	1994	.e configure -exportselection 0
1991		selection get
	1995	selection get
1992	1996	} -cleanup {
1993	1997	destroy .e
1994	1998	} -returnCodes error -result {PRIMARY selection doesn't exist or form "STRING" not defined}

2000	2004	.e select from 1
2001	2005	.e select to 5
2002	2006	.e configure -exportselection 0
2003		catch {selection get}
	2007	catch {selection get}
2004	2008	list [.e index sel.first] [.e index sel.last]
2005	2009	} -cleanup {
2006	2010	destroy .e
2007	2011	} -result {1 5}
2008	2012
2009	2013	test spinbox-5.7 {ConfigureSpinbox procedure} -setup {
2010		spinbox .e -font {Helvetica -12} -borderwidth 2 -highlightthickness 2
	2014	spinbox .e -font {Helvetica -12} -borderwidth 2 -highlightthickness 2
2011	2015	pack .e
2012	2016	} -body {
2013	2017	.e configure -font {Courier -12} -width 4 -xscrollcommand scroll
2014	2018	.e insert end "01234567890"
2015		set timeout [after 500 {set $scrollInfo "timeout"}]
	2019	update idletasks
	2020	set timeout [after 500 {set scrollInfo {-1000000 -1000000}}]
	2021	.e configure -width 5
2016	2022	vwait scrollInfo
2017		.e configure -width 5
2018	2023	format {%.6f %.6f} {*}$scrollInfo
2019	2024	} -cleanup {
2020	2025	destroy .e

2024	2029	test spinbox-5.8 {ConfigureSpinbox procedure} -constraints {
2025	2030	fonts
2026	2031	} -setup {
2027		spinbox .e -borderwidth 2 -highlightthickness 2
	2032	spinbox .e -borderwidth 2 -highlightthickness 2
2028	2033	pack .e
2029	2034	} -body {
2030	2035	.e configure -width 0 -font {Helvetica -12}

2079	2084	test spinbox-6.1 {SpinboxComputeGeometry procedure} -constraints {
2080	2085	fonts
2081	2086	} -setup {
2082		spinbox .e
	2087	spinbox .e
2083	2088	pack .e
2084	2089	} -body {
2085	2090	.e configure -font {Courier -12} -bd 2 -relief raised -width 20 -highlightthickness 3

2092	2097	test spinbox-6.2 {SpinboxComputeGeometry procedure} -constraints {
2093	2098	fonts
2094	2099	} -setup {
2095		spinbox .e
	2100	spinbox .e
2096	2101	pack .e
2097	2102	} -body {
2098	2103	.e configure -font {Courier -12} -bd 2 -relief raised -width 20 -justify center \

2106	2111	test spinbox-6.3 {SpinboxComputeGeometry procedure} -constraints {
2107	2112	fonts
2108	2113	} -setup {
2109		spinbox .e
	2114	spinbox .e
2110	2115	pack .e
2111	2116	} -body {
2112	2117	.e configure -font {Courier -12} -bd 2 -relief raised -width 20 -justify right \

2118	2123	destroy .e
2119	2124	} -result {3 4}
2120	2125	test spinbox-6.4 {SpinboxComputeGeometry procedure} -setup {
2121		spinbox .e
	2126	spinbox .e
2122	2127	pack .e
2123	2128	} -body {
2124	2129	.e configure -font {Courier -12} -bd 2 -relief raised -width 5

2128	2133	.e index @0
2129	2134	} -cleanup {
2130	2135	destroy .e
2131		} -result {6}
	2136	} -result 6
2132	2137	test spinbox-6.5 {SpinboxComputeGeometry procedure} -setup {
2133	2138	spinbox .e -highlightthickness 2
2134	2139	pack .e
2135	2140	} -body {
2136		.e configure -font {Courier -12} -bd 2 -relief raised -width 5
	2141	.e configure -font {Courier -12} -bd 2 -relief raised -width 5
2137	2142	.e insert end "01234567890"
2138	2143	update
2139	2144	.e xview 7
2140	2145	.e index @0
2141	2146	} -cleanup {
2142	2147	destroy .e
2143		} -result {6}
	2148	} -result 6
2144	2149	test spinbox-6.6 {SpinboxComputeGeometry procedure} -constraints {
2145	2150	fonts
2146	2151	} -setup {
2147	2152	spinbox .e -highlightthickness 2
2148	2153	pack .e
2149	2154	} -body {
2150		.e configure -font {Courier -12} -bd 2 -relief raised -width 10
	2155	.e configure -font {Courier -12} -bd 2 -relief raised -width 10
2151	2156	.e insert end "01234\t67890"
2152	2157	update
2153	2158	.e xview 3

2187	2192	spinbox .e -highlightthickness 2
2188	2193	pack .e
2189	2194	} -body {
2190		.e configure -font {Helvetica -24} -bd 3 -relief raised -width 0
	2195	.e configure -font {Helvetica -24} -bd 3 -relief raised -width 0
2191	2196	update
2192	2197	list [winfo reqwidth .e] [winfo reqheight .e]
2193	2198	} -cleanup {

2196	2201
2197	2202
2198	2203	test spinbox-7.1 {InsertChars procedure} -setup {
2199		unset -nocomplain contents
	2204	unset -nocomplain contents
2200	2205	spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
2201	2206	pack .e
2202	2207	focus .e
2203	2208	} -body {
2204	2209	.e configure -textvariable contents -xscrollcommand scroll
2205	2210	.e insert 0 abcde
	2211	update idletasks
	2212	set timeout [after 500 {set scrollInfo {-1000000 -1000000}}]
2206	2213	.e insert 2 XXX
2207		set timeout [after 500 {set $scrollInfo "timeout"}]
2208	2214	vwait scrollInfo
2209	2215	list [.e get] $contents [format {%.6f %.6f} {*}$scrollInfo]
2210	2216	} -cleanup {

2213	2219	} -result {abXXXcde abXXXcde {0.000000 1.000000}}
2214	2220
2215	2221	test spinbox-7.2 {InsertChars procedure} -setup {
2216		unset -nocomplain contents
2217		spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
	2222	unset -nocomplain contents
	2223	spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
2218	2224	pack .e
2219	2225	focus .e
2220	2226	} -body {
2221	2227	.e configure -textvariable contents -xscrollcommand scroll
2222	2228	.e insert 0 abcde
	2229	update idletasks
	2230	set timeout [after 500 {set scrollInfo {-1000000 -1000000}}]
2223	2231	.e insert 500 XXX
2224		set timeout [after 500 {set $scrollInfo "timeout"}]
2225	2232	vwait scrollInfo
2226	2233	list [.e get] $contents [format {%.6f %.6f} {*}$scrollInfo]
2227	2234	} -cleanup {

2285	2292	destroy .e
2286	2293	} -result {2 6 2 5}
2287	2294	test spinbox-7.7 {InsertChars procedure} -setup {
2288		spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
	2295	spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
2289	2296	pack .e
2290	2297	} -body {
2291	2298	.e configure -xscrollcommand scroll

2295	2302	.e index insert
2296	2303	} -cleanup {
2297	2304	destroy .e
2298		} -result {7}
	2305	} -result 7
2299	2306	test spinbox-7.8 {InsertChars procedure} -setup {
2300		spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
	2307	spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
2301	2308	pack .e
2302	2309	} -body {
2303	2310	.e insert 0 0123456789

2306	2313	.e index insert
2307	2314	} -cleanup {
2308	2315	destroy .e
2309		} -result {4}
	2316	} -result 4
2310	2317	test spinbox-7.9 {InsertChars procedure} -setup {
2311		spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
	2318	spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
2312	2319	pack .e
2313	2320	} -body {
2314	2321	.e insert 0 "This is a very long string"

2318	2325	.e index @0
2319	2326	} -cleanup {
2320	2327	destroy .e
2321		} -result {7}
	2328	} -result 7
2322	2329	test spinbox-7.10 {InsertChars procedure} -setup {
2323		spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
	2330	spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
2324	2331	pack .e
2325	2332	} -body {
2326	2333	.e insert 0 "This is a very long string"

2330	2337	.e index @0
2331	2338	} -cleanup {
2332	2339	destroy .e
2333		} -result {4}
	2340	} -result 4
2334	2341
2335	2342	test spinbox-7.11 {InsertChars procedure} -constraints {
2336	2343	fonts
2337	2344	} -setup {
2338		spinbox .e -width 0 -font {Courier -12} -highlightthickness 2 -bd 2
	2345	spinbox .e -width 0 -font {Courier -12} -highlightthickness 2 -bd 2
2339	2346	pack .e
2340	2347	} -body {
2341	2348	.e insert 0 "xyzzy"

2344	2351	winfo reqwidth .e
2345	2352	} -cleanup {
2346	2353	destroy .e
2347		} -result {70}
	2354	} -result 70
2348	2355
2349	2356	test spinbox-8.1 {DeleteChars procedure} -setup {
2350		unset -nocomplain contents
2351		spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
	2357	unset -nocomplain contents
	2358	spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
2352	2359	pack .e
2353	2360	focus .e
2354	2361	} -body {
2355	2362	.e configure -textvariable contents -xscrollcommand scroll
2356	2363	.e insert 0 abcde
	2364	update idletasks
	2365	set timeout [after 500 {set scrollInfo {-1000000 -1000000}}]
2357	2366	.e delete 2 4
2358		set timeout [after 500 {set $scrollInfo "timeout"}]
2359	2367	vwait scrollInfo
2360	2368	list [.e get] $contents [format {%.6f %.6f} {*}$scrollInfo]
2361	2369	} -cleanup {

2363	2371	after cancel $timeout
2364	2372	} -result {abe abe {0.000000 1.000000}}
2365	2373	test spinbox-8.2 {DeleteChars procedure} -setup {
2366		unset -nocomplain contents
2367		spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
	2374	unset -nocomplain contents
	2375	spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
2368	2376	pack .e
2369	2377	focus .e
2370	2378	} -body {
2371	2379	.e configure -textvariable contents -xscrollcommand scroll
2372	2380	.e insert 0 abcde
2373		.e delete -2 2
2374		set timeout [after 500 {set $scrollInfo "timeout"}]
	2381	update idletasks
	2382	set timeout [after 500 {set scrollInfo {-1000000 -1000000}}]
	2383	.e delete -1 2
2375	2384	vwait scrollInfo
2376	2385	list [.e get] $contents [format {%.6f %.6f} {*}$scrollInfo]
2377	2386	} -cleanup {

2379	2388	after cancel $timeout
2380	2389	} -result {cde cde {0.000000 1.000000}}
2381	2390	test spinbox-8.3 {DeleteChars procedure} -setup {
2382		unset -nocomplain contents
2383		spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
	2391	unset -nocomplain contents
	2392	spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
2384	2393	pack .e
2385	2394	focus .e
2386	2395	} -body {
2387	2396	.e configure -textvariable contents -xscrollcommand scroll
2388	2397	.e insert 0 abcde
	2398	update idletasks
	2399	set timeout [after 500 {set scrollInfo {-1000000 -1000000}}]
2389	2400	.e delete 3 1000
2390		set timeout [after 500 {set $scrollInfo "timeout"}]
2391	2401	vwait scrollInfo
2392	2402	list [.e get] $contents [format {%.6f %.6f} {*}$scrollInfo]
2393	2403	} -cleanup {

2395	2405	after cancel $timeout
2396	2406	} -result {abc abc {0.000000 1.000000}}
2397	2407	test spinbox-8.4 {DeleteChars procedure} -setup {
2398		spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
	2408	spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
2399	2409	pack .e
2400	2410	focus .e
2401	2411	} -body {

2411	2421	destroy .e
2412	2422	} -result {1 6 1 5}
2413	2423	test spinbox-8.5 {DeleteChars procedure} -setup {
2414		spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
	2424	spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
2415	2425	pack .e
2416	2426	focus .e
2417	2427	} -body {

2427	2437	destroy .e
2428	2438	} -result {1 5 1 4}
2429	2439	test spinbox-8.6 {DeleteChars procedure} -setup {
2430		spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
	2440	spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
2431	2441	pack .e
2432	2442	focus .e
2433	2443	} -body {

2443	2453	destroy .e
2444	2454	} -result {1 2 1 5}
2445	2455	test spinbox-8.7 {DeleteChars procedure} -setup {
2446		spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
	2456	spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
2447	2457	pack .e
2448	2458	focus .e
2449	2459	} -body {

2457	2467	destroy .e
2458	2468	} -returnCodes error -result {selection isn't in widget .e}
2459	2469	test spinbox-8.8 {DeleteChars procedure} -setup {
2460		spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
	2470	spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
2461	2471	pack .e
2462	2472	focus .e
2463	2473	} -body {

2473	2483	destroy .e
2474	2484	} -result {3 4 3 8}
2475	2485	test spinbox-8.9 {DeleteChars procedure} -setup {
2476		spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
	2486	spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
2477	2487	pack .e
2478	2488	} -body {
2479	2489	.e insert 0 0123456789abcde

2486	2496	destroy .e
2487	2497	} -returnCodes error -result {selection isn't in widget .e}
2488	2498	test spinbox-8.10 {DeleteChars procedure} -setup {
2489		spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
	2499	spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
2490	2500	pack .e
2491	2501	focus .e
2492	2502	} -body {

2502	2512	destroy .e
2503	2513	} -result {3 5 5 8}
2504	2514	test spinbox-8.11 {DeleteChars procedure} -setup {
2505		spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
	2515	spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
2506	2516	pack .e
2507	2517	focus .e
2508	2518	} -body {

2518	2528	destroy .e
2519	2529	} -result {3 8 4 8}
2520	2530	test spinbox-8.12 {DeleteChars procedure} -setup {
2521		spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
	2531	spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
2522	2532	pack .e
2523	2533	focus .e
2524	2534	} -body {

2529	2539	.e index insert
2530	2540	} -cleanup {
2531	2541	destroy .e
2532		} -result {1}
	2542	} -result 1
2533	2543	test spinbox-8.13 {DeleteChars procedure} -setup {
2534		spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
	2544	spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
2535	2545	pack .e
2536	2546	focus .e
2537	2547	} -body {

2542	2552	.e index insert
2543	2553	} -cleanup {
2544	2554	destroy .e
2545		} -result {1}
	2555	} -result 1
2546	2556	test spinbox-8.14 {DeleteChars procedure} -setup {
2547		spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
	2557	spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
2548	2558	pack .e
2549	2559	focus .e
2550	2560	} -body {

2555	2565	.e index insert
2556	2566	} -cleanup {
2557	2567	destroy .e
2558		} -result {4}
	2568	} -result 4
2559	2569	test spinbox-8.15 {DeleteChars procedure} -setup {
2560		spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
	2570	spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
2561	2571	pack .e
2562	2572	focus .e
2563	2573	} -body {

2568	2578	.e index @0
2569	2579	} -cleanup {
2570	2580	destroy .e
2571		} -result {1}
	2581	} -result 1
2572	2582	test spinbox-8.16 {DeleteChars procedure} -setup {
2573		spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
	2583	spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
2574	2584	pack .e
2575	2585	focus .e
2576	2586	} -body {

2581	2591	.e index @0
2582	2592	} -cleanup {
2583	2593	destroy .e
2584		} -result {1}
	2594	} -result 1
2585	2595	test spinbox-8.17 {DeleteChars procedure} -setup {
2586		spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
	2596	spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
2587	2597	pack .e
2588	2598	focus .e
2589	2599	} -body {

2594	2604	.e index @0
2595	2605	} -cleanup {
2596	2606	destroy .e
2597		} -result {4}
2598		test spinbox-8.18 {DeleteChars procedure} -setup {
2599		spinbox .e -width 0 -font {Courier -12} -highlightthickness 2 -bd 2
	2607	} -result 4
	2608	test spinbox-8.18 {DeleteChars procedure} -constraints failsOnUbuntuNoXft -setup {
	2609	spinbox .e -width 0 -font {Courier -12} -highlightthickness 2 -bd 2
2600	2610	pack .e
2601	2611	focus .e
2602	2612	} -body {

2606	2616	winfo reqwidth .e
2607	2617	} -cleanup {
2608	2618	destroy .e
2609		} -result {42}
	2619	} -result 42
2610	2620
2611	2621	test spinbox-9.1 {SpinboxValueChanged procedure} -setup {
2612	2622	unset -nocomplain x

2626	2636	set y ab
2627	2637	spinbox .e -font {Helvetica -12} -highlightthickness 2 -bd 2 -width 0
2628	2638	pack .e
2629		.e configure -textvariable x
	2639	.e configure -textvariable x
2630	2640	.e configure -textvariable y
2631	2641	update
2632	2642	list [.e get] [winfo reqwidth .e]

2635	2645	} -result {ab 35}
2636	2646	test spinbox-10.2 {SpinboxSetValue procedure, updating selection} -setup {
2637	2647	unset -nocomplain x
2638		spinbox .e -font {Helvetica -12} -highlightthickness 2 -bd 2
	2648	spinbox .e -font {Helvetica -12} -highlightthickness 2 -bd 2
2639	2649	pack .e
2640	2650	} -body {
2641	2651	.e configure -textvariable x

2648	2658	} -returnCodes error -result {selection isn't in widget .e}
2649	2659	test spinbox-10.3 {SpinboxSetValue procedure, updating selection} -setup {
2650	2660	unset -nocomplain x
2651		spinbox .e -font {Helvetica -12} -highlightthickness 2 -bd 2
	2661	spinbox .e -font {Helvetica -12} -highlightthickness 2 -bd 2
2652	2662	pack .e
2653	2663	} -body {
2654	2664	.e configure -textvariable x

2661	2671	} -result {4 7}
2662	2672	test spinbox-10.4 {SpinboxSetValue procedure, updating selection} -setup {
2663	2673	unset -nocomplain x
2664		spinbox .e -font {Helvetica -12} -highlightthickness 2 -bd 2
	2674	spinbox .e -font {Helvetica -12} -highlightthickness 2 -bd 2
2665	2675	pack .e
2666	2676	} -body {
2667	2677	.e configure -textvariable x

2674	2684	} -result {4 10}
2675	2685	test spinbox-10.5 {SpinboxSetValue procedure, updating display position} -setup {
2676	2686	unset -nocomplain x
2677		spinbox .e -highlightthickness 2 -bd 2
	2687	spinbox .e -highlightthickness 2 -bd 2
2678	2688	pack .e
2679	2689	} -body {
2680	2690	.e configure -width 10 -font {Courier -12} -textvariable x

2686	2696	.e index @0
2687	2697	} -cleanup {
2688	2698	destroy .e
2689		} -result {0}
	2699	} -result 0
2690	2700	test spinbox-10.6 {SpinboxSetValue procedure, updating display position} -setup {
2691	2701	unset -nocomplain x
2692		spinbox .e -highlightthickness 2 -bd 2
	2702	spinbox .e -highlightthickness 2 -bd 2
2693	2703	pack .e
2694	2704	} -body {
2695	2705	.e configure -width 10 -font {Courier -12} -textvariable x

2702	2712	.e index @0
2703	2713	} -cleanup {
2704	2714	destroy .e
2705		} -result {10}
	2715	} -result 10
2706	2716	test spinbox-10.7 {SpinboxSetValue procedure, updating insertion cursor} -setup {
2707	2717	unset -nocomplain x
2708		spinbox .e -highlightthickness 2 -bd 2
	2718	spinbox .e -highlightthickness 2 -bd 2
2709	2719	pack .e
2710	2720	update
2711	2721	} -body {

2717	2727	.e index insert
2718	2728	} -cleanup {
2719	2729	destroy .e
2720		} -result {3}
	2730	} -result 3
2721	2731	test spinbox-10.8 {SpinboxSetValue procedure, updating insertion cursor} -setup {
2722	2732	unset -nocomplain x
2723		spinbox .e -highlightthickness 2 -bd 2
	2733	spinbox .e -highlightthickness 2 -bd 2
2724	2734	pack .e
2725	2735	} -body {
2726	2736	.e configure -width 10 -font {Courier -12} -textvariable x

2731	2741	.e index insert
2732	2742	} -cleanup {
2733	2743	destroy .e
2734		} -result {5}
	2744	} -result 5
2735	2745
2736	2746	test spinbox-11.1 {SpinboxEventProc procedure} -setup {
2737	2747	spinbox .e -highlightthickness 2 -bd 2 -font {Helvetica -12}

2775	2785	.e index end
2776	2786	} -cleanup {
2777	2787	destroy .e
2778		} -result {21}
	2788	} -result 21
2779	2789	test spinbox-13.2 {GetSpinboxIndex procedure} -body {
2780		spinbox .e
	2790	spinbox .e
2781	2791	.e index abogus
2782	2792	} -cleanup {
2783	2793	destroy .e

2794	2804	.e index anchor
2795	2805	} -cleanup {
2796	2806	destroy .e
2797		} -result {1}
	2807	} -result 1
2798	2808	test spinbox-13.4 {GetSpinboxIndex procedure} -setup {
2799	2809	spinbox .e -font {Courier -12} -width 5 -bd 2 -relief sunken
2800	2810	pack .e

2807	2817	.e index anchor
2808	2818	} -cleanup {
2809	2819	destroy .e
2810		} -result {4}
	2820	} -result 4
2811	2821	test spinbox-13.5 {GetSpinboxIndex procedure} -setup {
2812	2822	spinbox .e -font {Courier -12} -width 5 -bd 2 -relief sunken
2813	2823	pack .e

2821	2831	.e index anchor
2822	2832	} -cleanup {
2823	2833	destroy .e
2824		} -result {15}
	2834	} -result 15
2825	2835	test spinbox-13.6 {GetSpinboxIndex procedure} -setup {
2826	2836	spinbox .e
2827	2837	} -body {

2840	2850	.e index insert
2841	2851	} -cleanup {
2842	2852	destroy .e
2843		} -result {2}
	2853	} -result 2
2844	2854	test spinbox-13.8 {GetSpinboxIndex procedure} -setup {
2845	2855	spinbox .e
2846	2856	} -body {

2863	2873	} -result {1 6}
2864	2874
2865	2875	test spinbox-13.10 {GetSpinboxIndex procedure} -constraints x11 -body {
2866		# On unix, when selection is cleared, spinbox widget's internal
	2876	# On unix, when selection is cleared, spinbox widget's internal
2867	2877	# selection range is reset.
2868	2878	# Previous settings:
2869	2879	spinbox .e -font {Courier -12} -width 5 -bd 2 -relief sunken

2883	2893
2884	2894	test spinbox-13.11 {GetSpinboxIndex procedure} -constraints aquaOrWin32 -body {
2885	2895	# On mac and pc, when selection is cleared, spinbox widget remembers
2886		# last selected range. When selection ownership is restored to
	2896	# last selected range. When selection ownership is restored to
2887	2897	# spinbox, the old range will be rehighlighted.
2888	2898	# Previous settings:
2889	2899	spinbox .e -font {Courier -12} -width 5 -bd 2 -relief sunken

2900	2910	.e index sel.first
2901	2911	} -cleanup {
2902	2912	destroy .e
2903		} -result {1}
	2913	} -result 1
2904	2914
2905	2915	test spinbox-13.12 {GetSpinboxIndex procedure} -constraints x11 -body {
2906	2916	# Previous settings:

2955	2965
2956	2966	test spinbox-13.14 {GetSpinboxIndex procedure} -constraints win -body {
2957	2967	# On mac and pc, when selection is cleared, spinbox widget remembers
2958		# last selected range. When selection ownership is restored to
	2968	# last selected range. When selection ownership is restored to
2959	2969	# spinbox, the old range will be rehighlighted.
2960	2970	# Previous settings:
2961	2971	spinbox .e -font {Courier -12} -width 5 -bd 2 -relief sunken

2968	2978	list [.e index sel.first] [.e index sel.last]
2969	2979	# Testing:
2970	2980	selection clear .e
2971		selection get
	2981	selection get
2972	2982	} -cleanup {
2973	2983	destroy .e
2974	2984	} -returnCodes error -match glob -result {*}
2975	2985
2976	2986	test spinbox-13.14.1 {GetSpinboxIndex procedure} -constraints win -body {
2977	2987	# On mac and pc, when selection is cleared, spinbox widget remembers
2978		# last selected range. When selection ownership is restored to
	2988	# last selected range. When selection ownership is restored to
2979	2989	# spinbox, the old range will be rehighlighted.
2980	2990	# Previous settings:
2981	2991	spinbox .e -font {Courier -12} -width 5 -bd 2 -relief sunken

2987	2997	.e select to 6
2988	2998	list [.e index sel.first] [.e index sel.last]
2989	2999	# Testing:
2990		selection clear .e
2991		catch {selection get}
2992		.e index sbogus
	3000	selection clear .e
	3001	catch {selection get}
	3002	.e index sbogus
2993	3003	} -cleanup {
2994	3004	destroy .e
2995	3005	} -returnCodes error -match glob -result {*}

3004	3014
3005	3015	test spinbox-13.16 {GetSpinboxIndex procedure} -constraints fonts -body {
3006	3016	spinbox .e -width 5 -relief sunken -highlightthickness 2 -bd 2 \
3007		-font {Courier -12}
	3017	-font {Courier -12}
3008	3018	pack .e
3009	3019	.e insert 0 012345678901234567890
3010	3020	.e xview 4

3012	3022	.e index @4
3013	3023	} -cleanup {
3014	3024	destroy .e
3015		} -result {4}
	3025	} -result 4
3016	3026	test spinbox-13.17 {GetSpinboxIndex procedure} -constraints fonts -body {
3017	3027	spinbox .e -width 5 -relief sunken -highlightthickness 2 -bd 2 \
3018		-font {Courier -12}
	3028	-font {Courier -12}
3019	3029	pack .e
3020	3030	.e insert 0 012345678901234567890
3021	3031	.e xview 4

3023	3033	.e index @11
3024	3034	} -cleanup {
3025	3035	destroy .e
3026		} -result {4}
	3036	} -result 4
3027	3037	test spinbox-13.18 {GetSpinboxIndex procedure} -constraints fonts -body {
3028	3038	spinbox .e -width 5 -relief sunken -highlightthickness 2 -bd 2 \
3029		-font {Courier -12}
	3039	-font {Courier -12}
3030	3040	pack .e
3031	3041	.e insert 0 012345678901234567890
3032	3042	.e xview 4

3034	3044	.e index @12
3035	3045	} -cleanup {
3036	3046	destroy .e
3037		} -result {5}
	3047	} -result 5
3038	3048	test spinbox-13.19 {GetSpinboxIndex procedure} -constraints fonts -body {
3039	3049	spinbox .e -width 5 -relief sunken -highlightthickness 2 -bd 2 \
3040		-font {Courier -12}
	3050	-font {Courier -12}
3041	3051	pack .e
3042	3052	.e insert 0 012345678901234567890
3043	3053	.e xview 4

3045	3055	.e index @[expr {[winfo width .e] - 6-11}]
3046	3056	} -cleanup {
3047	3057	destroy .e
3048		} -result {8}
	3058	} -result 8
3049	3059	test spinbox-13.20 {GetSpinboxIndex procedure} -constraints fonts -body {
3050	3060	spinbox .e -width 5 -relief sunken -highlightthickness 2 -bd 2 \
3051		-font {Courier -12}
	3061	-font {Courier -12}
3052	3062	pack .e
3053	3063	.e insert 0 012345678901234567890
3054	3064	.e xview 4

3056	3066	.e index @[expr {[winfo width .e] - 5}]
3057	3067	} -cleanup {
3058	3068	destroy .e
3059		} -result {9}
	3069	} -result 9
3060	3070	test spinbox-13.21 {GetSpinboxIndex procedure} -body {
3061	3071	spinbox .e -width 5 -relief sunken -highlightthickness 2 -bd 2 \
3062		-font {Courier -12}
	3072	-font {Courier -12}
3063	3073	pack .e
3064	3074	.e insert 0 012345678901234567890
3065	3075	.e xview 4

3067	3077	.e index @1000
3068	3078	} -cleanup {
3069	3079	destroy .e
3070		} -result {9}
	3080	} -result 9
3071	3081	test spinbox-13.22 {GetSpinboxIndex procedure} -setup {
3072		spinbox .e
	3082	spinbox .e
3073	3083	pack .e
3074	3084	update
3075	3085	} -body {

3079	3089	} -returnCodes error -result {bad spinbox index "1xyz"}
3080	3090	test spinbox-13.23 {GetSpinboxIndex procedure} -body {
3081	3091	spinbox .e -width 5 -relief sunken -highlightthickness 2 -bd 2 \
3082		-font {Courier -12}
	3092	-font {Courier -12}
3083	3093	pack .e
3084	3094	.e insert 0 012345678901234567890
3085	3095	.e xview 4
3086	3096	update
3087		.e index -10
3088		} -cleanup {
3089		destroy .e
3090		} -result {0}
	3097	.e index -1
	3098	} -cleanup {
	3099	destroy .e
	3100	} -result 0
3091	3101	test spinbox-13.24 {GetSpinboxIndex procedure} -body {
3092	3102	spinbox .e -width 5 -relief sunken -highlightthickness 2 -bd 2 \
3093		-font {Courier -12}
	3103	-font {Courier -12}
3094	3104	pack .e
3095	3105	.e insert 0 012345678901234567890
3096	3106	.e xview 4

3098	3108	.e index 12
3099	3109	} -cleanup {
3100	3110	destroy .e
3101		} -result {12}
	3111	} -result 12
3102	3112	test spinbox-13.25 {GetSpinboxIndex procedure} -body {
3103	3113	spinbox .e -width 5 -relief sunken -highlightthickness 2 -bd 2 \
3104		-font {Courier -12}
	3114	-font {Courier -12}
3105	3115	pack .e
3106	3116	.e insert 0 012345678901234567890
3107	3117	.e xview 4

3109	3119	.e index 49
3110	3120	} -cleanup {
3111	3121	destroy .e
3112		} -result {21}
	3122	} -result 21
3113	3123
3114	3124	# XXX Still need to write tests for SpinboxScanTo and SpinboxSelectTo.
3115	3125

3129	3139	}
3130	3140	} -body {
3131	3141	spinbox .e
3132		.e insert end $x
	3142	.e insert end $x
3133	3143	.e select from 0
3134	3144	.e select to end
3135	3145	string compare [selection get] $x
3136	3146	} -cleanup {
3137	3147	destroy .e
3138		} -result {0}
	3148	} -result 0
3139	3149
3140	3150	test spinbox-15.1 {SpinboxLostSelection} -body {
3141	3151	spinbox .e

3156	3166	spinbox .e -width 10 -font {Helvetica -12}
3157	3167	pack .e
3158	3168	update
3159		.e insert 0 "............................."
	3169	.e insert 0 "............................."
3160	3170	format {%.6f %.6f} {*}[.e xview]
3161	3171	} -cleanup {
3162	3172	destroy .e

3172	3182	test spinbox-17.1 {SpinboxUpdateScrollbar procedure} -body {
3173	3183	spinbox .e -width 10 -xscrollcommand scroll -font {Courier -12}
3174	3184	pack .e
	3185	update idletasks
	3186	set timeout [after 500 {set scrollInfo {-1000000 -1000000}}]
3175	3187	.e delete 0 end
3176	3188	.e insert 0 123
3177		set timeout [after 500 {set $scrollInfo "timeout"}]
3178	3189	vwait scrollInfo
3179	3190	format {%.6f %.6f} {*}$scrollInfo
3180	3191	} -cleanup {

3185	3196	spinbox .e -width 10 -xscrollcommand scroll -font {Courier -12}
3186	3197	pack .e
3187	3198	.e insert 0 0123456789abcdef
	3199	update idletasks
	3200	set timeout [after 500 {set $scrollInfo {-1000000 -1000000}}]
3188	3201	.e xview 3
3189		set timeout [after 500 {set $scrollInfo "timeout"}]
3190	3202	vwait scrollInfo
3191	3203	format {%.6f %.6f} {*}$scrollInfo
3192	3204	} -cleanup {

3196	3208	test spinbox-17.3 {SpinboxUpdateScrollbar procedure} -body {
3197	3209	spinbox .e -width 10 -xscrollcommand scroll -font {Courier -12}
3198	3210	pack .e
	3211	update idletasks
	3212	set timeout [after 500 {set scrollInfo {-1000000 -1000000}}]
3199	3213	.e insert 0 abcdefghijklmnopqrs
3200		.e xview 6
3201		set timeout [after 500 {set $scrollInfo "timeout"}]
	3214	.e xview
3202	3215	vwait scrollInfo
3203	3216	format {%.6f %.6f} {*}$scrollInfo
3204	3217	} -cleanup {
3205	3218	destroy .e
3206	3219	after cancel $timeout
3207		} -result {0.315789 0.842105}
	3220	} -result {0.000000 0.526316}
3208	3221	test spinbox-17.4 {SpinboxUpdateScrollbar procedure} -setup {
3209	3222	proc bgerror msg {
3210	3223	global x
3211	3224	set x $msg
3212	3225	}
3213	3226	} -body {
3214		spinbox .e -width 5 -xscrollcommand thisisnotacommand
3215		pack .e
	3227	spinbox .e -width 5
	3228	pack .e
	3229	update idletasks
	3230	.e configure -xscrollcommand thisisnotacommand
3216	3231	vwait x
3217	3232	list $x $errorInfo
3218	3233	} -cleanup {

3233	3248	set res1 [list [winfo children .] [interp hidden]]
3234	3249	set res2 [list {} $l]
3235	3250	expr {$res1 == $res2}
3236		} -result {1}
	3251	} -result 1
3237	3252
3238	3253	##
3239	3254	## Spinbox widget VALIDATION tests

3587	3602	-background red -foreground white
3588	3603	pack .e
3589	3604	set ::e nextdata ;# previous settings
3590
	3605
3591	3606	.e configure -validatecommand [list doval2 %W %d %i %P %s %S %v %V]
3592	3607	.e validate
3593	3608	list [.e cget -validate] [.e get] $::vVals
3594	3609	} -cleanup {
3595	3610	destroy .e
3596		} -result {none mydata {.e -1 -1 nextdata nextdata {} all forced}}
	3611	} -result {none nextdata {.e -1 -1 nextdata nextdata {} all forced}}
3597	3612
3598	3613	## This leaves validate alone because we trigger validation through the
3599	3614	## textvar (a write trace), and the write during validation triggers

3612	3627	set ::e nextdata ;# previous settings
3613	3628	.e configure -validatecommand [list doval2 %W %d %i %P %s %S %v %V] ;# prev
3614	3629	.e validate ;# previous settings
3615
	3630
3616	3631	.e configure -validate all
3617	3632	set ::e testdata
3618	3633	list [.e cget -validate] [.e get] $::e $::vVals
3619	3634	} -cleanup {
3620	3635	destroy .e
3621	3636	} -result {all testdata mydata {.e -1 -1 testdata mydata {} all forced}}
	3637
	3638	## This leaves validate alone because we trigger validation through the
	3639	## textvar (a write trace), and the write during validation triggers
	3640	## nothing (by definition of avoiding loops on var traces). This is
	3641	## one of those "dangerous" conditions where the user will have a
	3642	## different value in the entry widget shown as is in the textvar.
	3643	test spinbox-19.21 {spinbox widget validation - bug 40e4bf6198} -setup {
	3644	unset -nocomplain ::e ::vVals
	3645	} -body {
	3646	spinbox .e -validate key \
	3647	-validatecommand [list doval2 %W %d %i %P %s %S %v %V] \
	3648	-textvariable ::e
	3649	pack .e
	3650	set ::e origdata
	3651	.e insert 0 A
	3652	list [.e cget -validate] [.e get] $::e $::vVals
	3653	} -cleanup {
	3654	destroy .e
	3655	} -result {none origdata mydata {.e 1 0 Aorigdata origdata A key key}}
	3656
3622	3657	##
3623	3658	## End validation tests
3624	3659	##

3774	3809	set val
3775	3810	} -cleanup {
3776	3811	destroy .e
3777		} -result {5}
	3812	} -result 5
3778	3813	test spinbox-22.2 {spinbox config, -from changes SF bug 559078} -body {
3779	3814	set val 5
3780	3815	spinbox .e -from 1 -to 10 -textvariable val

3782	3817	set val
3783	3818	} -cleanup {
3784	3819	destroy .e
3785		} -result {5}
	3820	} -result 5
3786	3821	test spinbox-22.3 {spinbox config, -from changes SF bug 559078} -body {
3787	3822	set val 5
3788	3823	spinbox .e -from 3 -to 10 -textvariable val

3790	3825	set val
3791	3826	} -cleanup {
3792	3827	destroy .e
3793		} -result {6}
	3828	} -result 6
3794	3829
3795	3830	test spinbox-23.1 {selection present while disabled, bug 637828} -body {
3796	3831	spinbox .e

+34

-33

tests/text.test less more

909	909	} -body {
910	910	catch {destroy .t}
911	911	text .t
912		.t tag cget sel -relief
	912	.t tag cget sel -relief
913	913	} -cleanup {
914	914	destroy .t
915	915	} -result {flat}

918	918	} -body {
919	919	catch {destroy .t}
920	920	text .t
921		.t tag cget sel -relief
	921	.t tag cget sel -relief
922	922	} -cleanup {
923	923	destroy .t
924	924	} -result {flat}

927	927	} -body {
928	928	catch {destroy .t}
929	929	text .t
930		.t tag cget sel -relief
	930	.t tag cget sel -relief
931	931	} -cleanup {
932	932	destroy .t
933	933	} -result {raised}

2034	2034	.t tag configure elide -elide 1
2035	2035	.t tag add elide 5.2 5.4
2036	2036	.t window create 5.4
2037		.t delete 5.4
	2037	.t delete 5.4
2038	2038	.t tag add elide 5.5 5.6
2039	2039	.t get -displaychars 5.2 5.8
2040	2040	} -cleanup {

2916	2916	lappend res [.t index "1.0 +1 indices"]
2917	2917	lappend res [.t index "1.0 +1 display indices"]
2918	2918	lappend res [.t index "1.0 +1 display chars"]
2919		lappend res [.t index end]
	2919	lappend res [.t index end]
2920	2920	lappend res [.t index "end -1 indices"]
2921	2921	lappend res [.t index "end -1 display indices"]
2922	2922	lappend res [.t index "end -1 display chars"]

3088	3088	for {set i 1} {$i < 300} {incr i} {
3089	3089	append content [string repeat "$i " 50] \n
3090	3090	}
3091		# Sync the widget and process all <<WidgetViewSync>> events before binding.
	3091	# Sync the widget and process all <<WidgetViewSync>> events before binding.
3092	3092	.top.yt sync
3093	3093	update
3094	3094	bind .top.yt <<WidgetViewSync>> {lappend res Sync:%d}

3119	3119	pack [text .top.t]
3120	3120	update
3121	3121	for {set i 1} {$i < 10000} {incr i} {
3122		.top.t insert end "Hello world!\n"
	3122	.top.t insert end "Hello world!\n"
3123	3123	}
3124	3124	bind .top.t <<WidgetViewSync>> {destroy .top.t}
3125	3125	.top.t tag add mytag 1.5 8000.8 ; # shall not crash

3322	3322	.t configure -tabs {30 foo}
3323	3323	} -cleanup {
3324	3324	destroy .t
3325		} -returnCodes {error} -result {bad tab alignment "foo": must be left, right, center, or numeric}
	3325	} -returnCodes {error} -result {bad tab alignment "foo": must be left, right, center, or numeric}
3326	3326	test text-14.6 {ConfigureText procedure} -setup {
3327	3327	text .t
3328	3328	} -body {
3329		catch {.t configure -tabs {30 foo}}
	3329	catch {.t configure -tabs {30 foo}}
3330	3330	.t configure -tabs {10 20 30}
3331	3331	return $errorInfo
3332	3332	} -cleanup {

3345	3345	destroy .t
3346	3346	} -result {}
3347	3347	test text-14.8 {ConfigureText procedure} -setup {
3348		text .t
	3348	text .t
3349	3349	} -body {
3350	3350	.t configure -wrap bogus
3351	3351	} -cleanup {

3371	3371	destroy .t
3372	3372	} -result {}
3373	3373	test text-14.11 {ConfigureText procedure} -setup {
3374		text .t
	3374	text .t
3375	3375	} -body {
3376	3376	.t configure -selectborderwidth foo
3377	3377	} -cleanup {

3461	3461	toplevel .top
3462	3462	text .top.t -font {Courier -12} -borderwidth 2 -highlightthickness 2
3463	3463	} -body {
3464		.top.t configure -width 20 -height 10
	3464	.top.t configure -width 20 -height 10
3465	3465	pack .top.t
3466	3466	update
3467	3467	set geom [wm geometry .top]

3475	3475	# to the appropriate size.
3476	3476	# On macOS, however, there is no way to make the window overlap the menubar.
3477	3477	if {[tk windowingsystem] == "aqua"} {
3478		set minY 23
	3478	set minY [expr [menubarheight] + 1]
3479	3479	} else {
3480	3480	set minY 0
3481	3481	}

3557	3557	test text-17.2 {TextCmdDeletedProc procedure, disabling -setgrid} -constraints {
3558	3558	fonts
3559	3559	} -body {
3560		toplevel .top
	3560	toplevel .top
3561	3561	text .top.t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold} \
3562	3562	-setgrid 1 -width 20 -height 10
3563	3563	pack .top.t

4949	4949	test text-22.119 {TextSearchCmd, multiline regexp matching} -body {
4950	4950	pack [text .t]
4951	4951	.t insert 1.0 { Tcl_Obj *objPtr));
4952		static Tcl_Obj* FSNormalizeAbsolutePath
	4952	static Tcl_Obj* FSNormalizeAbsolutePath
4953	4953	_ANSI_ARGS_((Tcl_Interp* interp, Tcl_Obj *pathPtr));}
4954	4954	set markExpr "^(\[A-Za-z0-9~_\]+\[ \t\n\r\]\\(\|(\[^ \t\(#\n\r/@:\\]\[^=\(\r\n\]\[ \t\]+\\?)?"
4955	4955	append markExpr "(\[A-Za-z0-9~_\]+(<\[^>\]>)?(::)?(\[A-Za-z0-9~_\]+::)\[-A-Za-z0-9~_+ <>\\|\\*/\]+\|\[A-Za-z0-9~_\]+)"

4966	4966	pack [text .t]
4967	4967	.t insert 1.0 {static int SetFsPathFromAny _ANSI_ARGS_((Tcl_Interp *interp,
4968	4968	Tcl_Obj *objPtr));
4969		static Tcl_Obj* FSNormalizeAbsolutePath
	4969	static Tcl_Obj* FSNormalizeAbsolutePath
4970	4970	_ANSI_ARGS_((Tcl_Interp* interp, Tcl_Obj *pathPtr));}
4971	4971	set markExpr "^(\[A-Za-z0-9~_\]+\[ \t\n\r\]\\(\|(\[^ \t\(#\n\r/@:\\]\[^=\(\r\n\]\[ \t\]+\\?)?"
4972	4972	append markExpr "(\[A-Za-z0-9~_\]+(<\[^>\]>)?(::)?(\[A-Za-z0-9~_\]+::)\[-A-Za-z0-9~_+ <>\\|\\*/\]+\|\[A-Za-z0-9~_\]+)"

4980	4980	.t insert 1.0 {
4981	4981	static int SetFsPathFromAny _ANSI_ARGS_((Tcl_Interp *interp,
4982	4982	Tcl_Obj *objPtr));
4983		static Tcl_Obj* FSNormalizeAbsolutePath
	4983	static Tcl_Obj* FSNormalizeAbsolutePath
4984	4984	_ANSI_ARGS_((Tcl_Interp* interp, Tcl_Obj *pathPtr));}
4985	4985	set markExpr "^(\[A-Za-z0-9~_\]+\[ \t\n\r\]\\(\|(\[^ \t\(#\n\r/@:\\]\[^=\(\r\n\]\[ \t\]+\\?)?"
4986	4986	append markExpr "(\[A-Za-z0-9~_\]+(<\[^>\]>)?(::)?(\[A-Za-z0-9~_\]+::)\[-A-Za-z0-9~_+ <>\\|\\*/\]+\|\[A-Za-z0-9~_\]+)"

5065	5065
5066	5066	void
5067	5067	Tcl_SetObjLength(objPtr, length)
5068		register Tcl_Obj objPtr; / Pointer to object. This object must
5069		* not currently be shared. */
5070		register int length; /* Number of bytes desired for string
	5068	Tcl_Obj objPtr; / Pointer to object. This object must
	5069	* not currently be shared. */
	5070	int length; /* Number of bytes desired for string
5071	5071	* representation of object, not including
5072		* terminating null byte. */
	5072	* terminating null byte. */
5073	5073	\{
5074	5074	char *new;
5075	5075	}

6176	6176	test text-24.1 {TextDumpCmd procedure, bad args} -body {
6177	6177	pack [text .t]
6178	6178	.t insert 1.0 "One Line"
6179		.t mark set insert 1.0
	6179	.t mark set insert 1.0
6180	6180	.t dump
6181	6181	} -cleanup {
6182	6182	destroy .t

6184	6184	test text-24.2 {TextDumpCmd procedure, bad args} -body {
6185	6185	pack [text .t]
6186	6186	.t insert 1.0 "One Line"
6187		.t mark set insert 1.0
	6187	.t mark set insert 1.0
6188	6188	.t dump -all
6189	6189	} -cleanup {
6190	6190	destroy .t

6192	6192	test text-24.3 {TextDumpCmd procedure, bad args} -body {
6193	6193	pack [text .t]
6194	6194	.t insert 1.0 "One Line"
6195		.t mark set insert 1.0
	6195	.t mark set insert 1.0
6196	6196	.t dump -command
6197	6197	} -cleanup {
6198	6198	destroy .t

6200	6200	test text-24.4 {TextDumpCmd procedure, bad args} -body {
6201	6201	pack [text .t]
6202	6202	.t insert 1.0 "One Line"
6203		.t mark set insert 1.0
	6203	.t mark set insert 1.0
6204	6204	.t dump -bogus
6205	6205	} -cleanup {
6206	6206	destroy .t

6208	6208	test text-24.5 {TextDumpCmd procedure, bad args} -body {
6209	6209	pack [text .t]
6210	6210	.t insert 1.0 "One Line"
6211		.t mark set insert 1.0
	6211	.t mark set insert 1.0
6212	6212	.t dump bogus
6213	6213	} -cleanup {
6214	6214	destroy .t

6245	6245	test text-24.10 {TextDumpCmd procedure, negative range} -body {
6246	6246	pack [text .t]
6247	6247	.t insert 1.0 "One Line"
6248		.t mark set insert 1.0
	6248	.t mark set insert 1.0
6249	6249	.t dump 1.5 1.0
6250	6250	} -cleanup {
6251	6251	destroy .t

6691	6691	update
6692	6692	set ::retval no_<<Selection>>_event_fired
6693	6693	.t mark set insert 1.15
6694		focus .t
	6694	update idletasks
	6695	focus -force .t
6695	6696	event generate .t <Delete>
6696	6697	update
6697	6698	set ::retval

7235	7236	for {set i 1} {$i < 20} {incr i} {
7236	7237	.t insert end "Line $i\n"
7237	7238	}
7238		.t tag add sel 1.0 3.0 5.0 7.0 9.0 11.0 13.0 15.0 17.0 19.0
	7239	.t tag add sel 1.0 3.0 5.0 7.0 9.0 11.0 13.0 15.0 17.0 19.0
7239	7240	lappend res [.t tag prevrange sel 1.0]
7240	7241	.t configure -start 6 -end 12
7241	7242	lappend res [.t tag ranges sel]

7256	7257	for {set i 1} {$i < 20} {incr i} {
7257	7258	.t insert end "Line $i\n"
7258	7259	}
7259		.t tag add sel 1.0 3.0 9.0 11.0 13.0 15.0 17.0 19.0
	7260	.t tag add sel 1.0 3.0 9.0 11.0 13.0 15.0 17.0 19.0
7260	7261	.t configure -start 6 -end 12
7261	7262	lappend res [.t tag ranges sel]
7262	7263	lappend res "next" [.t tag nextrange sel 4.0] \

7276	7277	for {set i 1} {$i < 20} {incr i} {
7277	7278	.t insert end "Line $i\n"
7278	7279	}
7279		.t tag add sel 1.0 7.0 9.0 11.0 13.0 15.0 17.0 19.0
	7280	.t tag add sel 1.0 7.0 9.0 11.0 13.0 15.0 17.0 19.0
7280	7281	.t configure -start 6 -end 12
7281	7282	lappend res [.t tag ranges sel]
7282	7283	lappend res "next" [.t tag nextrange sel 4.0] \

7321	7322	return $res
7322	7323	} -cleanup {
7323	7324	destroy .t
7324		} -result {1.0 11.0}
	7325	} -result {1.0 11.0}
7325	7326	test text-31.19 {peer widgets} -body {
7326	7327	pack [text .t]
7327	7328	for {set i 1} {$i < 20} {incr i} {

7366	7367	update
7367	7368	set after [$w count -ypixels 1.0 2.0]
7368	7369	destroy .g
7369		expr {$before eq $after}
	7370	expr {$before eq $after}
7370	7371	} -cleanup {
7371	7372	destroy .t
7372	7373	} -result {1}

+72

-55

tests/textDisp.test less more

5	5	# Copyright (c) 1998-1999 by Scriptics Corporation.
6	6	# All rights reserved.
7	7
8		package require tcltest 2.1
	8	package require tcltest 2.2
9	9	eval tcltest::configure $argv
10	10	tcltest::loadTestedCommands
11	11	namespace import -force tcltest::test
12	12
	13	testConstraint failsOnUbuntu [expr {![info exists ::env(CI)] \|\| ![string match Linux $::tcl_platform(os)]}]
	14	testConstraint failsOnXQuarz [expr {$tcl_platform(os) ne "Darwin" \|\| [tk windowingsystem] ne "x11" }]
	15
13	16	# Platform specific procedure for updating the text widget.
14	17
15	18	if {[tk windowingsystem] == "aqua"} {
16	19	proc updateText {} {
17	20	update idletasks
18	21	}
	22	proc delay {} {
	23	update idletasks
	24	after 100
	25	update idletasks
	26	}
19	27	} else {
20	28	proc updateText {} {
	29	update
	30	}
	31	proc delay {} {
	32	update
	33	after 100
21	34	update
22	35	}
23	36	}

266	279	.t insert 1.0 "This isx some sample text for testing."
267	280	list [.t bbox 1.13] [.t bbox 1.19] [.t bbox 1.20] [.t bbox 1.21]
268	281	} [list [list 96 5 $fixedWidth $fixedHeight] [list 138 5 $fixedWidth $fixedHeight] [list 145 5 0 $fixedHeight] [list 5 [expr {$fixedDiff + 18}] $fixedWidth $fixedHeight]]
269		test textDisp-2.6 {LayoutDLine, word wrap} {
	282	test textDisp-2.6 {LayoutDLine, word wrap} failsOnUbuntu {
270	283	.t configure -wrap word
271	284	.t delete 1.0 end
272	285	.t insert 1.0 "This isxxx some sample text for testing."

601	614	test textDisp-4.6 {UpdateDisplayInfo, tiny window} {
602	615	# This test was failing on Windows because the title bar on .
603	616	# was a certain minimum size and it was interfering with the size
604		# requested. The "overrideredirect" gets rid of the titlebar so
	617	# requested. The "overrideredirect" gets rid of the titlebar so
605	618	# the toplevel can shrink to the appropriate size. On Unix, setting
606	619	# the overrideredirect on "." confuses the window manager and
607	620	# causes subsequent tests to fail.

633	646	test textDisp-4.7 {UpdateDisplayInfo, filling in extra vertical space} {
634	647	# This test was failing on Windows because the title bar on .
635	648	# was a certain minimum size and it was interfering with the size
636		# requested. The "overrideredirect" gets rid of the titlebar so
	649	# requested. The "overrideredirect" gets rid of the titlebar so
637	650	# the toplevel can shrink to the appropriate size. On Unix, setting
638	651	# the overrideredirect on "." confuses the window manager and
639	652	# causes subsequent tests to fail.

652	665	updateText
653	666	set x
654	667	} {8.0 {16.0 17.0 15.0 14.0 13.0 12.0 11.0 10.0 9.0 8.0} {8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0}}
655		test textDisp-4.8 {UpdateDisplayInfo, filling in extra vertical space} {
	668	test textDisp-4.8 {UpdateDisplayInfo, filling in extra vertical space} failsOnXQuarz {
656	669	.t delete 1.0 end
657	670	.t insert end "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17"
658	671	.t yview 16.0

715	728	updateText
716	729	list $tk_textRelayout $tk_textRedraw
717	730	} {{11.0 12.0 13.0} {4.0 10.0 11.0 12.0 13.0}}
718		test textDisp-4.14 {UpdateDisplayInfo, special handling for top/bottom lines} {
	731	test textDisp-4.14 {UpdateDisplayInfo, special handling for top/bottom lines} failsOnXQuarz {
719	732	.t tag remove x 1.0 end
720	733	.t yview 1.0
721	734	updateText

848	861	} [list 30 30]
849	862
850	863	.t configure -wrap char
851		test textDisp-6.1 {scrolling in DisplayText, scroll up} {
	864	test textDisp-6.1 {scrolling in DisplayText, scroll up} failsOnXQuarz {
852	865	.t delete 1.0 end
853	866	.t insert 1.0 "Line 1"
854	867	foreach i {2 3 4 5 6 7 8 9 10 11 12 13 14 15} {

1136	1149	updateText
1137	1150	list $tk_textRelayout $tk_textRedraw
1138	1151	} {{1.0 1.20 1.40} {1.0 1.20 1.40}}
1139		test textDisp-8.7 {TkTextChanged} {
	1152	test textDisp-8.7 {TkTextChanged} failsOnXQuarz {
1140	1153	.t delete 1.0 end
1141	1154	.t insert 1.0 "Line 1 is so long that it wraps around, two times"
1142	1155	foreach i {2 3 4 5 6 7 8 9 10 11 12 13 14 15} {

1158	1171	updateText
1159	1172	list $tk_textRelayout $tk_textRedraw
1160	1173	} {2.0 2.0}
1161		test textDisp-8.9 {TkTextChanged} {
	1174	test textDisp-8.9 {TkTextChanged} failsOnXQuarz {
1162	1175	.t delete 1.0 end
1163	1176	.t insert 1.0 "Line 1 is so long that it wraps around, two times"
1164	1177	foreach i {2 3 4 5 6 7 8 9 10 11 12 13 14 15} {

1169	1182	updateText
1170	1183	list $tk_textRelayout $tk_textRedraw
1171	1184	} {{2.0 8.0} {2.0 8.0}}
1172		test textDisp-8.10 {TkTextChanged} {
	1185	test textDisp-8.10 {TkTextChanged} failsOnUbuntu {
1173	1186	.t configure -wrap char
1174	1187	.t delete 1.0 end
1175	1188	.t insert 1.0 "Line 1\nLine 2 is long enough to wrap\nLine 3 is also long enough to wrap\nLine 4"

1229	1242	update idletasks
1230	1243	} {}
1231	1244
1232		test textDisp-9.1 {TkTextRedrawTag} {
	1245	test textDisp-9.1 {TkTextRedrawTag} failsOnUbuntu {
1233	1246	.t configure -wrap char
1234	1247	.t delete 1.0 end
1235	1248	.t insert 1.0 "Line 1\nLine 2 is long enough to wrap around\nLine 3\nLine 4"

1247	1260	updateText
1248	1261	list $tk_textRelayout $tk_textRedraw
1249	1262	} {{1.0 2.0 2.17} {1.0 2.0 2.17}}
1250		test textDisp-9.3 {TkTextRedrawTag} {
	1263	test textDisp-9.3 {TkTextRedrawTag} failsOnUbuntu {
1251	1264	.t configure -wrap char
1252	1265	.t delete 1.0 end
1253	1266	.t insert 1.0 "Line 1\nLine 2 is long enough to wrap around\nLine 3\nLine 4"

1258	1271	updateText
1259	1272	list $tk_textRelayout $tk_textRedraw
1260	1273	} {{2.0 2.20} {2.0 2.20 eof}}
1261		test textDisp-9.4 {TkTextRedrawTag} {
	1274	test textDisp-9.4 {TkTextRedrawTag} failsOnUbuntu {
1262	1275	.t configure -wrap char
1263	1276	.t delete 1.0 end
1264	1277	.t insert 1.0 "Line 1\nLine 2 is long enough to wrap around\nLine 3\nLine 4"

1269	1282	updateText
1270	1283	list $tk_textRelayout $tk_textRedraw
1271	1284	} {{2.0 2.20} {2.0 2.20 eof}}
1272		test textDisp-9.5 {TkTextRedrawTag} {
	1285	test textDisp-9.5 {TkTextRedrawTag} {failsOnUbuntu failsOnXQuarz} {
1273	1286	.t configure -wrap char
1274	1287	.t delete 1.0 end
1275	1288	.t insert 1.0 "Line 1\nLine 2 is long enough to wrap around\nLine 3\nLine 4"

1280	1293	updateText
1281	1294	list $tk_textRelayout $tk_textRedraw
1282	1295	} {{2.0 2.20} {2.0 2.20 eof}}
1283		test textDisp-9.6 {TkTextRedrawTag} {
	1296	test textDisp-9.6 {TkTextRedrawTag} failsOnUbuntu {
1284	1297	.t configure -wrap char
1285	1298	.t delete 1.0 end
1286	1299	.t insert 1.0 "Line 1\nLine 2 is long enough to wrap\nLine 3 is also long enough to wrap"

1291	1304	updateText
1292	1305	list $tk_textRelayout $tk_textRedraw
1293	1306	} {{2.0 2.20 3.0 3.20} {2.0 2.20 3.0 3.20 eof}}
1294		test textDisp-9.7 {TkTextRedrawTag} {
	1307	test textDisp-9.7 {TkTextRedrawTag} failsOnUbuntu {
1295	1308	.t configure -wrap char
1296	1309	.t delete 1.0 end
1297	1310	.t insert 1.0 "Line 1\nLine 2 is long enough to wrap\nLine 3 is also long enough to wrap\nLine 4"

1431	1444	updateText
1432	1445	.t index @0,0
1433	1446	} {30.0}
1434		test textDisp-11.2 {TkTextSetYView} {
	1447	test textDisp-11.2 {TkTextSetYView} failsOnXQuarz {
1435	1448	.t yview 30.0
1436	1449	updateText
1437	1450	.t yview 32.0

1445	1458	updateText
1446	1459	list [.t index @0,0] $tk_textRedraw
1447	1460	} {28.0 {28.0 29.0}}
1448		test textDisp-11.4 {TkTextSetYView} {
	1461	test textDisp-11.4 {TkTextSetYView} failsOnXQuarz {
1449	1462	.t yview 30.0
1450	1463	updateText
1451	1464	.t yview 31.4

1476	1489	updateText
1477	1490	list [.t index @0,0] $tk_textRedraw
1478	1491	} {21.0 {21.0 22.0 23.0 24.0 25.0 26.0 27.0 28.0 29.0}}
1479		test textDisp-11.8 {TkTextSetYView} {
	1492	test textDisp-11.8 {TkTextSetYView} failsOnXQuarz {
1480	1493	.t yview 30.0
1481	1494	updateText
1482	1495	set tk_textRedraw {}

1484	1497	updateText
1485	1498	list [.t index @0,0] $tk_textRedraw
1486	1499	} {32.0 {40.0 41.0}}
1487		test textDisp-11.9 {TkTextSetYView} {
	1500	test textDisp-11.9 {TkTextSetYView} failsOnXQuarz {
1488	1501	.t yview 30.0
1489	1502	updateText
1490	1503	set tk_textRedraw {}

1508	1521	updateText
1509	1522	list [.t index @0,0] $tk_textRedraw
1510	1523	} {191.0 {191.0 192.0 193.0 194.0 195.0 196.0}}
1511		test textDisp-11.12 {TkTextSetYView, wrapped line is off-screen} {
	1524	test textDisp-11.12 {TkTextSetYView, wrapped line is off-screen} failsOnXQuarz {
1512	1525	.t insert 10.0 "Long line with enough text to wrap\n"
1513	1526	.t yview 1.0
1514	1527	updateText

1849	1862	test textDisp-14.6 {TkTextXviewCmd procedure} {
1850	1863	list [catch {.t xview moveto a} msg] $msg
1851	1864	} {1 {expected floating-point number but got "a"}}
1852		test textDisp-14.7 {TkTextXviewCmd procedure} {
	1865	test textDisp-14.7 {TkTextXviewCmd procedure} failsOnUbuntu {
1853	1866	.t delete 1.0 end
1854	1867	.t insert end xxxxxxxxx\n
1855	1868	.t insert end "xxxxx xxxxxxxxxxx xxxx xxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxx\n"

1901	1914	.t insert end "a0 a1 a2 a3 a4 a5 a6 a7 a8 a9 b0 b1 b2 b3 b4 b5 b6 b7 b8 b9 c0 c1 c2 c3 c4 c5 c6 c7 c8 c9 c0 c1 c2 c3 c4 c5 c6 c7 c8 c9\n"
1902	1915	.t insert end "xxxx xxxxxxxxx xxxxxxxxxxxxx"
1903	1916	.t xview moveto 0
1904		.t xview scroll 21 u
	1917	.t xview scroll 21 u
1905	1918	set x [.t index @0,22]
1906	1919	.t xview scroll -1 u
1907	1920	lappend x [.t index @0,22]

2049	2062	test textDisp-16.10 {TkTextYviewCmd procedure, "moveto" option} {
2050	2063	list [catch {.t yview moveto gorp} msg] $msg
2051	2064	} {1 {expected floating-point number but got "gorp"}}
2052		test textDisp-16.11 {TkTextYviewCmd procedure, "moveto" option} {
	2065	test textDisp-16.11 {TkTextYviewCmd procedure, "moveto" option} failsOnUbuntu {
2053	2066	.t yview moveto 0.5
2054	2067	.t index @0,0
2055	2068	} {103.0}

2061	2074	.t yview moveto 1.1
2062	2075	.t index @0,0
2063	2076	} {191.0}
2064		test textDisp-16.14 {TkTextYviewCmd procedure, "moveto" option} {
	2077	test textDisp-16.14 {TkTextYviewCmd procedure, "moveto" option} failsOnUbuntu {
2065	2078	.t yview moveto .75
2066	2079	.t index @0,0
2067	2080	} {151.60}
2068		test textDisp-16.15 {TkTextYviewCmd procedure, "moveto" option} {
	2081	test textDisp-16.15 {TkTextYviewCmd procedure, "moveto" option} failsOnUbuntu {
2069	2082	.t yview moveto .752
2070	2083	.t index @0,0
2071	2084	} {151.60}
2072		test textDisp-16.16 {TkTextYviewCmd procedure, "moveto" option} {textfonts} {
	2085	test textDisp-16.16 {TkTextYviewCmd procedure, "moveto" option} textfonts {
2073	2086	set count [expr {5 * $bigHeight + 150 * $fixedHeight}]
2074	2087	set extra [expr {0.04 * double($fixedDiff * 150) / double($count)}]
2075	2088	.t yview moveto [expr {.753 - $extra}]
2076	2089	.t index @0,0
2077	2090	} {151.60}
2078		test textDisp-16.17 {TkTextYviewCmd procedure, "moveto" option} {
	2091	test textDisp-16.17 {TkTextYviewCmd procedure, "moveto" option} failsOnUbuntu {
2079	2092	.t yview moveto .755
2080	2093	.t index @0,0
2081	2094	} {151.80}

2239	2252	test textDisp-16.39 {TkTextYviewCmd procedure} {
2240	2253	list [catch {.t yview scroll 1.3i pixels} msg] $msg
2241	2254	} {0 {}}
2242		test textDisp-16.40 {text count -xpixels} {
	2255	test textDisp-16.40 {text count -xpixels} failsOnUbuntu {
2243	2256	set res {}
2244	2257	lappend res [.t count -xpixels 1.0 1.5] \
2245	2258	[.t count -xpixels 1.5 1.0] \

2358	2371	.t xview moveto 0
2359	2372	.t scan mark 0 60
2360	2373	.t scan dragto 30 100
2361		.t scan dragto 25 95
	2374	.t scan dragto 25 95
2362	2375	.t index @0,0
2363	2376	} {4.7}
2364	2377	test textDisp-17.9 {TkTextScanCmd procedure} {textfonts} {

2553	2566	updateText
2554	2567	set x $scrollInfo
2555	2568	} {0.125 0.75}
2556		test textDisp-19.8 {GetYView procedure} {
	2569	test textDisp-19.8 {GetYView procedure} failsOnUbuntu {
2557	2570	.t configure -wrap char
2558	2571	.t delete 1.0 end
2559	2572	.t insert 1.0 "Line 1"

2850	2863	[.t count -ypixels 16.0 "16.0 displaylineend +1c"] \
2851	2864	[.t count -ypixels "16.0 +1 displaylines" "16.0 +4 displaylines +3c"]
2852	2865	} [list [expr {260 + 20 * $fixedDiff}] [expr {260 + 20 * $fixedDiff}] $fixedHeight [expr {2$fixedHeight}] $fixedHeight [expr {3$fixedHeight}]]
2853		test textDisp-19.17 {count -ypixels with indices in elided lines} {
	2866	test textDisp-19.17 {count -ypixels with indices in elided lines} {failsOnUbuntu failsOnXQuarz} {
2854	2867	.t configure -wrap none
2855	2868	.t delete 1.0 end
2856	2869	for {set i 1} {$i < 100} {incr i} {

2877	2890	.t yview 35.0
2878	2891	lappend res [.t count -ypixels 5.0 25.0]
2879	2892	} [list [expr {4 * $fixedHeight}] [expr {3 * $fixedHeight}] 0 0 0 0 0 0 [expr {5 * $fixedHeight}] [expr {- 5 * $fixedHeight}] [expr {2 * $fixedHeight}] [expr {3 * $fixedHeight}] [expr {5 * $fixedHeight}]]
2880		test textDisp-19.18 {count -ypixels with indices in elided lines} {
	2893	test textDisp-19.18 {count -ypixels with indices in elided lines} {failsOnUbuntu failsOnXQuarz} {
2881	2894	.t configure -wrap none
2882	2895	.t delete 1.0 end
2883	2896	for {set i 1} {$i < 100} {incr i} {

2915	2928	.t configure -wrap word
2916	2929	.t delete 50.0 51.0
2917	2930	.t insert 50.0 "This is a long line, one that will wrap around twice.\n"
2918		test textDisp-20.1 {FindDLine} {
	2931	test textDisp-20.1 {FindDLine} failsOnUbuntu {
2919	2932	.t yview 48.0
2920	2933	list [.t dlineinfo 46.0] [.t dlineinfo 47.0] [.t dlineinfo 49.0] \
2921	2934	[.t dlineinfo 58.0]
2922	2935	} [list {} {} [list 3 [expr {$fixedDiff + 16}] 49 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] {}]
2923		test textDisp-20.2 {FindDLine} {
	2936	test textDisp-20.2 {FindDLine} failsOnUbuntu {
2924	2937	.t yview 100.0
2925	2938	.t yview -pickplace 53.0
2926	2939	list [.t dlineinfo 50.0] [.t dlineinfo 50.14] [.t dlineinfo 50.21]
2927	2940	} [list [list 3 [expr {-1 - $fixedDiff/2}] 140 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] [list 3 [expr {-1 - $fixedDiff/2}] 140 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] [list 3 [expr {12 + $fixedDiff/2}] 133 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]]]
2928		test textDisp-20.3 {FindDLine} {
	2941	test textDisp-20.3 {FindDLine} failsOnUbuntu {
2929	2942	.t yview 100.0
2930	2943	.t yview 49.0
2931	2944	list [.t dlineinfo 50.0] [.t dlineinfo 50.24] [.t dlineinfo 57.0]
2932	2945	} [list [list 3 [expr {$fixedDiff + 16}] 140 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] [list 3 [expr {2*$fixedDiff + 29}] 133 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] {}]
2933		test textDisp-20.4 {FindDLine} {
	2946	test textDisp-20.4 {FindDLine} failsOnUbuntu {
2934	2947	.t yview 100.0
2935	2948	.t yview 42.0
2936	2949	list [.t dlineinfo 50.0] [.t dlineinfo 50.24] [.t dlineinfo 50.40]
2937	2950	} [list [list 3 [expr {8$fixedDiff + 107}] 140 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] [list 3 [expr {9$fixedDiff + 120}] 133 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] {}]
2938	2951	.t config -wrap none
2939		test textDisp-20.5 {FindDLine} {
	2952	test textDisp-20.5 {FindDLine} failsOnUbuntu {
2940	2953	.t yview 100.0
2941	2954	.t yview 48.0
2942	2955	list [.t dlineinfo 50.0] [.t dlineinfo 50.20] [.t dlineinfo 50.40]

2969	2982	Use the Up (cursor) key to scroll up one line at a time. At the second press, the cursor either gets locked or jumps several lines.
2970	2983
2971	2984	Connect with Tkcon. The command
2972		.u count -displaylines \
	2985	.u count -displaylines \
2973	2986	3.10 2.173
2974	2987	should give answer -1; it gives me 5.
2975	2988

3394	3407	.t tag add x 1.0 end
3395	3408	list [.t bbox 1.0] [.t bbox 1.10]
3396	3409	} [list [list 45 3 7 $fixedHeight] [list 94 3 7 $fixedHeight]]
3397		test textDisp-24.25 {TkTextCharLayoutProc, justification and tabs} -constraints {textfonts} -setup {
	3410	test textDisp-24.25 {TkTextCharLayoutProc, justification and tabs} -constraints {textfonts failsOnXQuarz} -setup {
3398	3411	text .tt -tabs {40 right} -wrap none -font $fixedFont
3399	3412	pack .tt
3400	3413	} -body {

3873	3886	set iWidth [lindex [.t2.t bbox end-2c] 2]
3874	3887	.t2.t xview scroll 2 units
3875	3888	set iWidth2 [lindex [.t2.t bbox end-2c] 2]
3876
	3889
3877	3890	if {($iWidth == $iWidth2) && $iWidth >= 2} {
3878	3891	set result "correct"
3879	3892	} else {

3916	3929	.t configure -height 1
3917	3930	updateText
3918	3931
3919		test textDisp-31.1 {line embedded window height update} {
	3932	test textDisp-31.1 {line embedded window height update} failsOnUbuntu {
3920	3933	set res {}
3921	3934	.t delete 1.0 end
3922	3935	.t insert end "abcd\nefgh\nijkl\nmnop\nqrst\nuvwx\nyx"

3929	3942	set res
3930	3943	} [list [expr {100 + $fixedHeight * 6}] [expr {100 + $fixedHeight * 6}] [expr {$fixedHeight * 7}]]
3931	3944
3932		test textDisp-31.2 {line update index shifting} {
	3945	test textDisp-31.2 {line update index shifting} failsOnUbuntu {
3933	3946	set res {}
3934	3947	.t.f configure -height 100
3935	3948	updateText

3946	3959	set res
3947	3960	} [list [expr {100 + $fixedHeight * 6}] [expr {100 + $fixedHeight * 8}] [expr {$fixedHeight * 9}] [expr {$fixedHeight * 7}] [expr {100 + $fixedHeight * 6}]]
3948	3961
3949		test textDisp-31.3 {line update index shifting} {
	3962	test textDisp-31.3 {line update index shifting} failsOnUbuntu {
3950	3963	# Should do exactly the same as the above, as long
3951	3964	# as we are correctly tagging the correct lines for
3952	3965	# recalculation. The 'update' and 'delay' must be

3960	3973	.t insert 1.0 "abc\n"
3961	3974	.t insert 1.0 "abc\n"
3962	3975	lappend res [.t count -ypixels 1.0 end]
3963		update ; after 1000 ; update
	3976	delay
3964	3977	lappend res [.t count -ypixels 1.0 end]
3965	3978	.t.f configure -height 100
3966	3979	.t delete 1.0 3.0
3967	3980	lappend res [.t count -ypixels 1.0 end]
3968		update ; after 1000 ; update
	3981	delay
3969	3982	lappend res [.t count -ypixels 1.0 end]
3970	3983	set res
3971	3984	} [list [expr {100 + $fixedHeight * 6}] [expr {100 + $fixedHeight * 8}] [expr {$fixedHeight * 9}] [expr {$fixedHeight * 7}] [expr {100 + $fixedHeight * 6}]]

3983	3996	set res
3984	3997	} [list [expr {100 + $fixedHeight * 6}] [expr {100 + $fixedHeight * 6}] [expr {$fixedHeight * 7}]]
3985	3998
3986		test textDisp-31.5 {line update index shifting} {
	3999	test textDisp-31.5 {line update index shifting} failsOnUbuntu {
3987	4000	set res {}
3988	4001	textest configure -height 100
3989	4002	updateText

4000	4013	set res
4001	4014	} [list [expr {100 + $fixedHeight * 6}] [expr {100 + $fixedHeight * 8}] [expr {$fixedHeight * 9}] [expr {$fixedHeight * 7}] [expr {100 + $fixedHeight * 6}]]
4002	4015
4003		test textDisp-31.6 {line update index shifting} {
	4016	test textDisp-31.6 {line update index shifting} failsOnUbuntu {
4004	4017	# Should do exactly the same as the above, as long
4005	4018	# as we are correctly tagging the correct lines for
4006	4019	# recalculation. The 'update' and 'delay' must be

4013	4026	.t insert 1.0 "abc\n"
4014	4027	.t insert 1.0 "abc\n"
4015	4028	lappend res [.t count -ypixels 1.0 end]
4016		update ; after 1000 ; update
	4029	delay
4017	4030	lappend res [.t count -ypixels 1.0 end]
4018	4031	textest configure -height 100
4019	4032	.t delete 1.0 3.0
4020	4033	lappend res [.t count -ypixels 1.0 end]
4021		update ; after 1000 ; update
	4034	delay
4022	4035	lappend res [.t count -ypixels 1.0 end]
4023	4036	set res
4024	4037	} [list [expr {100 + $fixedHeight * 6}] [expr {100 + $fixedHeight * 8}] [expr {$fixedHeight * 9}] [expr {$fixedHeight * 7}] [expr {100 + $fixedHeight * 6}]]

4035	4048	.t tag configure elide -elide 1
4036	4049	.t tag add elide 1.3 2.1
4037	4050	lappend res [.t count -ypixels 1.0 end]
4038		update ; after 1000 ; update
	4051	delay
4039	4052	lappend res [.t count -ypixels 1.0 end]
4040	4053	.t delete 1.0 3.0
4041	4054	lappend res [.t count -ypixels 1.0 end]
4042		update ; after 1000 ; update
	4055	delay
4043	4056	lappend res [.t count -ypixels 1.0 end]
4044	4057	set res
4045	4058	} [list [expr {$fixedHeight * 1}] [expr {$fixedHeight * 3}] [expr {$fixedHeight * 3}] [expr {$fixedHeight * 2}] [expr {$fixedHeight * 1}] [expr {$fixedHeight * 1}]]

4174	4187
4175	4188	test textDisp-33.0 {one line longer than fits in the widget} {
4176	4189	pack [text .tt -wrap char]
	4190	updateText
4177	4191	.tt insert 1.0 [string repeat "more wrap + " 300]
4178	4192	updateText
4179	4193	.tt see 1.0

4182	4196	test textDisp-33.1 {one line longer than fits in the widget} {
4183	4197	destroy .tt
4184	4198	pack [text .tt -wrap char]
	4199	updateText
4185	4200	.tt insert 1.0 [string repeat "more wrap + " 300]
4186	4201	updateText
4187	4202	.tt yview "1.0 +1 displaylines"

4195	4210	destroy .tt
4196	4211	pack [text .tt -wrap char]
4197	4212	.tt debug 1
	4213	updateText
4198	4214	set tk_textHeightCalc ""
	4215	set timer [after 200 lappend tk_textHeightCalc "Timed out"]
4199	4216	.tt insert 1.0 [string repeat "more wrap + " 1]
4200		after 100 ; update idletasks
4201		# Nothing should have been recalculated.
	4217	vwait tk_textHeightCalc
	4218	after cancel $timer
4202	4219	set tk_textHeightCalc
4203		} {}
	4220	} {1.0}
4204	4221	test textDisp-33.3 {one line longer than fits in the widget} {
4205	4222	destroy .tt
4206	4223	pack [text .tt -wrap char]

+7

-7

tests/textImage.test less more

73	73	} -body {
74	74	text .t -font test_font -bd 0 -highlightthickness 0 -padx 0 -pady 0
75	75	pack .t
76		.t image configure
	76	.t image configure
77	77	} -cleanup {
78	78	destroy .t
79	79	} -returnCodes error -result {wrong # args: should be ".t image configure index ?-option value ...?"}

83	83	} -body {
84	84	text .t -font test_font -bd 0 -highlightthickness 0 -padx 0 -pady 0
85	85	pack .t
86		.t image configure blurf
	86	.t image configure blurf
87	87	} -cleanup {
88	88	destroy .t
89	89	} -returnCodes error -result {bad text index "blurf"}

93	93	} -body {
94	94	text .t -font test_font -bd 0 -highlightthickness 0 -padx 0 -pady 0
95	95	pack .t
96		.t image configure 1.1
	96	.t image configure 1.1
97	97	} -cleanup {
98	98	destroy .t
99	99	} -returnCodes error -result {no embedded image at index "1.1"}

113	113	} -body {
114	114	text .t -font test_font -bd 0 -highlightthickness 0 -padx 0 -pady 0
115	115	pack .t
116		.t image create blurf
	116	.t image create blurf
117	117	} -cleanup {
118	118	destroy .t
119	119	} -returnCodes error -result {bad text index "blurf"}

220	220	.t image create end -image small
221	221	foreach i {align padx pady image name} {
222	222	lappend result $i:[.t image cget small -$i]
223		}
	223	}
224	224	return $result
225	225	} -cleanup {
226	226	destroy .t

242	242	.t image create end -image small
243	243	foreach {option value} {align top padx 5 pady 7 image large name none} {
244	244	.t image configure small -$option $value
245		}
	245	}
246	246	update
247	247	.t image configure small
248	248	} -cleanup {

308	308	vary configure -width $i -height $i
309	309	update
310	310	lappend result $i:[.t bbox vary]
311		}
	311	}
312	312	return $result
313	313	} -cleanup {
314	314	destroy .t

+12

-12

tests/textIndex.test less more

5	5	# Copyright (c) 1998-1999 by Scriptics Corporation.
6	6	# All rights reserved.
7	7
8		package require tcltest 2.1
	8	package require tcltest 2.2
9	9	eval tcltest::configure $argv
10	10	tcltest::loadTestedCommands
11	11	namespace import -force tcltest::test

16	16	update
17	17	.t debug on
18	18	wm geometry . {}
19
	19
20	20	# The statements below reset the main window; it's needed if the window
21	21	# manager is mwm to make mwm forget about a previous minimum size setting.
22	22

73	73	testtext .t byteindex 3 80
74	74	} {3.5 5}
75	75	test textIndex-1.10 {TkTextMakeByteIndex: verify index is in range} {testtext} {
76		# for (segPtr = indexPtr->linePtr->segPtr; ; segPtr = segPtr->nextPtr)
	76	# for (segPtr = indexPtr->linePtr->segPtr; ; segPtr = segPtr->nextPtr)
77	77	# one segment
78	78
79	79	testtext .t byteindex 3 5

83	83	# index += segPtr->size
84	84	# Multiple segments, make sure add segment size to index.
85	85
86		.t mark set foo 3.2
	86	.t mark set foo 3.2
87	87	set x [testtext .t byteindex 3 7]
88	88	.t mark unset foo
89	89	set x

116	116	} {5.18 20}
117	117	test textIndex-1.17 {TkTextMakeByteIndex: prevent splitting UTF-8 character} \
118	118	{testtext} {
119		# ((byteIndex > index) && (segPtr->typePtr == &tkTextCharType))
	119	# ((byteIndex > index) && (segPtr->typePtr == &tkTextCharType))
120	120	# Wrong answer would be \xb9 (the 2nd byte of UTF rep of 0x4e4f).
121	121
122	122	set x [testtext .t byteindex 5 2]

124	124	} {{5.2 4} y}
125	125	test textIndex-1.18 {TkTextMakeByteIndex: prevent splitting UTF-8 character} \
126	126	{testtext} {
127		# ((byteIndex > index) && (segPtr->typePtr == &tkTextCharType))
	127	# ((byteIndex > index) && (segPtr->typePtr == &tkTextCharType))
128	128	testtext .t byteindex 5 1
129	129	.t get insert
130	130	} "\u4e4f"

167	167	# for (segPtr = indexPtr->linePtr->segPtr; ; segPtr = segPtr->nextPtr)
168	168	# Multiple segments, make sure add segment size to index.
169	169
170		.t mark set foo 3.2
	170	.t mark set foo 3.2
171	171	set x [.t index 3.7]
172	172	.t mark unset foo
173	173	set x

438	438	test textIndex-12.6 {TkTextIndexForwChars: find index} {
439	439	# for ( ; segPtr != NULL; segPtr = segPtr->nextPtr)
440	440	# border condition: segPtr == NULL -> beginning of next line
441
	441
442	442	.t index {2.3 + 11 chars}
443	443	} 3.0
444	444	test textIndex-12.7 {TkTextIndexForwChars: find index} {

457	457	.t image create 2.4 -image textimage
458	458	set x [.t get {2.3 + 3 chars}]
459	459	.t delete 2.4
460		set x
	460	set x
461	461	} "f"
462	462	test textIndex-12.10 {TkTextIndexForwChars: find index} {
463	463	# dstPtr->byteIndex += segPtr->size - byteOffset

587	587	set x
588	588	} 2.9
589	589	test textIndex-14.12 {TkTextIndexBackChars: move to previous line} {
590		# (lineIndex == 0)
	590	# (lineIndex == 0)
591	591	.t index {1.5 - 10 chars}
592	592	} 1.0
593	593	test textIndex-14.13 {TkTextIndexBackChars: move to previous line} {
594		# not (lineIndex == 0)
	594	# not (lineIndex == 0)
595	595	.t index {2.5 - 10 chars}
596	596	} 1.2
597	597	test textIndex-14.14 {TkTextIndexBackChars: move to previous line} {

811	811	} {1}
812	812
813	813	test textIndex-19.13 {Display lines} {
814		destroy {*}[pack slaves .]
	814	destroy {*}[pack content .]
815	815	text .txt -height 1 -wrap word -yscroll ".sbar set" -width 400
816	816	scrollbar .sbar -command ".txt yview"
817	817	grid .txt .sbar -sticky news

+1

-1

tests/textMark.test less more

26	26	bOy GIrl .#@? x_yz
27	27	!@#$%
28	28	Line 7"
29
	29
30	30	# The statements below reset the main window; it's needed if the window
31	31	# manager is mwm to make mwm forget about a previous minimum size setting.
32	32

+142

-128

tests/textTag.test less more

10	10	eval tcltest::configure $argv
11	11	tcltest::loadTestedCommands
12	12
	13	testConstraint failsOnUbuntu [expr {![info exists ::env(CI)] \|\| ![string match Linux $::tcl_platform(os)]}]
	14	testConstraint failsOnUbuntuNoXft [expr {[testConstraint failsOnUbuntu] \|\| (![catch {tk::pkgconfig get fontsystem} fs] && ($fs eq "xft"))}]
	15
13	16	destroy .t
14	17	text .t -width 20 -height 10
15	18	testConstraint haveCourier12 [expr {[catch {

22	25
23	26	wm geometry . {}
24	27	set bigFont {Helvetica 24}
25
	28
26	29	# The statements below reset the main window; it's needed if the window
27	30	# manager is mwm, to make mwm forget about a previous minimum size setting.
28	31

371	374
372	375
373	376	test textTag-2.1 {TkTextTagCmd - "add" option} -constraints {
374		haveCourier12
	377	haveCourier12
375	378	} -body {
376	379	.t tag
377	380	} -returnCodes error -result {wrong # args: should be ".t tag option ?arg ...?"}
378	381	test textTag-2.2 {TkTextTagCmd - "add" option} -constraints {
379		haveCourier12
	382	haveCourier12
380	383	} -body {
381	384	.t tag gorp
382	385	} -returnCodes error -result {bad tag option "gorp": must be add, bind, cget, configure, delete, lower, names, nextrange, prevrange, raise, ranges, or remove}
383	386	test textTag-2.3 {TkTextTagCmd - "add" option} -constraints {
384		haveCourier12
	387	haveCourier12
385	388	} -body {
386	389	.t tag add foo
387	390	} -returnCodes error -result {wrong # args: should be ".t tag add tagName index1 ?index2 index1 index2 ...?"}
388	391	test textTag-2.4 {TkTextTagCmd - "add" option} -constraints {
389		haveCourier12
	392	haveCourier12
390	393	} -body {
391	394	.t tag add x gorp
392	395	} -returnCodes error -result {bad text index "gorp"}
393	396	test textTag-2.5 {TkTextTagCmd - "add" option} -constraints {
394		haveCourier12
	397	haveCourier12
395	398	} -body {
396	399	.t tag add x 1.2 gorp
397	400	} -returnCodes error -result {bad text index "gorp"}
398	401	test textTag-2.6 {TkTextTagCmd - "add" option} -constraints {
399		haveCourier12
	402	haveCourier12
400	403	} -setup {
401	404	.t tag delete sel
402	405	} -body {

405	408	.t tag ranges sel
406	409	} -result {3.2 3.4}
407	410	test textTag-2.7 {TkTextTagCmd - "add" option} -constraints {
408		haveCourier12
	411	haveCourier12
409	412	} -setup {
410	413	.t tag delete x
411	414	} -body {

415	418	.t tag delete x
416	419	} -result {1.0 1.6}
417	420	test textTag-2.8 {TkTextTagCmd - "add" option} -constraints {
418		haveCourier12
	421	haveCourier12
419	422	} -setup {
420	423	.t tag remove x 1.0 end
421	424	} -body {

425	428	.t tag delete x
426	429	} -result {1.2 1.3}
427	430	test textTag-2.9 {TkTextTagCmd - "add" option} -constraints {
428		haveCourier12
	431	haveCourier12
429	432	} -setup {
430	433	destroy .t.e
431	434	} -body {

439	442	destroy .t.e
440	443	} -result 34
441	444	test textTag-2.10 {TkTextTagCmd - "add" option} -constraints {
442		haveCourier12
	445	haveCourier12
443	446	} -setup {
444	447	destroy .t.e
445	448	} -body {

454	457	destroy .t.e
455	458	} -result {Text}
456	459	test textTag-2.11 {TkTextTagCmd - "add" option} -constraints {
457		haveCourier12
	460	haveCourier12
458	461	} -body {
459	462	.t tag remove sel 1.0 end
460	463	.t tag add sel 1.1 1.5 2.4 3.1 4.2 4.4
461	464	.t tag ranges sel
462	465	} -result {1.1 1.5 2.4 3.1 4.2 4.4}
463	466	test textTag-2.12 {TkTextTagCmd - "add" option} -constraints {
464		haveCourier12
	467	haveCourier12
465	468	} -body {
466	469	.t tag remove sel 1.0 end
467	470	.t tag add sel 1.1 1.5 2.4

485	488
486	489
487	490	test textTag-3.1 {TkTextTagCmd - "bind" option} -constraints {
488		haveCourier12
	491	haveCourier12
489	492	} -body {
490	493	.t tag bind
491	494	} -returnCodes error -result {wrong # args: should be ".t tag bind tagName ?sequence? ?command?"}
492	495	test textTag-3.2 {TkTextTagCmd - "bind" option} -constraints {
493		haveCourier12
	496	haveCourier12
494	497	} -body {
495	498	.t tag bind 1 2 3 4
496	499	} -returnCodes error -result {wrong # args: should be ".t tag bind tagName ?sequence? ?command?"}
497	500	test textTag-3.3 {TkTextTagCmd - "bind" option} -constraints {
498		haveCourier12
	501	haveCourier12
499	502	} -body {
500	503	.t tag bind x <Enter> script1
501	504	.t tag bind x <Enter>

503	506	.t tag delete x
504	507	} -result {script1}
505	508	test textTag-3.4 {TkTextTagCmd - "bind" option} -constraints {
506		haveCourier12
	509	haveCourier12
507	510	} -body {
508	511	.t tag bind x <Gorp> script2
509	512	} -returnCodes error -result {bad event type or keysym "Gorp"}
510	513	test textTag-3.5 {TkTextTagCmd - "bind" option} -constraints {
511		haveCourier12
	514	haveCourier12
512	515	} -body {
513	516	.t tag delete x
514	517	.t tag bind x <Enter> script1

517	520	.t tag delete x
518	521	} -returnCodes error -result {requested illegal events; only key, button, motion, enter, leave, and virtual events may be used}
519	522	test textTag-3.6 {TkTextTagCmd - "bind" option} -constraints {
520		haveCourier12
	523	haveCourier12
521	524	} -body {
522	525	.t tag delete x
523	526	.t tag bind x <Enter> script1
524		catch {.t tag bind x <FocusIn> script2}
	527	catch {.t tag bind x <FocusIn> script2}
525	528	.t tag bind x
526	529	} -cleanup {
527	530	.t tag delete x
528	531	} -result {<Enter>}
529	532	test textTag-3.7 {TkTextTagCmd - "bind" option} -constraints {
530		haveCourier12
	533	haveCourier12
531	534	} -body {
532	535	.t tag delete x
533	536	.t tag bind x <Enter> script1

538	541	.t tag delete x
539	542	} -result {{<Enter> <Leave> a} script1 xyzzy}
540	543	test textTag-3.8 {TkTextTagCmd - "bind" option} -constraints {
541		haveCourier12
	544	haveCourier12
542	545	} -body {
543	546	.t tag delete x
544	547	.t tag bind x <Enter> script1

549	552	} -result {script1
550	553	script2}
551	554	test textTag-3.9 {TkTextTagCmd - "bind" option} -constraints {
552		haveCourier12
	555	haveCourier12
553	556	} -body {
554	557	.t tag delete x
555	558	.t tag bind x <Enter>

557	560	.t tag delete x
558	561	} -returnCodes ok -result {}
559	562	test textTag-3.10 {TkTextTagCmd - "bind" option} -constraints {
560		haveCourier12
	563	haveCourier12
561	564	} -body {
562	565	.t tag delete x
563	566	.t tag bind x <

567	570
568	571
569	572	test textTag-4.1 {TkTextTagCmd - "cget" option} -constraints {
570		haveCourier12
	573	haveCourier12
571	574	} -body {
572	575	.t tag cget a
573	576	} -returnCodes error -result {wrong # args: should be ".t tag cget tagName option"}
574	577	test textTag-4.2 {TkTextTagCmd - "cget" option} -constraints {
575		haveCourier12
	578	haveCourier12
576	579	} -body {
577	580	.t tag cget a b c
578	581	} -returnCodes error -result {wrong # args: should be ".t tag cget tagName option"}
579	582	test textTag-4.3 {TkTextTagCmd - "cget" option} -constraints {
580		haveCourier12
	583	haveCourier12
581	584	} -body {
582	585	.t tag delete foo
583	586	.t tag cget foo bar
584	587	} -returnCodes error -result {tag "foo" isn't defined in text widget}
585	588	test textTag-4.4 {TkTextTagCmd - "cget" option} -constraints {
586		haveCourier12
	589	haveCourier12
587	590	} -body {
588	591	.t tag cget sel bogus
589	592	} -returnCodes error -result {unknown option "bogus"}
590	593	test textTag-4.5 {TkTextTagCmd - "cget" option} -constraints {
591		haveCourier12
	594	haveCourier12
592	595	} -body {
593	596	.t tag delete x
594	597	.t tag configure x -background red

599	602
600	603
601	604	test textTag-5.1 {TkTextTagCmd - "configure" option} -constraints {
602		haveCourier12
	605	haveCourier12
603	606	} -body {
604	607	.t tag configure
605	608	} -returnCodes error -result {wrong # args: should be ".t tag configure tagName ?-option? ?value? ?-option value ...?"}
606	609	test textTag-5.2 {TkTextTagCmd - "configure" option} -constraints {
607		haveCourier12
	610	haveCourier12
608	611	} -body {
609	612	.t tag configure x -foo
610	613	} -returnCodes error -result {unknown option "-foo"}
611	614	test textTag-5.3 {TkTextTagCmd - "configure" option} -constraints {
612		haveCourier12
	615	haveCourier12
613	616	} -body {
614	617	.t tag configure x -background red -underline
615	618	} -cleanup {
616	619	.t tag delete x
617	620	} -returnCodes error -result {value for "-underline" missing}
618	621	test textTag-5.4 {TkTextTagCmd - "configure" option} -constraints {
619		haveCourier12
	622	haveCourier12
620	623	} -body {
621	624	.t tag delete x
622	625	.t tag configure x -underline yes

632	635	.t tag delete x
633	636	} -result {-underlinefg {} {} {} lightgreen}
634	637	test textTag-5.5 {TkTextTagCmd - "configure" option} -constraints {
635		haveCourier12
	638	haveCourier12
636	639	} -body {
637	640	.t tag delete x
638	641	.t tag configure x -overstrike on

648	651	.t tag delete x
649	652	} -result {-overstrikefg {} {} {} lightgreen}
650	653	test textTag-5.6 {TkTextTagCmd - "configure" option} -constraints {
651		haveCourier12
	654	haveCourier12
652	655	} -body {
653	656	.t tag configure x -overstrike foo
654	657	} -cleanup {
655	658	.t tag delete x
656	659	} -returnCodes error -result {expected boolean value but got "foo"}
657	660	test textTag-5.7 {TkTextTagCmd - "configure" option} -constraints {
658		haveCourier12
	661	haveCourier12
659	662	} -body {
660	663	.t tag delete x
661	664	.t tag configure x -underline stupid

663	666	.t tag delete x
664	667	} -returnCodes error -result {expected boolean value but got "stupid"}
665	668	test textTag-5.8 {TkTextTagCmd - "configure" option} -constraints {
666		haveCourier12
	669	haveCourier12
667	670	} -body {
668	671	.t tag delete x
669	672	.t tag configure x -justify left

672	675	.t tag delete x
673	676	} -result {-justify {} {} {} left}
674	677	test textTag-5.9 {TkTextTagCmd - "configure" option} -constraints {
675		haveCourier12
	678	haveCourier12
676	679	} -body {
677	680	.t tag delete x
678	681	.t tag configure x -justify bogus

680	683	.t tag delete x
681	684	} -returnCodes error -result {bad justification "bogus": must be left, right, or center}
682	685	test textTag-5.10 {TkTextTagCmd - "configure" option} -constraints {
683		haveCourier12
	686	haveCourier12
684	687	} -body {
685	688	.t tag delete x
686	689	.t tag configure x -justify fill

688	691	.t tag delete x
689	692	} -returnCodes error -result {bad justification "fill": must be left, right, or center}
690	693	test textTag-5.11 {TkTextTagCmd - "configure" option} -constraints {
691		haveCourier12
	694	haveCourier12
692	695	} -body {
693	696	.t tag delete x
694	697	.t tag configure x -offset 2

697	700	.t tag delete x
698	701	} -result {-offset {} {} {} 2}
699	702	test textTag-5.12 {TkTextTagCmd - "configure" option} -constraints {
700		haveCourier12
	703	haveCourier12
701	704	} -body {
702	705	.t tag delete x
703	706	.t tag configure x -offset 1.0q

718	721	{-lmargincolor {} {} {} darkblue} {-rmargincolor {} {} {} lightgreen} \
719	722	]
720	723	test textTag-5.14 {TkTextTagCmd - "configure" option} -constraints {
721		haveCourier12
	724	haveCourier12
722	725	} -body {
723	726	.t tag delete x
724	727	.t tag configure x -lmargin1 2.0x

726	729	.t tag delete x
727	730	} -returnCodes error -result {bad screen distance "2.0x"}
728	731	test textTag-5.15 {TkTextTagCmd - "configure" option} -constraints {
729		haveCourier12
	732	haveCourier12
730	733	} -body {
731	734	.t tag delete x
732	735	.t tag configure x -lmargin2 gorp

740	743	.t tag delete x
741	744	} -returnCodes error -result {unknown color name "rainbow"}
742	745	test textTag-5.16 {TkTextTagCmd - "configure" option} -constraints {
743		haveCourier12
	746	haveCourier12
744	747	} -body {
745	748	.t tag delete x
746	749	.t tag configure x -rmargin 140.1.1

755	758	} -returnCodes error -result {unknown color name "rainbow"}
756	759	.t tag delete x
757	760	test textTag-5.17 {TkTextTagCmd - "configure" option} -constraints {
758		haveCourier12
	761	haveCourier12
759	762	} -body {
760	763	.t tag delete x
761	764	.t tag configure x -spacing1 2 -spacing2 4 -spacing3 6

765	768	.t tag delete x
766	769	} -result {{-spacing1 {} {} {} 2} {-spacing2 {} {} {} 4} {-spacing3 {} {} {} 6}}
767	770	test textTag-5.18 {TkTextTagCmd - "configure" option} -constraints {
768		haveCourier12
	771	haveCourier12
769	772	} -body {
770	773	.t tag delete x
771	774	.t tag configure x -spacing1 2.0x

773	776	.t tag delete x
774	777	} -returnCodes error -result {bad screen distance "2.0x"}
775	778	test textTag-5.19 {TkTextTagCmd - "configure" option} -constraints {
776		haveCourier12
	779	haveCourier12
777	780	} -body {
778	781	.t tag delete x
779	782	.t tag configure x -spacing1 lousy

781	784	.t tag delete x
782	785	} -returnCodes error -result {bad screen distance "lousy"}
783	786	test textTag-5.20 {TkTextTagCmd - "configure" option} -constraints {
784		haveCourier12
	787	haveCourier12
785	788	} -body {
786	789	.t tag delete x
787	790	.t tag configure x -spacing1 4.2.3

789	792	.t tag delete x
790	793	} -returnCodes error -result {bad screen distance "4.2.3"}
791	794	test textTag-5.21 {TkTextTagCmd - "configure" option} -constraints {
792		haveCourier12
	795	haveCourier12
793	796	} -body {
794	797	.t configure -selectborderwidth 2 -selectforeground blue \
795	798	-selectbackground black

801	804	return $x
802	805	} -result {4 green yellow}
803	806	test textTag-5.22 {TkTextTagCmd - "configure" option} -constraints {
804		haveCourier12
	807	haveCourier12
805	808	} -body {
806	809	.t configure -selectborderwidth 20
807	810	.t tag configure sel -borderwidth {}

855	858	} -result {yellow blue red white}
856	859
857	860	test textTag-6.1 {TkTextTagCmd - "delete" option} -constraints {
858		haveCourier12
	861	haveCourier12
859	862	} -body {
860	863	.t tag delete
861	864	} -returnCodes error -result {wrong # args: should be ".t tag delete tagName ?tagName ...?"}
862	865	test textTag-6.2 {TkTextTagCmd - "delete" option} -constraints {
863		haveCourier12
	866	haveCourier12
864	867	} -body {
865	868	.t tag delete zork
866	869	} -returnCodes ok -result {}
867	870	test textTag-6.3 {TkTextTagCmd - "delete" option} -constraints {
868		haveCourier12
	871	haveCourier12
869	872	} -setup {
870	873	.t tag delete {*}[.t tag names]
871	874	} -body {

878	881	.t tag delete x
879	882	} -result {sel x}
880	883	test textTag-6.4 {TkTextTagCmd - "delete" option} -constraints {
881		haveCourier12
	884	haveCourier12
882	885	} -setup {
883	886	.t tag delete {*}[.t tag names]
884	887	} -body {

889	892	.t tag names
890	893	} -result {sel}
891	894	test textTag-6.5 {TkTextTagCmd - "delete" option} -constraints {
892		haveCourier12
	895	haveCourier12
893	896	} -body {
894	897	.t tag bind x <Enter> foo
895	898	.t tag delete x

901	904
902	905
903	906	test textTag-7.1 {TkTextTagCmd - "lower" option} -constraints {
904		haveCourier12
	907	haveCourier12
905	908	} -body {
906	909	.t tag lower
907	910	} -returnCodes error -result {wrong # args: should be ".t tag lower tagName ?belowThis?"}
908	911	test textTag-7.2 {TkTextTagCmd - "lower" option} -constraints {
909		haveCourier12
	912	haveCourier12
910	913	} -body {
911	914	.t tag lower foo
912	915	} -returnCodes error -result {tag "foo" isn't defined in text widget}
913	916	test textTag-7.3 {TkTextTagCmd - "lower" option} -constraints {
914		haveCourier12
	917	haveCourier12
915	918	} -body {
916	919	.t tag lower sel bar
917	920	} -returnCodes error -result {tag "bar" isn't defined in text widget}
918	921	test textTag-7.4 {TkTextTagCmd - "lower" option} -constraints {
919		haveCourier12
	922	haveCourier12
920	923	} -setup {
921	924	.t tag delete {*}[.t tag names]
922	925	.t tag remove sel 1.0 end

930	933	.t tag delete {*}[.t tag names]
931	934	} -result {c sel a b d}
932	935	test textTag-7.5 {TkTextTagCmd - "lower" option} -constraints {
933		haveCourier12
	936	haveCourier12
934	937	} -setup {
935	938	.t tag delete {*}[.t tag names]
936	939	.t tag remove sel 1.0 end

944	947	.t tag delete {*}[.t tag names]
945	948	} -result {sel a d b c}
946	949	test textTag-7.6 {TkTextTagCmd - "lower" option} -constraints {
947		haveCourier12
	950	haveCourier12
948	951	} -setup {
949	952	.t tag delete {*}[.t tag names]
950	953	.t tag remove sel 1.0 end

960	963
961	964
962	965	test textTag-8.1 {TkTextTagCmd - "names" option} -constraints {
963		haveCourier12
	966	haveCourier12
964	967	} -body {
965	968	.t tag names a b
966	969	} -cleanup {
967	970	.t tag delete {*}[.t tag names]
968	971	} -returnCodes error -result {wrong # args: should be ".t tag names ?index?"}
969	972	test textTag-8.2 {TkTextTagCmd - "names" option} -constraints {
970		haveCourier12
	973	haveCourier12
971	974	} -setup {
972	975	.t tag delete {*}[.t tag names]
973	976	.t tag remove sel 1.0 end

980	983	.t tag delete {*}[.t tag names]
981	984	} -result {sel a b c d}
982	985	test textTag-8.3 {TkTextTagCmd - "names" option} -constraints {
983		haveCourier12
	986	haveCourier12
984	987	} -setup {
985	988	.t tag delete {*}[.t tag names]
986	989	.t tag remove sel 1.0 end

997	1000
998	1001
999	1002	test textTag-9.1 {TkTextTagCmd - "nextrange" option} -constraints {
1000		haveCourier12
	1003	haveCourier12
1001	1004	} -body {
1002	1005	.t tag nextrange x
1003	1006	} -returnCodes error -result {wrong # args: should be ".t tag nextrange tagName index1 ?index2?"}
1004	1007	test textTag-9.2 {TkTextTagCmd - "nextrange" option} -constraints {
1005		haveCourier12
	1008	haveCourier12
1006	1009	} -body {
1007	1010	.t tag nextrange x 1 2 3
1008	1011	} -returnCodes error -result {wrong # args: should be ".t tag nextrange tagName index1 ?index2?"}
1009	1012	test textTag-9.3 {TkTextTagCmd - "nextrange" option} -constraints {
1010		haveCourier12
	1013	haveCourier12
1011	1014	} -body {
1012	1015	.t tag nextrange foo 1.0
1013	1016	} -returnCodes ok -result {}
1014	1017	test textTag-9.4 {TkTextTagCmd - "nextrange" option} -constraints {
1015		haveCourier12
	1018	haveCourier12
1016	1019	} -setup {
1017	1020	.t tag delete x
1018	1021	} -body {

1022	1025	.t tag delete x
1023	1026	} -returnCodes error -result {bad text index "foo"}
1024	1027	test textTag-9.5 {TkTextTagCmd - "nextrange" option} -constraints {
1025		haveCourier12
	1028	haveCourier12
1026	1029	} -setup {
1027	1030	.t tag delete x
1028	1031	} -body {

1034	1037	.t tag delete x
1035	1038	} -returnCodes error -result {bad text index "bar"}
1036	1039	test textTag-9.6 {TkTextTagCmd - "nextrange" option} -constraints {
1037		haveCourier12
	1040	haveCourier12
1038	1041	} -setup {
1039	1042	.t tag delete x
1040	1043	} -body {

1046	1049	.t tag delete x
1047	1050	} -result {2.3 2.5}
1048	1051	test textTag-9.7 {TkTextTagCmd - "nextrange" option} -constraints {
1049		haveCourier12
	1052	haveCourier12
1050	1053	} -setup {
1051	1054	.t tag delete x
1052	1055	} -body {

1058	1061	.t tag delete x
1059	1062	} -result {2.3 2.5}
1060	1063	test textTag-9.8 {TkTextTagCmd - "nextrange" option} -constraints {
1061		haveCourier12
	1064	haveCourier12
1062	1065	} -setup {
1063	1066	.t tag delete x
1064	1067	} -body {

1070	1073	.t tag delete x
1071	1074	} -result {2.3 2.5}
1072	1075	test textTag-9.9 {TkTextTagCmd - "nextrange" option} -constraints {
1073		haveCourier12
	1076	haveCourier12
1074	1077	} -setup {
1075	1078	.t tag delete x
1076	1079	} -body {

1082	1085	.t tag delete x
1083	1086	} -result {2.9 3.1}
1084	1087	test textTag-9.10 {TkTextTagCmd - "nextrange" option} -constraints {
1085		haveCourier12
	1088	haveCourier12
1086	1089	} -setup {
1087	1090	.t tag delete x
1088	1091	} -body {

1094	1097	.t tag delete x
1095	1098	} -result {}
1096	1099	test textTag-9.11 {TkTextTagCmd - "nextrange" option} -constraints {
1097		haveCourier12
	1100	haveCourier12
1098	1101	} -setup {
1099	1102	.t tag delete x
1100	1103	} -body {

1106	1109	.t tag delete x
1107	1110	} -result {2.9 3.1}
1108	1111	test textTag-9.12 {TkTextTagCmd - "nextrange" option} -constraints {
1109		haveCourier12
	1112	haveCourier12
1110	1113	} -setup {
1111	1114	.t tag delete x
1112	1115	} -body {

1118	1121	.t tag delete x
1119	1122	} -result {2.9 3.1}
1120	1123	test textTag-9.13 {TkTextTagCmd - "nextrange" option} -constraints {
1121		haveCourier12
	1124	haveCourier12
1122	1125	} -setup {
1123	1126	.t tag delete x
1124	1127	} -body {

1130	1133	.t tag delete x
1131	1134	} -result {7.2 7.3}
1132	1135	test textTag-9.14 {TkTextTagCmd - "nextrange" option} -constraints {
1133		haveCourier12
	1136	haveCourier12
1134	1137	} -setup {
1135	1138	.t tag delete x
1136	1139	} -body {

1144	1147
1145	1148
1146	1149	test textTag-10.1 {TkTextTagCmd - "prevrange" option} -constraints {
1147		haveCourier12
	1150	haveCourier12
1148	1151	} -body {
1149	1152	.t tag prevrange x
1150	1153	} -returnCodes error -result {wrong # args: should be ".t tag prevrange tagName index1 ?index2?"}
1151	1154	test textTag-10.2 {TkTextTagCmd - "prevrange" option} -constraints {
1152		haveCourier12
	1155	haveCourier12
1153	1156	} -body {
1154	1157	.t tag prevrange x 1 2 3
1155	1158	} -returnCodes error -result {wrong # args: should be ".t tag prevrange tagName index1 ?index2?"}
1156	1159	test textTag-10.3 {TkTextTagCmd - "prevrange" option} -constraints {
1157		haveCourier12
	1160	haveCourier12
1158	1161	} -setup {
1159	1162	.t tag delete x
1160	1163	} -body {

1163	1166	.t tag delete x
1164	1167	} -returnCodes ok -result {}
1165	1168	test textTag-10.4 {TkTextTagCmd - "prevrange" option} -constraints {
1166		haveCourier12
	1169	haveCourier12
1167	1170	} -setup {
1168	1171	.t tag delete x
1169	1172	} -body {

1175	1178	.t tag delete x
1176	1179	} -returnCodes error -result {bad text index "foo"}
1177	1180	test textTag-10.5 {TkTextTagCmd - "prevrange" option} -constraints {
1178		haveCourier12
	1181	haveCourier12
1179	1182	} -setup {
1180	1183	.t tag delete x
1181	1184	} -body {

1187	1190	.t tag delete x
1188	1191	} -returnCodes error -result {bad text index "bar"}
1189	1192	test textTag-10.6 {TkTextTagCmd - "prevrange" option} -constraints {
1190		haveCourier12
	1193	haveCourier12
1191	1194	} -setup {
1192	1195	.t tag delete x
1193	1196	} -body {

1199	1202	.t tag delete x
1200	1203	} -result {7.2 7.3}
1201	1204	test textTag-10.7 {TkTextTagCmd - "prevrange" option} -constraints {
1202		haveCourier12
	1205	haveCourier12
1203	1206	} -setup {
1204	1207	.t tag delete x
1205	1208	} -body {

1211	1214	.t tag delete x
1212	1215	} -result {2.3 2.5}
1213	1216	test textTag-10.8 {TkTextTagCmd - "prevrange" option} -constraints {
1214		haveCourier12
	1217	haveCourier12
1215	1218	} -setup {
1216	1219	.t tag delete x
1217	1220	} -body {

1223	1226	.t tag delete x
1224	1227	} -result {2.3 2.5}
1225	1228	test textTag-10.9 {TkTextTagCmd - "prevrange" option} -constraints {
1226		haveCourier12
	1229	haveCourier12
1227	1230	} -setup {
1228	1231	.t tag delete x
1229	1232	} -body {

1235	1238	.t tag delete x
1236	1239	} -result {2.3 2.5}
1237	1240	test textTag-10.10 {TkTextTagCmd - "prevrange" option} -constraints {
1238		haveCourier12
	1241	haveCourier12
1239	1242	} -setup {
1240	1243	.t tag delete x
1241	1244	} -body {

1247	1250	.t tag delete x
1248	1251	} -result {}
1249	1252	test textTag-10.11 {TkTextTagCmd - "prevrange" option} -constraints {
1250		haveCourier12
	1253	haveCourier12
1251	1254	} -setup {
1252	1255	.t tag delete x
1253	1256	} -body {

1259	1262	.t tag delete x
1260	1263	} -result {}
1261	1264	test textTag-10.12 {TkTextTagCmd - "prevrange" option} -constraints {
1262		haveCourier12
	1265	haveCourier12
1263	1266	} -setup {
1264	1267	.t tag delete x
1265	1268	} -body {

1271	1274	.t tag delete x
1272	1275	} -result {2.3 2.5}
1273	1276	test textTag-10.13 {TkTextTagCmd - "prevrange" option} -constraints {
1274		haveCourier12
	1277	haveCourier12
1275	1278	} -setup {
1276	1279	.t tag delete x
1277	1280	} -body {

1283	1286	.t tag delete x
1284	1287	} -result {2.9 3.1}
1285	1288	test textTag-10.14 {TkTextTagCmd - "prevrange" option} -constraints {
1286		haveCourier12
	1289	haveCourier12
1287	1290	} -setup {
1288	1291	.t tag delete x
1289	1292	} -body {

1297	1300
1298	1301
1299	1302	test textTag-11.1 {TkTextTagCmd - "raise" option} -constraints {
1300		haveCourier12
	1303	haveCourier12
1301	1304	} -body {
1302	1305	.t tag raise
1303	1306	} -returnCodes error -result {wrong # args: should be ".t tag raise tagName ?aboveThis?"}
1304	1307	test textTag-11.2 {TkTextTagCmd - "raise" option} -constraints {
1305		haveCourier12
	1308	haveCourier12
1306	1309	} -body {
1307	1310	.t tag raise foo
1308	1311	} -returnCodes error -result {tag "foo" isn't defined in text widget}
1309	1312	test textTag-11.3 {TkTextTagCmd - "raise" option} -constraints {
1310		haveCourier12
	1313	haveCourier12
1311	1314	} -body {
1312	1315	.t tag raise sel bar
1313	1316	} -returnCodes error -result {tag "bar" isn't defined in text widget}
1314	1317	test textTag-11.4 {TkTextTagCmd - "raise" option} -constraints {
1315		haveCourier12
	1318	haveCourier12
1316	1319	} -setup {
1317	1320	.t tag delete {*}[.t tag names]
1318	1321	.t tag remove sel 1.0 end

1326	1329	.t tag delete {*}[.t tag names]
1327	1330	} -result {sel a b d c}
1328	1331	test textTag-11.5 {TkTextTagCmd - "raise" option} -constraints {
1329		haveCourier12
	1332	haveCourier12
1330	1333	} -setup {
1331	1334	.t tag delete {*}[.t tag names]
1332	1335	.t tag remove sel 1.0 end

1340	1343	.t tag delete {*}[.t tag names]
1341	1344	} -result {sel a b d c}
1342	1345	test textTag-11.6 {TkTextTagCmd - "raise" option} -constraints {
1343		haveCourier12
	1346	haveCourier12
1344	1347	} -setup {
1345	1348	.t tag delete {*}[.t tag names]
1346	1349	.t tag remove sel 1.0 end

1356	1359
1357	1360
1358	1361	test textTag-12.1 {TkTextTagCmd - "ranges" option} -constraints {
1359		haveCourier12
	1362	haveCourier12
1360	1363	} -body {
1361	1364	.t tag ranges
1362	1365	} -returnCodes error -result {wrong # args: should be ".t tag ranges tagName"}
1363	1366	test textTag-12.2 {TkTextTagCmd - "ranges" option} -constraints {
1364		haveCourier12
	1367	haveCourier12
1365	1368	} -body {
1366	1369	.t tag delete x
1367	1370	.t tag ranges x
1368	1371	} -result {}
1369	1372	test textTag-12.3 {TkTextTagCmd - "ranges" option} -constraints {
1370		haveCourier12
	1373	haveCourier12
1371	1374	} -setup {
1372	1375	.t tag delete x
1373	1376	} -body {

1379	1382	.t tag delete x
1380	1383	} -result {2.2 2.3 2.7 4.6 5.2 5.5}
1381	1384	test textTag-12.4 {TkTextTagCmd - "ranges" option} -constraints {
1382		haveCourier12
	1385	haveCourier12
1383	1386	} -setup {
1384	1387	.t tag delete x
1385	1388	} -body {

1392	1395
1393	1396
1394	1397	test textTag-13.1 {TkTextTagCmd - "remove" option} -constraints {
1395		haveCourier12
	1398	haveCourier12
1396	1399	} -body {
1397	1400	.t tag remove
1398	1401	} -returnCodes error -result {wrong # args: should be ".t tag remove tagName index1 ?index2 index1 index2 ...?"}
1399	1402	test textTag-13.2 {TkTextTagCmd - "remove" option} -constraints {
1400		haveCourier12
	1403	haveCourier12
1401	1404	} -setup {
1402	1405	.t tag delete x
1403	1406	} -body {

1408	1411	.t tag delete x
1409	1412	} -result {2.2 2.3 2.7 2.11}
1410	1413	test textTag-13.3 {TkTextTagCmd - "remove" option} -constraints {
1411		haveCourier12
	1414	haveCourier12
1412	1415	} -setup {
1413	1416	destroy .t.e
1414	1417	} -body {

1487	1490
1488	1491	test textTag-15.1 {TkTextBindProc} -constraints haveCourier12 -setup {
1489	1492	.t tag delete x y
1490		event generate {} <Motion> -warp 1 -x -1 -y -1; update
	1493	wm geometry . +200+200 ; update
	1494	event generate {} <Motion> -warp 1 -x 5 -y 5 ; update idletasks ; after 50
1491	1495	} -body {
1492	1496	bind .t <ButtonRelease> {lappend x up}
1493	1497	.t tag bind x <ButtonRelease> {lappend x x-up}

1512	1516
1513	1517	test textTag-15.2 {TkTextBindProc} -constraints haveCourier12 -setup {
1514	1518	.t tag delete x y
1515		event generate {} <Motion> -warp 1 -x -1 -y -1; update
	1519	wm geometry . +200+200 ; update
	1520	event generate {} <Motion> -warp 1 -x 5 -y 5 ; update idletasks ; after 50
1516	1521	} -body {
1517	1522	.t tag bind x <Enter> {lappend x x-enter}
1518	1523	.t tag bind x <ButtonPress> {lappend x x-down}

1540	1545
1541	1546	test textTag-15.3 {TkTextBindProc} -constraints haveCourier12 -setup {
1542	1547	.t tag delete x y
1543		event generate {} <Motion> -warp 1 -x -1 -y -1; update
	1548	wm geometry . +200+200 ; update
	1549	event generate {} <Motion> -warp 1 -x 5 -y 5 ; update idletasks ; after 50
1544	1550	} -body {
1545	1551	.t tag bind x <Enter> {lappend x x-enter}
1546	1552	.t tag bind x <Any-ButtonPress-1> {lappend x x-down}

1572	1578
1573	1579
1574	1580	test textTag-16.1 {TkTextPickCurrent procedure} -constraints {
1575		haveCourier12
1576		} -setup {
1577		.t tag delete {*}[.t tag names]
1578		event generate {} <Motion> -warp 1 -x -1 -y -1; update
	1581	haveCourier12
	1582	} -setup {
	1583	.t tag delete {*}[.t tag names]
	1584	wm geometry . +200+200 ; update
	1585	event generate {} <Motion> -warp 1 -x 5 -y 5 ; update idletasks ; after 50
1579	1586	} -body {
1580	1587	event gen .t <ButtonRelease-1> -state 0x100 -x $x1 -y $y1
1581	1588	set x [.t index current]

1594	1601	} -result {2.1 3.2 3.2 3.2 3.2 3.2 4.3}
1595	1602
1596	1603	test textTag-16.2 {TkTextPickCurrent procedure} -constraints {
1597		haveCourier12
1598		} -setup {
1599		.t tag delete {*}[.t tag names]
1600		event generate {} <Motion> -warp 1 -x -1 -y -1; update
	1604	haveCourier12 failsOnUbuntuNoXft
	1605	} -setup {
	1606	.t tag delete {*}[.t tag names]
	1607	wm geometry . +200+200 ; update
	1608	event generate {} <Motion> -warp 1 -x 5 -y 5 ; update idletasks ; after 50
1601	1609	} -body {
1602	1610	.t tag configure big -font $bigFont
1603	1611	event gen .t <ButtonRelease-1> -state 0x100 -x $x1 -y $y1

1611	1619	} -result {3.2 3.1}
1612	1620
1613	1621	test textTag-16.3 {TkTextPickCurrent procedure} -constraints {
1614		haveCourier12
	1622	haveCourier12
1615	1623	} -setup {
1616	1624	foreach i {a b c d} {
1617	1625	.t tag remove $i 1.0 end
1618	1626	}
1619		event generate {} <Motion> -warp 1 -x -1 -y -1; update
	1627	wm geometry . +200+200 ; update
	1628	event generate {} <Motion> -warp 1 -x 5 -y 5 ; update idletasks ; after 50
1620	1629	} -body {
1621	1630	foreach i {a b c d} {
1622	1631	.t tag bind $i <Enter> "lappend x enter-$i"

1640	1649	} -result {enter-a enter-b \| leave-b enter-c \| leave-a leave-c}
1641	1650
1642	1651	test textTag-16.4 {TkTextPickCurrent procedure} -constraints {
1643		haveCourier12
	1652	haveCourier12
1644	1653	} -setup {
1645	1654	foreach i {a b c d} {
1646	1655	.t tag remove $i 1.0 end
1647	1656	}
1648		event generate {} <Motion> -warp 1 -x -1 -y -1; update
	1657	wm geometry . +200+200 ; update
	1658	event generate {} <Motion> -warp 1 -x 5 -y 5 ; update idletasks ; after 50
1649	1659	} -body {
1650	1660	foreach i {a b c d} {
1651	1661	.t tag bind $i <Enter> "lappend x enter-$i"

1668	1678	} -result {enter-a enter-b enter-c \| leave-c leave-b}
1669	1679
1670	1680	test textTag-16.5 {TkTextPickCurrent procedure} -constraints {
1671		haveCourier12
	1681	haveCourier12
1672	1682	} -setup {
1673	1683	foreach i {big a b c d} {
1674	1684	.t tag remove $i 1.0 end
1675	1685	}
1676		event generate {} <Motion> -warp 1 -x -1 -y -1; update
	1686	wm geometry . +200+200 ; update
	1687	event generate {} <Motion> -warp 1 -x 5 -y 5 ; update idletasks ; after 50
1677	1688	} -body {
1678	1689	.t tag configure big -font $bigFont
1679	1690	event gen .t <Motion> -x $x1 -y $y1

1686	1697	} -result {3.2}
1687	1698
1688	1699	test textTag-16.6 {TkTextPickCurrent procedure} -constraints {
1689		haveCourier12
	1700	haveCourier12 failsOnUbuntuNoXft
1690	1701	} -setup {
1691	1702	foreach i {big a b c d} {
1692	1703	.t tag remove $i 1.0 end
1693	1704	}
1694		event generate {} <Motion> -warp 1 -x -1 -y -1; update
	1705	wm geometry . +200+200 ; update
	1706	event generate {} <Motion> -warp 1 -x 5 -y 5 ; update idletasks ; after 50
1695	1707	} -body {
1696	1708	.t tag configure big -font $bigFont
1697	1709	event gen .t <Motion> -x $x1 -y $y1

1705	1717	} -result {3.1}
1706	1718
1707	1719	test textTag-16.7 {TkTextPickCurrent procedure} -constraints {
1708		haveCourier12
	1720	haveCourier12 failsOnUbuntuNoXft
1709	1721	} -setup {
1710	1722	foreach i {big a b c d} {
1711	1723	.t tag remove $i 1.0 end
1712	1724	}
1713		event generate {} <Motion> -warp 1 -x -1 -y -1; update
	1725	wm geometry . +200+200 ; update
	1726	event generate {} <Motion> -warp 1 -x 5 -y 5 ; update idletasks ; after 50
1714	1727	} -body {
1715	1728	.t tag configure big -font $bigFont
1716	1729	.t tag bind a <Enter> {.t tag add big 3.0 3.2}

1740	1753
1741	1754	test textTag-18.1 {TkTextPickCurrent tag bindings} -setup {
1742	1755	destroy .t
1743		event generate {} <Motion> -warp 1 -x -1 -y -1; update
	1756	wm geometry . +200+200 ; update
	1757	event generate {} <Motion> -warp 1 -x 5 -y 5 ; update idletasks ; after 50
1744	1758	} -body {
1745	1759	text .t -width 30 -height 4 -relief sunken -borderwidth 10 \
1746	1760	-highlightthickness 10 -pady 2
1747	1761	pack .t
1748	1762	update ; # map the window, otherwise -warp can't be done
1749
	1763
1750	1764	.t insert end " Tag here " TAG " no tag here"
1751	1765	.t tag configure TAG -borderwidth 4 -relief raised
1752	1766	.t tag bind TAG <Enter> {lappend res "%x %y tag-Enter"}

+22

-18

tests/textWind.test less more

10	10	tcltest::configure {*}$argv
11	11	tcltest::loadTestedCommands
12	12
	13	testConstraint failsOnUbuntu [expr {![info exists ::env(CI)] \|\| ![string match Linux $::tcl_platform(os)]}]
	14
13	15	deleteWindows
14	16
15		set fixedFont {"Courier New" -12}
	17	set fixedFont {"Courier" -12}
16	18	set fixedHeight [font metrics $fixedFont -linespace]
17	19	set fixedWidth [font measure $fixedFont m]
18	20	set fixedAscent [font metrics $fixedFont -ascent]

41	43	# This update is needed on MacOS to make sure that the window is mapped
42	44	# when the tests begin.
43	45
44		update
	46	update
45	47
46	48	set bw [.t cget -borderwidth]
47	49	set px [.t cget -padx]

581	583	[list [expr {$padx+2*$fixedWidth+25}] [expr {$pady+((30-$fixedHeight)/2)}] $fixedWidth $fixedHeight]]
582	584
583	585
584		test textWind-7.1 {EmbWinLostSlaveProc procedure} -setup {
	586	test textWind-7.1 {EmbWinLostContentProc procedure} -setup {
585	587	.t delete 1.0 end
586	588	destroy .f
587	589	} -body {

598	600	10x20+[expr {$padx+100}]+[expr {$pady+50}] \
599	601	[list [expr {$padx+2*$fixedWidth}] [expr {$pady+($fixedHeight/2)}] 0 0]]
600	602
601		test textWind-7.2 {EmbWinLostSlaveProc procedure} -setup {
	603	test textWind-7.2 {EmbWinLostContentProc procedure} -setup {
602	604	.t delete 1.0 end
603	605	destroy .t.f
604	606	} -body {

750	752	destroy .t.f
751	753	proc bgerror args {
752	754	global msg
753		lappend msg $args
754		}
755		} -body {
756		.t insert 1.0 "Some sample text"
	755	if {$msg == ""} {
	756	lappend msg $args
	757	}
	758	}
	759	} -body {
	760	.t insert 1.0 "Some sample text"
	761	set msg {}
757	762	.t window create 1.5 -create {
758	763	frame .t.f
759	764	frame .t.f.f -width 10 -height 20 -bg $color
760	765	}
761		set msg {}
762	766	update idletasks
763	767	lappend msg [winfo exists .t.f.f]
764	768	} -cleanup {

770	774	.t delete 1.0 end
771	775	proc bgerror args {
772	776	global msg
773		if {[lsearch -exact $msg $args] == -1} {
	777	if {[lsearch -exact $msg $args] < 0} {
774	778	lappend msg $args
775	779	}
776	780	}

789	793	{{can't embed .t relative to .t}} \
790	794	[list [expr {$padx+5*$fixedWidth}] [expr {$pady+($fixedHeight/2)}] 0 0]]
791	795
792		test textWind-10.7 {EmbWinLayoutProc procedure, error in creating window} -setup {
	796	test textWind-10.7 {EmbWinLayoutProc procedure, error in creating window} -constraints failsOnUbuntu -setup {
793	797	.t delete 1.0 end
794	798	destroy .t2
795	799	proc bgerror args {

857	861	} -body {
858	862	.t configure -wrap char
859	863	.t insert 1.0 "Some sample text"
860		frame .f -width 125 -height 20 -bg $color -bd 2 -relief raised
	864	frame .f -width [expr {($tWidth-12)*$fixedWidth-1}] -height 20 -bg $color -bd 2 -relief raised
861	865	.t window create 1.12 -window .f
862	866	list [.t bbox .f] [.t bbox 1.13]
863	867	} -cleanup {

872	876	} -body {
873	877	.t configure -wrap char
874	878	.t insert 1.0 "Some sample text"
875		frame .f -width 126 -height 20 -bg $color -bd 2 -relief raised
	879	frame .f -width [expr {($tWidth-12)*$fixedWidth}] -height 20 -bg $color -bd 2 -relief raised
876	880	.t window create 1.12 -window .f
877	881	update
878	882	list [.t bbox .f] [.t bbox 1.13]

888	892	} -body {
889	893	.t configure -wrap char
890	894	.t insert 1.0 "Some sample text"
891		frame .f -width 127 -height 20 -bg $color -bd 2 -relief raised
	895	frame .f -width [expr {($tWidth-12)*$fixedWidth+1}] -height 20 -bg $color -bd 2 -relief raised
892	896	.t window create 1.12 -window .f
893	897	update
894	898	list [.t bbox .f] [.t bbox 1.13]
895	899	} -cleanup {
896	900	destroy .f
897	901	} -result [list \
898		[list $padx [expr {$pady+$fixedHeight}] 127 20] \
899		[list [expr {$padx+127}] [expr {$pady+$fixedHeight+((20-$fixedHeight)/2)}] $fixedWidth $fixedHeight]]
	902	[list $padx [expr {$pady+$fixedHeight}] [expr {($tWidth-12)*$fixedWidth+1}] 20] \
	903	[list [expr {$padx+($tWidth-12)*$fixedWidth+1}] [expr {$pady+$fixedHeight+((20-$fixedHeight)/2)}] $fixedWidth $fixedHeight]]
900	904
901	905	test textWind-10.13 {EmbWinLayoutProc procedure, doesn't fit on line} -setup {
902	906	.t delete 1.0 end

904	908	} -body {
905	909	.t configure -wrap none
906	910	.t insert 1.0 "Some sample text"
907		frame .f -width 130 -height 20 -bg $color -bd 2 -relief raised
	911	frame .f -width [expr {($tWidth-12)*$fixedWidth+5}] -height 20 -bg $color -bd 2 -relief raised
908	912	.t window create 1.12 -window .f
909	913	update
910	914	list [.t bbox .f] [.t bbox 1.13]

920	924	} -body {
921	925	.t configure -wrap none
922	926	.t insert 1.0 "Some sample text"
923		frame .f -width 130 -height 220 -bg $color -bd 2 -relief raised
	927	frame .f -width [expr {($tWidth-12)*$fixedWidth+5}] -height 220 -bg $color -bd 2 -relief raised
924	928	.t window create 1.12 -window .f
925	929	update
926	930	list [.t bbox .f] [.t bbox 1.13]

+1

-1

tests/tk.test less more

156	156	update
157	157	after 100
158	158	set i [tk inactive]
159		expr {$i == -1 \|\| ( $i > 90 && $i < 200 )}
	159	expr {$i < 0 \|\| ( $i > 90 && $i < 200 )}
160	160	} -result 1
161	161
162	162	test tk-7.1 {tk inactive in a safe interpreter} -body {

+4

-3

tests/ttk/all.tcl less more

3	3	# tests. Execute it by invoking "source all.tcl" when running tktest
4	4	# in this directory.
5	5	#
6		# Copyright (c) 2007 by the Tk developers.
	6	# Copyright © 2007 by the Tk developers.
7	7	#
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.

15	15	tcltest::configure -loadfile \
16	16	[file join [file dirname [tcltest::testsDirectory]] constraints.tcl]
17	17	tcltest::configure -singleproc 1
18		tcltest::runAllTests
19
	18	set ErrorOnFailures [info exists env(ERROR_ON_FAILURES)]
	19	encoding system utf-8
	20	if {[tcltest::runAllTests] && $ErrorOnFailures} {exit 1}

+2

-1

tests/ttk/checkbutton.test less more

2	2	#
3	3
4	4	package require Tk
5		package require tcltest ; namespace import -force tcltest::*
	5	package require tcltest 2.2
	6	namespace import -force tcltest::*
6	7	loadTestedCommands
7	8
8	9	test checkbutton-1.1 "Checkbutton check" -body {

+8

-7

tests/ttk/combobox.test less more

1	1	# ttk::combobox widget tests
2	2	#
3	3
4		package require Tk 8.5
5		package require tcltest ; namespace import -force tcltest::*
	4	package require Tk
	5	package require tcltest 2.2
	6	namespace import -force tcltest::*
6	7	loadTestedCommands
7	8
8	9	test combobox-1.0 "Combobox tests -- setup" -body {

11	12
12	13	test combobox-1.1 "Bad -values list" -body {
13	14	.cb configure -values "bad \{list"
14		} -result "unmatched open brace in list" -returnCodes 1
	15	} -result "unmatched open brace in list" -returnCodes error
15	16
16	17	test combobox-1.end "Combobox tests -- cleanup" -body {
17	18	destroy .cb

37	38	.cb current
38	39	} -result 1
39	40
40		test combobox-2.4 "current -- value not in list" -body {
	41	test combobox-2.4 "current -- value not in list" -body {
41	42	.cb set "z"
42	43	.cb current
43	44	} -result -1
44	45
45		test combobox-2.5 "current -- set to end index" -body {
	46	test combobox-2.5 "current -- set to end index" -body {
46	47	.cb configure -values [list a b c d e thelastone]
47	48	.cb current end
48	49	.cb get
49	50	} -result thelastone
50	51
51		test combobox-2.6 "current -- set to unknown index" -body {
	52	test combobox-2.6 "current -- set to unknown index" -body {
52	53	.cb configure -values [list a b c d e]
53	54	.cb current notanindex
54	55	} -returnCodes error -result {Incorrect index notanindex}

57	58
58	59	test combobox-3 "Read postoffset value dynamically from current style" -body {
59	60	ttk::combobox .cb -values [list a b c] -style "DerivedStyle.TCombobox"
60		pack .cb -expand true -fill both
	61	pack .cb -expand true -fill both
61	62	ttk::style configure DerivedStyle.TCombobox -postoffset [list 25 0 0 0]
62	63	ttk::combobox::Post .cb
63	64	expr {[winfo rootx .cb.popdown] - [winfo rootx .cb]}

+33

-6

tests/ttk/entry.test less more

1	1	# Tile package: entry widget tests
2	2	#
3	3
4		package require Tk 8.5
5		package require tcltest ; namespace import -force tcltest::*
	4	package require Tk
	5	package require tcltest 2.2
	6	namespace import -force tcltest::*
6	7	loadTestedCommands
	8
	9	testConstraint failsOnUbuntu [expr {![info exists ::env(CI)] \|\| ![string match Linux $::tcl_platform(os)]}]
7	10
8	11	variable scrollInfo
9	12	proc scroll args {

73	76	-expand false -fill x
74	77	} -cleanup {destroy .te .tsb}
75	78
	79	test entry-2.1.1 "Create entry before scrollbar - scrollbar catches up" -constraints failsOnUbuntu -body {
	80	pack [ttk::entry .te -xscrollcommand [list .tsb set]] \
	81	-expand true -fill both
	82	.te insert end [string repeat "abc" 50]
	83	catch {update} ; # error triggers because the -xscrollcommand callback
	84	# errors out: invalid command name ".tsb"
	85	pack [ttk::scrollbar .tsb -orient horizontal -command [list .te xview]] \
	86	-expand false -fill x
	87	update ; # no error
	88	lappend res [expr [lindex [.tsb get] 1] < 1] ; # scrollbar did update
	89	} -result 1 -cleanup {destroy .te .tsb}
	90
76	91	test entry-2.2 "Initial scroll position" -body {
77	92	ttk::entry .e -font fixed -width 5 -xscrollcommand scroll
78	93	.e insert end "0123456789"

115	130	.e insert end abcdefghijklmnopqrstuvwxyz
116	131	.e xview end
117	132	set result [.e index @0]
118		} -result {7}
	133	} -result 7
119	134
120	135	test entry-3.4 "xview" -body {
121	136	.e delete 0 end;
122	137	.e insert end abcdefghijklmnopqrstuvwxyz
123	138	.e xview moveto 1.0
124	139	set result [.e index @0]
125		} -result {7}
	140	} -result 7
126	141
127	142	test entry-3.5 "xview" -body {
128	143	.e delete 0 end;
129	144	.e insert end abcdefghijklmnopqrstuvwxyz
130	145	.e xview scroll 5 units
131	146	set result [.e index @0]
132		} -result {5}
	147	} -result 5
133	148
134	149	test entry-3.6 "xview" -body {
135	150	.e delete 0 end;
136	151	.e insert end [string repeat abcdefghijklmnopqrstuvwxyz 5]
137	152	.e xview scroll 2 pages
138	153	set result [.e index @0]
139		} -result {40}
	154	} -result 40
140	155
141	156	test entry-3.last "Series 3 cleanup" -body {
142	157	destroy .e

311	326	destroy .e
312	327	}
313	328
	329	test entry-10.1 {Bug [2830360fff] - Don't loose invalid at focus events} -setup {
	330	pack [ttk::entry .e]
	331	update
	332	} -body {
	333	.e state invalid
	334	set res [.e state]
	335	event generate .e <FocusOut>
	336	lappend res [.e state]
	337	} -result {invalid invalid} -cleanup {
	338	destroy .e
	339	}
	340
314	341	tcltest::cleanupTests

+5

-4

tests/ttk/image.test less more

0		package require Tk 8.5
1		package require tcltest ; namespace import -force tcltest::*
	0	package require Tk
	1	package require tcltest 2.2
	2	namespace import -force tcltest::*
2	3	loadTestedCommands
3	4
4	5	test image-1.1 "Bad image element" -body {

10	11	ttk::style element create testElement image test.element
11	12	} -body {
12	13	ttk::style element create testElement image test.element
13		} -returnCodes 1 -result "Duplicate element testElement"
	14	} -returnCodes error -result "Duplicate element testElement"
14	15
15	16	test image-2.0 "Deletion of displayed image (label)" -setup {
16	17	image create photo test.image -width 10 -height 10

22	23	} -cleanup {
23	24	destroy .ttk_image20
24	25	} -result {}
25
	26
26	27	test image-2.1 "Deletion of displayed image (checkbutton)" -setup {
27	28	image create photo test.image -width 10 -height 10
28	29	} -body {

+21

-20

tests/ttk/labelframe.test less more

0		package require Tk 8.5
1		package require tcltest ; namespace import -force tcltest::*
	0	package require Tk
	1	package require tcltest 2.2
	2	namespace import -force tcltest::*
2	3	loadTestedCommands
3	4
4	5	test labelframe-1.0 "Setup" -body {

9	10	ttk::frame .lf.t
10	11	ttk::checkbutton .lf.t.cb
11	12	.lf configure -labelwidget .lf.t.cb
12		} -returnCodes 1 -result "can't *" -match glob \
	13	} -returnCodes error -result "can't *" -match glob \
13	14	-cleanup { destroy .lf.t } ;
14	15
15	16	test labelframe-2.2 "Can't use toplevel as labelwidget" -body {
16	17	toplevel .lf.t
17	18	.lf configure -labelwidget .lf.t
18		} -returnCodes 1 -result "can't *" -match glob \
	19	} -returnCodes error -result "can't *" -match glob \
19	20	-cleanup { destroy .lf.t } ;
20	21
21	22	test labelframe-2.3 "Can't use non-windows as -labelwidget" -body {
22	23	.lf configure -labelwidget BogusWindowName
23		} -returnCodes 1 -result {bad window path name "BogusWindowName"}
	24	} -returnCodes error -result {bad window path name "BogusWindowName"}
24	25
25	26	test labelframe-2.4 "Can't use nonexistent-windows as -labelwidget" -body {
26	27	.lf configure -labelwidget .nosuchwindow
27		} -returnCodes 1 -result {bad window path name ".nosuchwindow"}
	28	} -returnCodes error -result {bad window path name ".nosuchwindow"}
28	29
29	30
30	31	###
31	32	# See also series labelframe-4.x
32	33	#
33		test labelframe-3.1 "Add child slave" -body {
	34	test labelframe-3.1 "Add child content" -body {
34	35	checkbutton .lf.cb -text "abcde"
35	36	.lf configure -labelwidget .lf.cb
36	37	list [update; winfo viewable .lf.cb] [winfo manager .lf.cb]
37	38	} -result [list 1 labelframe]
38	39
39		test labelframe-3.2 "Remove child slave" -body {
	40	test labelframe-3.2 "Remove child content" -body {
40	41	.lf configure -labelwidget {}
41	42	list [update; winfo viewable .lf.cb] [winfo manager .lf.cb]
42	43	} -result [list 0 {}]
43	44
44		test labelframe-3.3 "Re-add child slave" -body {
	45	test labelframe-3.3 "Re-add child content" -body {
45	46	.lf configure -labelwidget .lf.cb
46	47	list [update; winfo viewable .lf.cb] [winfo manager .lf.cb]
47	48	} -result [list 1 labelframe]
48	49
49		test labelframe-3.4 "Re-manage child slave" -body {
	50	test labelframe-3.4 "Re-manage child content" -body {
50	51	pack .lf.cb -side right
51	52	list [update; winfo viewable .lf.cb] [winfo manager .lf.cb] [.lf cget -labelwidget]
52	53	} -result [list 1 pack {}]
53	54
54		test labelframe-3.5 "Re-add child slave" -body {
	55	test labelframe-3.5 "Re-add child content" -body {
55	56	.lf configure -labelwidget .lf.cb
56	57	list [update; winfo viewable .lf.cb] [winfo manager .lf.cb]
57	58	} -result [list 1 labelframe]
58	59
59		test labelframe-3.6 "Destroy child slave" -body {
	60	test labelframe-3.6 "Destroy child content" -body {
60	61	destroy .lf.cb
61	62	.lf cget -labelwidget
62	63	} -result {}
63	64
64	65	###
65		# Re-run series labelframe-3.x with nonchild slaves.
	66	# Re-run series labelframe-3.x with nonchild content.
66	67	#
67	68	# @@@ ODDITY, 14 Nov 2005:
68	69	# @@@ labelframe-4.1 fails if .cb is a [checkbutton],
69	70	# @@@ but seems to succeed if it's some other widget class.
70	71	# @@@ I suspect a race condition; unable to track it down ATM.
71	72	#
72		# @@@ FOLLOWUP: This may have been caused by a bug in ManagerIdleProc
	73	# @@@ FOLLOWUP: This may have been caused by a bug in ManagerIdleProc
73	74	# @@@ (see manager.c r1.11). There's still probably a race condition in here.
74	75	#
75		test labelframe-4.1 "Add nonchild slave" -body {
	76	test labelframe-4.1 "Add nonchild content" -body {
76	77	checkbutton .cb -text "abcde"
77	78	.lf configure -labelwidget .cb
78	79	update

80	81
81	82	} -result [list 1 1 labelframe]
82	83
83		test labelframe-4.2 "Remove nonchild slave" -body {
	84	test labelframe-4.2 "Remove nonchild content" -body {
84	85	.lf configure -labelwidget {}
85	86	update;
86	87	list [winfo ismapped .cb] [winfo viewable .cb] [winfo manager .cb]
87	88	} -result [list 0 0 {}]
88	89
89		test labelframe-4.3 "Re-add nonchild slave" -body {
	90	test labelframe-4.3 "Re-add nonchild content" -body {
90	91	.lf configure -labelwidget .cb
91	92	list [update; winfo viewable .cb] [winfo manager .cb]
92	93	} -result [list 1 labelframe]
93	94
94		test labelframe-4.4 "Re-manage nonchild slave" -body {
	95	test labelframe-4.4 "Re-manage nonchild content" -body {
95	96	pack .cb -side right
96	97	list [update; winfo viewable .cb] \
97	98	[winfo manager .cb] \
98	99	[.lf cget -labelwidget]
99	100	} -result [list 1 pack {}]
100	101
101		test labelframe-4.5 "Re-add nonchild slave" -body {
	102	test labelframe-4.5 "Re-add nonchild content" -body {
102	103	.lf configure -labelwidget .cb
103	104	list [update; winfo viewable .cb] \
104	105	[winfo manager .cb] \
105	106	[.lf cget -labelwidget]
106	107	} -result [list 1 labelframe .cb]
107	108
108		test labelframe-4.6 "Destroy nonchild slave" -body {
	109	test labelframe-4.6 "Destroy nonchild content" -body {
109	110	destroy .cb
110	111	.lf cget -labelwidget
111	112	} -result {}

+3

-2

tests/ttk/layout.test less more

0		package require Tk 8.5
1		package require tcltest ; namespace import -force tcltest::*
	0	package require Tk
	1	package require tcltest 2.2
	2	namespace import -force tcltest::*
2	3	loadTestedCommands
3	4
4	5	test layout-1.1 "Size computations for mixed-orientation layouts" -body {

+5

-4

tests/ttk/notebook.test less more

0		package require Tk 8.5
1		package require tcltest ; namespace import -force tcltest::*
	0	package require Tk
	1	package require tcltest 2.2
	2	namespace import -force tcltest::*
2	3	loadTestedCommands
3	4
4	5	test notebook-1.0 "Setup" -body {

23	24	.nb add [toplevel .nb.t]
24	25	} -cleanup {
25	26	destroy .t.nb
26		} -returnCodes 1 -match glob -result "can't add .nb.t*"
	27	} -returnCodes error -match glob -result "can't add .nb.t*"
27	28
28	29	test notebook-1.4 "Try to select bad tab" -body {
29	30	.nb select @6000,6000
30		} -returnCodes 1 -match glob -result "* not found"
	31	} -returnCodes error -match glob -result "* not found"
31	32
32	33	#
33	34	# Now add stuff:

+13

-12

tests/ttk/panedwindow.test less more

0		package require Tk 8.5
1		package require tcltest ; namespace import -force tcltest::*
	0	package require Tk
	1	package require tcltest 2.2
	2	namespace import -force tcltest::*
2	3	loadTestedCommands
3	4
4	5	proc propagate-geometry {} { update idletasks }

45	46
46	47	test panedwindow-1.8 "Re-forget pane" -body {
47	48	.pw forget .pw.f1
48		} -returnCodes 1 -result ".pw.f1 is not managed by .pw"
	49	} -returnCodes error -result ".pw.f1 is not managed by .pw"
49	50
50	51	test panedwindow-1.end "Cleanup" -body {
51	52	destroy .pw

109	110	#
110	111	test panedwindow-3.0 "configure pane" -body {
111	112	ttk::panedwindow .pw
112		.pw add [listbox .pw.lb1]
113		.pw add [listbox .pw.lb2]
	113	.pw add [listbox .pw.lb1]
	114	.pw add [listbox .pw.lb2]
114	115	.pw pane 1 -weight 2
115	116	.pw pane 1 -weight
116	117	} -result 2
117	118
118	119	test panedwindow-3.1 "configure pane -- errors" -body {
119	120	.pw pane 1 -weight -4
120		} -returnCodes 1 -match glob -result "-weight must be nonnegative"
	121	} -returnCodes error -match glob -result "-weight must be nonnegative"
121	122
122	123	test panedwindow-3.2 "add pane -- errors" -body {
123	124	.pw add [ttk::label .pw.l] -weight -1
124		} -returnCodes 1 -match glob -result "-weight must be nonnegative"
	125	} -returnCodes error -match glob -result "-weight must be nonnegative"
125	126
126	127
127	128	test panedwindow-3.end "cleanup" -body { destroy .pw }

145	146
146	147	test panedwindow-4.2 "forget forgotten" -body {
147	148	.pw forget .pw.l1
148		} -returnCodes 1 -result ".pw.l1 is not managed by .pw"
	149	} -returnCodes error -result ".pw.l1 is not managed by .pw"
149	150
150	151	# checkorder $winlist --
151	152	# Ensure that Y coordinates windows in $winlist are strictly increasing.

252	253	frame .pw.f2 -width 100 -height 50
253	254
254	255	list [winfo reqwidth .pw.f1] [winfo reqheight .pw.f1]
255		} -result [list 100 50]
	256	} -result [list 100 50]
256	257
257	258	test paned-propagation-1 "Initial request size" -body {
258	259	.pw add .pw.f1

261	262	list [winfo reqwidth .pw] [winfo reqheight .pw]
262	263	} -result [list 100 105]
263	264
264		test paned-propagation-2 "Slave change before map" -body {
	265	test paned-propagation-2 "Pane change before map" -body {
265	266	.pw.f1 configure -width 200 -height 100
266	267	propagate-geometry
267	268	list [winfo reqwidth .pw] [winfo reqheight .pw]

273	274	list [winfo width .pw] [winfo height .pw] [.pw sashpos 0]
274	275	} -result [list 200 155 100]
275	276
276		test paned-propagation-4 "Slave change after map, off-axis" -body {
	277	test paned-propagation-4 "Pane change after map, off-axis" -body {
277	278	.pw.f1 configure -width 100 ;# should be granted
278	279	propagate-geometry
279	280	list [winfo reqwidth .pw] [winfo reqheight .pw] [.pw sashpos 0]
280	281	} -result [list 100 155 100]
281	282
282		test paned-propagation-5 "Slave change after map, on-axis" -body {
	283	test paned-propagation-5 "Pane change after map, on-axis" -body {
283	284	.pw.f1 configure -height 50 ;# should be denied
284	285	propagate-geometry
285	286	list [winfo reqwidth .pw] [winfo reqheight .pw] [.pw sashpos 0]

+4

-3

tests/ttk/progressbar.test less more

0		package require Tk 8.5
1		package require tcltest ; namespace import -force tcltest::*
	0	package require Tk
	1	package require tcltest 2.2
	2	namespace import -force tcltest::*
2	3	loadTestedCommands
3	4
4	5

75	76	trace variable PB w { error "YIPES!" ;# }
76	77	.pb step
77	78	set PB ;# NOTREACHED
78		} -cleanup { unset PB } -returnCodes 1 -match glob -result "*YIPES!"
	79	} -cleanup { unset PB } -returnCodes error -match glob -result "*YIPES!"
79	80
80	81	test progressbar-end "Cleanup" -body {
81	82	destroy .pb

+2

-1

tests/ttk/radiobutton.test less more

2	2	#
3	3
4	4	package require Tk
5		package require tcltest ; namespace import -force tcltest::*
	5	package require tcltest 2.2
	6	namespace import -force tcltest::*
6	7	loadTestedCommands
7	8
8	9	test radiobutton-1.1 "Radiobutton check" -body {

+8

-7

tests/ttk/scrollbar.test less more

0		package require Tk 8.5
1		package require tcltest ; namespace import -force tcltest::*
	0	package require Tk
	1	package require tcltest 2.2
	2	namespace import -force tcltest::*
2	3	loadTestedCommands
3	4
4	5	testConstraint coreScrollbar [expr {[tk windowingsystem] eq "aqua"}]

17	18	} -body {
18	19	ttk::scrollbar .sb -command "yadda"
19	20	list [winfo class .sb] [.sb cget -command]
20		} -result [list TScrollbar yadda] -cleanup {
21		destroy .sb
	21	} -result [list TScrollbar yadda] -cleanup {
	22	destroy .sb
22	23	}
23	24
24	25	test scrollbar-swapout-2 "... regardless of whether -style ..." \

27	28	} -body {
28	29	ttk::style layout Vertical.Custom.TScrollbar \
29	30	[ttk::style layout Vertical.TScrollbar] ; # See #1833339
30		ttk::scrollbar .sb -command "yadda" -style Custom.TScrollbar
	31	ttk::scrollbar .sb -command "yadda" -style Custom.TScrollbar
31	32	list [winfo class .sb] [.sb cget -command] [.sb cget -style]
32	33	} -result [list TScrollbar yadda Custom.TScrollbar] -cleanup {
33	34	destroy .sb

36	37	test scrollbar-swapout-3 "... or -class is specified." -constraints {
37	38	coreScrollbar
38	39	} -body {
39		ttk::scrollbar .sb -command "yadda" -class Custom.TScrollbar
	40	ttk::scrollbar .sb -command "yadda" -class Custom.TScrollbar
40	41	list [winfo class .sb] [.sb cget -command]
41	42	} -result [list Custom.TScrollbar yadda] -cleanup {
42	43	destroy .sb

78	79	ttk::scale .s -variable v
79	80	pack .s ; update
80	81	.s set 1 ; update
81		} -returnCodes 1 -match glob -result "*"
	82	} -returnCodes error -match glob -result "*"
82	83
83	84	test scale-2.1 "-state option" -setup {
84	85	ttk::scale .s

+71

-7

tests/ttk/spinbox.test less more

2	2	#
3	3
4	4	package require Tk
5		package require tcltest ; namespace import -force tcltest::*
	5	package require tcltest 2.2
	6	namespace import -force tcltest::*
6	7	loadTestedCommands
7	8
8	9	test spinbox-1.0 "Spinbox tests -- setup" -body {

147	148	set ::spinbox_test
148	149	} -cleanup {
149	150	destroy .sb
150		} -result {50}
	151	} -result 50
151	152
152	153
153	154	test spinbox-2.0 "current command -- unset should be 0" -constraints nyi -setup {

203	204	set ::spinbox_test {}
204	205	ttk::spinbox .sb -from 0 -to 10 -textvariable SBV
205	206	} -body {
206		grid .sb -sticky ew
207	207	grid columnconfigure . 0 -weight 1
	208	update idletasks
	209	set timer [after 500 {set ::spinbox_test timedout}]
208	210	bind . <Map> {
209	211	after idle {
210	212	wm geometry . "210x80"
211		after 100 {set ::spinbox_test [.sb identify element 5 5]}
	213	update idletasks
	214	set ::spinbox_test [.sb identify element 25 5]
212	215	}
213	216	bind . <Map> {}
214	217	}
215		after 500 {set ::spinbox_wait 1} ; vwait ::spinbox_wait
	218	grid .sb -sticky ew
	219	vwait ::spinbox_test
216	220	set ::spinbox_test
217	221	} -cleanup {
218	222	destroy .sb
219	223	unset -nocomplain ::spinbox_test SBV
220	224	} -result {textarea}
	225
	226	test spinbox-4.0 "Increment with duplicates in -values, wrap" -setup {
	227	ttk::spinbox .sb -values {one two three 4 5 two six} -wrap true
	228	set max [expr {[llength [.sb cget -values]] + 2}]
	229	} -body {
	230	set ::spinbox_test [.sb get]
	231	for {set i 0} {$i < $max} {incr i} {
	232	event generate .sb <<Increment>>
	233	lappend ::spinbox_test [.sb get]
	234	}
	235	for {set i 0} {$i < $max} {incr i} {
	236	event generate .sb <<Decrement>>
	237	lappend ::spinbox_test [.sb get]
	238	}
	239	set ::spinbox_test
	240	} -cleanup {
	241	destroy .sb
	242	unset -nocomplain ::spinbox_test max
	243	} -result {one two three 4 5 two six one two one six two 5 4 three two one six}
	244
	245	test spinbox-4.1 "Increment with duplicates in -values, wrap, initial value set" -setup {
	246	ttk::spinbox .sb -values {one two three 4 5 two six} -wrap true
	247	set max [expr {[llength [.sb cget -values]] + 2}]
	248	} -body {
	249	.sb set three
	250	set ::spinbox_test [.sb get]
	251	for {set i 0} {$i < $max} {incr i} {
	252	event generate .sb <<Increment>>
	253	lappend ::spinbox_test [.sb get]
	254	}
	255	.sb set two ; # the first "two" in the -values list becomes the current value
	256	for {set i 0} {$i < $max} {incr i} {
	257	event generate .sb <<Decrement>>
	258	lappend ::spinbox_test [.sb get]
	259	}
	260	set ::spinbox_test
	261	} -cleanup {
	262	destroy .sb
	263	unset -nocomplain ::spinbox_test max
	264	} -result {three 4 5 two six one two three 4 5 one six two 5 4 three two one six}
	265
	266	test spinbox-4.2 "Increment with duplicates in -values, no wrap" -setup {
	267	ttk::spinbox .sb -values {one two three 4 5 two six} -wrap false
	268	set max [expr {[llength [.sb cget -values]] + 2}]
	269	} -body {
	270	set ::spinbox_test [.sb get]
	271	for {set i 0} {$i < $max} {incr i} {
	272	event generate .sb <<Increment>>
	273	lappend ::spinbox_test [.sb get]
	274	}
	275	for {set i 0} {$i < $max} {incr i} {
	276	event generate .sb <<Decrement>>
	277	lappend ::spinbox_test [.sb get]
	278	}
	279	set ::spinbox_test
	280	} -cleanup {
	281	destroy .sb
	282	unset -nocomplain ::spinbox_test max
	283	} -result {one two three 4 5 two six six six two 5 4 three two one one one one}
	284
221	285
222	286	# nostomp: NB intentional difference between ttk::spinbox and tk::spinbox;
223	287	# see also #1439266

252	316
253	317	test spinbox-nostomp-4 "don't stomp on -variable (configure; -values)" -body {
254	318	set SBV Apr
255		ttk::spinbox .sb
	319	ttk::spinbox .sb
256	320	.sb configure -textvariable SBV -values {Jan Feb Mar Apr May Jun Jul Aug}
257	321	list $SBV [.sb get]
258	322	} -cleanup {

277	341	event generate .sb <<Decrement>>; lappend result $secs
278	342
279	343	set result
280		} -result [list 07 08 09 10 11 10 09 08 07] -cleanup {
	344	} -result [list 07 08 09 10 11 10 09 08 07] -cleanup {
281	345	destroy .sb
282	346	unset secs
283	347	}

+6

-5

tests/ttk/treetags.test less more

0	0
1	1	package require Tk
2		package require tcltest ; namespace import -force tcltest::*
	2	package require tcltest 2.2
	3	namespace import -force tcltest::*
3	4	loadTestedCommands
4	5
5	6	### treeview tag invariants:

104	105	} -result [list tag1 tag2 tag3]
105	106
106	107	test treetags-1.9 "tag names - tag added to item" -body {
107		$tv item item1 -tags tag4
	108	$tv item item1 -tags tag4
108	109	lsort [$tv tag names]
109	110	} -result [list tag1 tag2 tag3 tag4]
110	111

164	165
165	166	test treetags-2.4 "Bad events" -body {
166	167	$tv tag bind bad <Enter> { puts "Entered!" }
167		} -returnCodes 1 -result "unsupported event <Enter>*" -match glob
	168	} -returnCodes error -result "unsupported event <Enter>*" -match glob
168	169
169	170	test treetags-3.0 "tag configure - set" -body {
170	171	$tv tag configure tag1 -foreground blue -background red

200	201	set result [list]
201	202	$tv tag bind rm1 <<Remove>> { lappend ::result rm1 [%W focus] <<Remove>> }
202	203	$tv tag bind rm2 <<Remove>> {
203		lappend ::result rm2 [%W focus] <<Remove>>
	204	lappend ::result rm2 [%W focus] <<Remove>>
204	205	%W item [%W focus] -tags {tag1}
205	206	}
206	207	$tv tag bind rm3 <<Remove>> { lappend ::result rm3 [%W focus] <<Remove>> }
207	208
208		$tv item item1 -tags {rm1 rm2 rm3}
	209	$tv item item1 -tags {rm1 rm2 rm3}
209	210	$tv focus item1
210	211	event generate $tv <<Remove>>
211	212	set result

+77

-22

tests/ttk/treeview.test less more

2	2	# what it currently does)
3	3	#
4	4
5		package require Tk 8.5
6		package require tcltest ; namespace import -force tcltest::*
	5	package require Tk
	6	package require tcltest 2.2
	7	namespace import -force tcltest::*
7	8	loadTestedCommands
8	9
9	10	# consistencyCheck --

44	45	test treeview-1.2 "Bad columns" -body {
45	46	#.tv configure -columns {illegal "list"value}
46	47	ttk::treeview .badtv -columns {illegal "list"value}
47		} -returnCodes 1 -result "list element in quotes followed by*" -match glob
	48	} -returnCodes error -result "list element in quotes followed by*" -match glob
48	49
49	50	test treeview-1.3 "bad displaycolumns" -body {
50	51	.tv configure -displaycolumns {a b d}
51		} -returnCodes 1 -result "Invalid column index d"
	52	} -returnCodes error -result "Invalid column index d"
52	53
53	54	test treeview-1.4 "more bad displaycolumns" -body {
54	55	.tv configure -displaycolumns {1 2 3}
55		} -returnCodes 1 -result "Column index 3 out of bounds"
	56	} -returnCodes error -result "Column index 3 out of bounds"
56	57
57	58	test treeview-1.5 "Don't forget to check negative numbers" -body {
58	59	.tv configure -displaycolumns {1 -2 3}
59		} -returnCodes 1 -result "Column index -2 out of bounds"
	60	} -returnCodes error -result "Column index -2 out of bounds"
60	61
61	62	# Item creation.
62	63	#
63	64	test treeview-2.1 "insert -- not enough args" -body {
64	65	.tv insert
65		} -returnCodes 1 -result "wrong # args: *" -match glob
	66	} -returnCodes error -result "wrong # args: *" -match glob
66	67
67	68	test treeview-2.3 "insert -- bad integer index" -body {
68	69	.tv insert {} badindex
69		} -returnCodes 1 -result "expected integer *" -match glob
	70	} -returnCodes error -result "expected integer *" -match glob
70	71
71	72	test treeview-2.4 "insert -- bad parent node" -body {
72	73	.tv insert badparent end
73		} -returnCodes 1 -result "Item badparent not found" -match glob
	74	} -returnCodes error -result "Item badparent not found" -match glob
74	75
75	76	test treeview-2.5 "insert -- finaly insert a node" -body {
76	77	.tv insert {} end -id newnode -text "New node"

82	83
83	84	test treeview-2.7 "insert -- prevent duplicate node names" -body {
84	85	.tv insert {} end -id newnode
85		} -returnCodes 1 -result "Item newnode already exists"
	86	} -returnCodes error -result "Item newnode already exists"
86	87
87	88	test treeview-2.8 "insert -- new node at end" -body {
88	89	.tv insert {} end -id lastnode

124	125
125	126	test treeview-2.14 "insert -- bad options" -body {
126	127	.tv insert {} end -badoption foo
127		} -returnCodes 1 -result {unknown option "-badoption"}
	128	} -returnCodes error -result {unknown option "-badoption"}
128	129
129	130	test treeview-2.15 "insert -- at position 0 w/no children" -body {
130	131	.tv insert newnode 0 -id newnode.n2 -text "Foo"

200	201	.tv detach [list {}]
201	202	update
202	203	consistencyCheck .tv
203		} -returnCodes 1 -result "Cannot detach root item"
	204	} -returnCodes error -result "Cannot detach root item"
204	205	consistencyCheck .tv
205	206
206	207	test treeview-3.12 "Reattach" -body {

273	274
274	275	test treeview-5.1 "item -- error checks" -body {
275	276	.tv item newnode -text "Bad values" -values "{bad}list"
276		} -returnCodes 1 -result "list element in braces followed by*" -match glob
	277	} -returnCodes error -result "list element in braces followed by*" -match glob
277	278
278	279	test treeview-5.2 "item -- error leaves options unchanged " -body {
279	280	.tv item newnode -text

296	297
297	298	test treeview-5.6 "set illegal cell" -body {
298	299	.tv set newnode #0 YYY
299		} -returnCodes 1 -result "Display column #0 cannot be set"
	300	} -returnCodes error -result "Display column #0 cannot be set"
300	301
301	302	test treeview-5.7 "set illegal cell" -body {
302	303	.tv set newnode 3 YY ;# 3 == current #columns
303		} -returnCodes 1 -result "Column index 3 out of bounds"
	304	} -returnCodes error -result "Column index 3 out of bounds"
304	305
305	306	test treeview-5.8 "set display columns" -body {
306	307	.tv configure -displaycolumns [list 2 1 0]

316	317
317	318	test treeview-5.10 "cannot set column -id" -body {
318	319	.tv column #1 -id X
319		} -returnCodes 1 -result "Attempt to change read-only option"
	320	} -returnCodes error -result "Attempt to change read-only option"
320	321
321	322	test treeview-5.11 "get" -body {
322	323	.tv set newnode #1

404	405
405	406	test treeview-7.2 "illegal move" -body {
406	407	.tv move d d2 end
407		} -returnCodes 1 -result "Cannot insert d as descendant of d2"
	408	} -returnCodes error -result "Cannot insert d as descendant of d2"
408	409
409	410	test treeview-7.3 "illegal move has no effect" -body {
410	411	consistencyCheck .tv

425	426
426	427	test treeview-7.6 "Replace children - illegal move" -body {
427	428	.tv children newnode.n1 [list newnode.n1 newnode.n2 newnode.n3]
428		} -returnCodes 1 -result "Cannot insert newnode.n1 as descendant of newnode.n1"
	429	} -returnCodes error -result "Cannot insert newnode.n1 as descendant of newnode.n1"
429	430
430	431	consistencyCheck .tv
431	432

456	457
457	458	test treeview-8.5 "Selection - bad operation" -body {
458	459	.tv selection badop foo
459		} -returnCodes 1 -match glob -result {bad selection operation "badop": must be *}
	460	} -returnCodes error -match glob -result {bad selection operation "badop": must be *}
460	461
461	462	test treeview-8.6 "Selection - <<TreeviewSelect>> on selection add" -body {
462	463	.tv selection set {}

506	507	} -cleanup {
507	508	destroy .tree
508	509	} -result {I006}
	510
	511	test treeview-9.2 {scrolling on see command - bug [14188104c3]} -setup {
	512	toplevel .top
	513	ttk::treeview .top.tree -show {} -height 10 -columns {label} \
	514	-yscrollcommand [list .top.vs set]
	515	ttk::scrollbar .top.vs -command {.top.tree yview}
	516	grid .top.tree -row 0 -column 0 -sticky ns
	517	grid .top.vs -row 0 -column 1 -sticky ns
	518	update
	519	proc setrows {n} {
	520	.top.tree delete [.top.tree children {}]
	521	for {set i 1} {$i <= $n} {incr i} {
	522	.top.tree insert {} end -id row$i \
	523	-values [list [format "Row %2.2d" $i]]
	524	}
	525	.top.tree see row1
	526	update idletasks
	527	}
	528	} -body {
	529	setrows 10
	530	set res [.top.vs get]
	531	setrows 20
	532	lappend res [expr [lindex [.top.vs get] 1] < 1]
	533	} -cleanup {
	534	destroy .top
	535	} -result {0.0 1.0 1}
	536
	537	test treeview-9.3 {scrolling on see command, requested item is closed} -setup {
	538	toplevel .top
	539	ttk::treeview .top.tree -show tree -height 10 -columns {label} \
	540	-yscrollcommand [list .top.vs set]
	541	ttk::scrollbar .top.vs -command {.top.tree yview}
	542	grid .top.tree -row 0 -column 0 -sticky ns
	543	grid .top.vs -row 0 -column 1 -sticky ns
	544
	545	.top.tree insert {} end -id a -text a
	546	.top.tree insert a end -id b -text b
	547	.top.tree insert b end -id c -text c
	548	.top.tree insert c end -id d -text d
	549	.top.tree insert d end -id e -text e
	550	for {set i 6} {$i <= 15} {incr i} {
	551	.top.tree insert {} end -id row$i \
	552	-values [list [format "Row %2.2d" $i]]
	553	}
	554	update
	555	} -body {
	556	set before [lindex [.top.vs get] 1]
	557	.top.tree see e
	558	update idletasks
	559	set after [lindex [.top.vs get] 1]
	560	expr $after < $before
	561	} -cleanup {
	562	destroy .top
	563	} -result {1}
509	564
510	565	### identify tests:
511	566	#

674	729
675	730	test treeview-368fa4561e "indicators cannot be clicked on leafs" -setup {
676	731	pack [ttk::treeview .tv]
677		.tv insert {} end -id foo -text "<-- (1) Click the blank space to my left"
	732	.tv insert {} end -id foo -text "<-- (1) Click the blank space to my left"
678	733	update
679	734	} -body {
680	735	foreach {x y w h} [.tv bbox foo #0] {}

693	748
694	749	test treeview-ce470f20fd-1 "dragging further than the right edge of the treeview is allowed" -setup {
695	750	pack [ttk::treeview .tv]
696		.tv heading #0 -text "Drag my right edge -->"
	751	.tv heading #0 -text "Drag my right edge -->"
697	752	update
698	753	} -body {
699	754	set res [.tv column #0 -width]

763	818	update idletasks ; # redisplay treeview
764	819	} -body {
765	820	# only some columns are displayed (and in a different order than declared
766		# in -columns), a non-displayed column becomes stretchable --> nothing
	821	# in -columns), a non-displayed column becomes stretchable --> nothing
767	822	# happens
768	823	set origTreeWidth [winfo width .tv]
769	824	set res [list [.tv column bar -width] [.tv column colA -width]]

+35

-21

tests/ttk/ttk.test less more

0	0
1		package require Tk 8.5
2		package require tcltest ; namespace import -force tcltest::*
	1	package require Tk
	2	package require tcltest 2.2
	3	namespace import -force tcltest::*
3	4	loadTestedCommands
4	5
5	6	proc skip args {}

30	31	trace variable sd w [list selfdestruct .sd]
31	32	update
32	33	.sd invoke
33		} -returnCodes 1
	34	} -returnCodes error
34	35	test ttk-6.2 "Checkbutton self-destructed" -body {
35	36	winfo exists .sd
36	37	} -result 0

144	145
145	146	test ttk-1.3 "Set bad style" -body {
146	147	.t configure -style "nosuchstyle"
147		} -returnCodes 1 -result {Layout nosuchstyle not found}
	148	} -returnCodes error -result {Layout nosuchstyle not found}
148	149
149	150	test ttk-1.4 "Original style preserved" -body {
150	151	.t cget -style

206	207	set ttk28 {}
207	208	pack [ttk::button .b -command {set ::ttk28 failed}]
208	209	update
209		} -body {
	210	} -body {
210	211	bind .b <ButtonPress-1> {after 0 {.b configure -state disabled}}
211	212	after 1 {event generate .b <ButtonPress-1>}
212	213	after 20 {event generate .b <ButtonRelease-1>}

233	234	# misc. error detection
234	235	test ttk-3.0 "Bad option" -body {
235	236	ttk::button .bad -badoption foo
236		} -returnCodes 1 -result {unknown option "-badoption"} -match glob
	237	} -returnCodes error -result {unknown option "-badoption"} -match glob
237	238
238	239	test ttk-3.1 "Make sure widget command not created" -body {
239	240	.bad state disabled
240		} -returnCodes 1 -result {invalid command name ".bad"} -match glob
	241	} -returnCodes error -result {invalid command name ".bad"} -match glob
241	242
242	243	test ttk-3.2 "Propagate errors from variable traces" -body {
243	244	set A 0

250	251
251	252	test ttk-3.3 "Constructor failure with cursor" -body {
252	253	ttk::button .b -cursor bottom_right_corner -style BadStyle
253		} -returnCodes 1 -result "Layout BadStyle not found"
	254	} -returnCodes error -result "Layout BadStyle not found"
254	255
255	256	test ttk-3.4 "SF#2009213" -body {
256	257	ttk::style configure TScale -sliderrelief {}

386	387
387	388	test ttk-9.1 "Traces on nonexistant namespaces" -body {
388	389	ttk::checkbutton .tcb -variable foo::bar
389		} -returnCodes 1 -result "parent namespace doesn't exist" -match glob
	390	} -returnCodes error -result "parent namespace doesn't exist" -match glob
390	391
391	392	test ttk-9.2 "Traces on nonexistant namespaces II" -body {
392	393	ttk::checkbutton .tcb -variable X
393	394	.tcb configure -variable foo::bar
394		} -returnCodes 1 -result "parent namespace doesn't exist" -match glob
	395	} -returnCodes error -result "parent namespace doesn't exist" -match glob
395	396
396	397	test ttk-9.3 "Restore saved options on configure error" -body {
397	398	.tcb cget -variable

456	457
457	458	test ttk-10.4 "Try to modify class resource" -body {
458	459	.f configure -class Bar
459		} -returnCodes 1 -match glob -result "read-only option"
	460	} -returnCodes error -match glob -result "read-only option"
460	461
461	462	test ttk-10.5 "Check class resource again" -body {
462	463	.f cget -class

505	506	.b configure -cursor arrow
506	507	.b cget -cursor
507	508	} -result arrow
	509
	510	test ttk-12.2.1 "-cursor option, widget doesn't overwrite it" -setup {
	511	ttk::treeview .tr
	512	pack .tr
	513	update
	514	} -body {
	515	.tr configure -cursor X_cursor
	516	event generate .tr <Motion>
	517	update
	518	.tr cget -cursor
	519	} -cleanup {
	520	destroy .tr
	521	} -result {X_cursor}
508	522
509	523	test ttk-12.3 "-borderwidth frame option" -body {
510	524	destroy .t

533	547
534	548	test ttk-13.1 "Custom styles -- bad -style option" -body {
535	549	ttk::button .tb1 -style badstyle
536		} -returnCodes 1 -result "badstyle not found" -match glob
	550	} -returnCodes error -result "badstyle not found" -match glob
537	551
538	552	test ttk-13.4 "Custom styles -- bad -style option" -body {
539	553	ttk::button .tb1
540	554	.tb1 configure -style badstyle
541	555	} -cleanup {
542	556	destroy .tb1
543		} -returnCodes 1 -result "badstyle not found" -match glob
	557	} -returnCodes error -result "badstyle not found" -match glob
544	558
545	559	test ttk-13.5 "Custom layouts -- missing element definition" -body {
546	560	ttk::style layout badstyle {

558	572
559	573	test ttk-14.1 "-variable in nonexistant namespace" -body {
560	574	ttk::checkbutton .tw -variable ::nsn::foo
561		} -returnCodes 1 -result {can't trace *: parent namespace doesn't exist} \
	575	} -returnCodes error -result {can't trace *: parent namespace doesn't exist} \
562	576	-match glob -cleanup { destroy .tw }
563	577
564	578	test ttk-14.2 "-textvariable in nonexistant namespace" -body {
565	579	ttk::label .tw -textvariable ::nsn::foo
566		} -returnCodes 1 -result {can't trace *: parent namespace doesn't exist} \
	580	} -returnCodes error -result {can't trace *: parent namespace doesn't exist} \
567	581	-match glob -cleanup { destroy .tw }
568	582
569	583	test ttk-14.3 "-textvariable in nonexistant namespace" -body {
570	584	ttk::entry .tw -textvariable ::nsn::foo
571		} -returnCodes 1 -result {can't trace *: parent namespace doesn't exist} \
	585	} -returnCodes error -result {can't trace *: parent namespace doesn't exist} \
572	586	-match glob -cleanup { destroy .tw }
573	587
574	588	test ttk-15.1 {Bug 3062331} -setup {

614	628
615	629	test ttk-ensemble-0 "style element create: insufficient args" -body {
616	630	ttk::style
617		} -returnCodes 1 -result \
	631	} -returnCodes error -result \
618	632	[wrong#varargs arg ttk::style option]
619	633
620	634	test ttk-ensemble-1 "style element create: insufficient args" -body {
621	635	ttk::style element
622		} -returnCodes 1 -result \
	636	} -returnCodes error -result \
623	637	[wrong#varargs arg ttk::style element option]
624	638
625	639	test ttk-ensemble-2 "style element create: insufficient args" -body {
626	640	ttk::style element create
627		} -returnCodes 1 -result \
	641	} -returnCodes error -result \
628	642	[wrong#varargs {-option value} ttk::style element create name type]
629	643
630	644	test ttk-ensemble-3 "style element create: insufficient args" -body {
631	645	ttk::style element create plain.background
632		} -returnCodes 1 -result \
	646	} -returnCodes error -result \
633	647	[wrong#varargs {-option value} ttk::style element create name type]
634	648
635	649	test ttk-ensemble-4 "style element create: insufficient args" -body {
636	650	ttk::style element create plain.background from
637		} -returnCodes 1 -result [wrong#args theme ?element?]
	651	} -returnCodes error -result [wrong#args theme ?element?]
638	652
639	653	test ttk-ensemble-5 "style element create: valid" -body {
640	654	ttk::style element create plain.background from default

+3

-3

tests/ttk/validate.test less more

2	2	## Derived from core test suite entry-19.1 through entry-19.20
3	3	##
4	4
5		package require Tk 8.5
6		package require tcltest 2.1
	5	package require Tk
	6	package require tcltest 2.2
7	7	namespace import -force tcltest::*
8	8
9	9	loadTestedCommands

160	160	list [.e cget -validate] $::vVals
161	161	} -result {none {.e -1 -1 nextdata newdata {} all forced}}
162	162	# DIFFERENCE: ttk::entry doesn't validate when setting linked -variable
163		# DIFFERENCE: ttk::entry doesn't disable validation
	163	# DIFFERENCE: ttk::entry doesn't disable validation
164	164
165	165	proc doval {W d i P s S v V} {
166	166	set ::vVals [list $W $d $i $P $s $S $v $V]

+4

-3

tests/ttk/vsapi.test less more

0	0	# -- tcl --
1	1	#
2	2
3		package require Tk 8.5
4		package require tcltest ; namespace import -force tcltest::*
	3	package require Tk
	4	package require tcltest 2.2
	5	namespace import -force tcltest::*
5	6	loadTestedCommands
6	7
7	8	testConstraint xpnative \
8		[expr {[lsearch -exact [ttk::style theme names] xpnative] != -1}]
	9	[expr {"xpnative" in [ttk::style theme names]}]
9	10
10	11	test vsapi-1.1 "WINDOW WP_SMALLCLOSEBUTTON" -constraints {xpnative} -body {
11	12	ttk::style element create smallclose vsapi \

+8

-8

tests/unixButton.test less more

15	15
16	16	# Create entries in the option database to be sure that geometry options
17	17	# like border width have predictable values.
18
	18
19	19	option add *Label.borderWidth 2
20	20	option add *Label.highlightThickness 0
21	21	option add *Label.font {Helvetica -12 bold}

69	69	[expr {72 + $bigIndicator}] 52 \
70	70	[expr {72 + $bigIndicator}] 52]
71	71	test unixbutton-1.2 {TkpComputeButtonGeometry procedure} -constraints {
72		unix
	72	unix
73	73	} -setup {
74	74	deleteWindows
75	75	} -body {

90	90	[expr {27 + $smallIndicator}] 37 \
91	91	[expr {27 + $smallIndicator}] 37]
92	92	test unixbutton-1.3 {TkpComputeButtonGeometry procedure} -constraints {
93		unix
	93	unix
94	94	} -setup {
95	95	deleteWindows
96	96	} -body {

191	191	deleteWindows
192	192	} -result {62 30 56 24 58 22 62 22}
193	193	test unixbutton-1.9 {TkpComputeButtonGeometry procedure} -constraints {
194		unix
	194	unix
195	195	} -setup {
196	196	deleteWindows
197	197	} -body {

199	199	list [winfo reqwidth .b2] [winfo reqheight .b2]
200	200	} -cleanup {
201	201	deleteWindows
202		} -result [list [expr {17 + $defaultBorder}] [expr {27 + $defaultBorder}]]
	202	} -result [list [expr {17 + $defaultBorder}] [expr {27 + $defaultBorder}]]
203	203	test unixbutton-1.10 {TkpComputeButtonGeometry procedure} -constraints {
204		unix
	204	unix
205	205	} -setup {
206	206	deleteWindows
207	207	} -body {

211	211	deleteWindows
212	212	} -result [list [expr {17 + $defaultBorder}] [expr {27 + $defaultBorder}]]
213	213	test unixbutton-1.11 {TkpComputeButtonGeometry procedure} -constraints {
214		unix
	214	unix
215	215	} -setup {
216	216	deleteWindows
217	217	} -body {

223	223
224	224
225	225	test unixbutton-2.1 {disabled coloring check, bug 669595} -constraints {
226		unix
	226	unix
227	227	} -setup {
228	228	deleteWindows
229	229	catch {unset value}

+225

-222

tests/unixEmbed.test less more

10	10	tcltest::loadTestedCommands
11	11	namespace import -force tcltest::test
12	12
	13	testConstraint failsOnUbuntu [expr {![info exists ::env(CI)] \|\| ![string match Linux $::tcl_platform(os)]}]
	14	testConstraint failsOnXQuarz [expr {$tcl_platform(os) ne "Darwin" \|\| [tk windowingsystem] ne "x11" }]
	15
13	16	namespace eval ::_test_tmp {}
14	17
15	18	# ------------------------------------------------------------------------------
16	19	# Proc ::_test_tmp::testInterp
17	20	# ------------------------------------------------------------------------------
18		# Command that creates an unsafe child interpreter and tries to load Tk.
	21	# Command that creates an child interpreter and tries to load Tk.
19	22	# This code is borrowed from safePrimarySelection.test
20	23	# This is necessary for loading Tktest if the tests are done in the build
21	24	# directory without installing Tk. In that case the usual auto_path loading

149	152	unix testembed
150	153	} -setup {
151	154	deleteWindows
152		catch {interp delete slave}
153		::_test_tmp::testInterp slave
154		load {} Tktest slave
	155	catch {interp delete child}
	156	::_test_tmp::testInterp child
	157	load {} Tktest child
155	158	} -body {
156	159	frame .f1 -container 1 -width 200 -height 50
157	160	frame .f2 -container 1 -width 200 -height 50
158	161	pack .f1 .f2
159		slave alias w winfo id .f1
160		slave eval {
	162	child alias w winfo id .f1
	163	child eval {
161	164	destroy [winfo child .]
162	165	toplevel .t -use [w]
163	166	list [testembed] [expr {[lindex [lindex [testembed all] 0] 0] - [w]}]
164	167	}
165	168	} -cleanup {
166		interp delete slave
	169	interp delete child
167	170	deleteWindows
168	171	} -result {{{XXX {} {} .t}} 0}
169	172	test unixEmbed-1.6 {TkpUseWindow procedure, creating Container records} -constraints {

189	192	unix testembed
190	193	} -setup {
191	194	deleteWindows
192		catch {interp delete slave}
193		::_test_tmp::testInterp slave
194		load {} Tktest slave
	195	catch {interp delete child}
	196	::_test_tmp::testInterp child
	197	load {} Tktest child
195	198	} -body {
196	199	frame .f1 -container 1 -width 200 -height 50
197	200	frame .f2 -container 1 -width 200 -height 50
198	201	pack .f1 .f2
199		slave alias w1 winfo id .f1
200		slave alias w2 winfo id .f2
201		slave eval {
	202	child alias w1 winfo id .f1
	203	child alias w2 winfo id .f2
	204	child eval {
202	205	destroy [winfo child .]
203	206	toplevel .t1 -use [w1]
204	207	toplevel .t2 -use [w2]
205	208	testembed
206	209	}
207	210	} -cleanup {
208		interp delete slave
	211	interp delete child
209	212	deleteWindows
210	213	} -result {{XXX {} {} .t2} {XXX {} {} .t1}}
211	214	test unixEmbed-1.7 {TkpUseWindow procedure, container and embedded in same app} -constraints {

252	255	unix testembed
253	256	} -setup {
254	257	deleteWindows
255		catch {interp delete slave}
256		::_test_tmp::testInterp slave
257		load {} Tktest slave
258		} -body {
259		frame .f1 -container 1 -width 200 -height 50
260		pack .f1
261		slave alias w1 winfo id .f1
262		slave eval {
	258	catch {interp delete child}
	259	::_test_tmp::testInterp child
	260	load {} Tktest child
	261	} -body {
	262	frame .f1 -container 1 -width 200 -height 50
	263	pack .f1
	264	child alias w1 winfo id .f1
	265	child eval {
263	266	destroy [winfo child .]
264	267	toplevel .t1 -use [w1]
265	268	testembed
266	269	}
267	270	destroy .f1
268	271	update
269		slave eval {
	272	child eval {
270	273	testembed
271	274	}
272	275	} -cleanup {

294	297	unix testembed
295	298	} -setup {
296	299	deleteWindows
297		catch {interp delete slave}
298		::_test_tmp::testInterp slave
299		load {} Tktest slave
300		} -body {
301		frame .f1 -container 1 -width 200 -height 50
302		pack .f1
303		slave alias w1 winfo id .f1
304		slave eval {
	300	catch {interp delete child}
	301	::_test_tmp::testInterp child
	302	load {} Tktest child
	303	} -body {
	304	frame .f1 -container 1 -width 200 -height 50
	305	pack .f1
	306	child alias w1 winfo id .f1
	307	child eval {
305	308	destroy [winfo child .]
306	309	toplevel .t1 -use [w1]
307	310	testembed

309	312	testembed
310	313	}
311	314	} -cleanup {
312		interp delete slave
	315	interp delete child
313	316	deleteWindows
314	317	} -result {}
315	318	test unixEmbed-2.3 {EmbeddedEventProc procedure} -constraints {

360	363	test unixEmbed-3.1a {ContainerEventProc procedure, detect creation} -constraints {
361	364	unix testembed
362	365	} -setup {
363		catch {interp delete slave}
364		::_test_tmp::testInterp slave
365		load {} Tktest slave
366		} -body {
367		frame .f1 -container 1 -width 200 -height 50
368		pack .f1
369		slave alias w1 winfo id .f1
	366	catch {interp delete child}
	367	::_test_tmp::testInterp child
	368	load {} Tktest child
	369	} -body {
	370	frame .f1 -container 1 -width 200 -height 50
	371	pack .f1
	372	child alias w1 winfo id .f1
370	373	set x [testembed]
371		slave eval {
	374	child eval {
372	375	destroy [winfo child .]
373	376	toplevel .t1 -use [w1]
374	377	wm withdraw .t1
375	378	}
376	379	list $x [testembed]
377	380	} -cleanup {
378		interp delete slave
	381	interp delete child
379	382	deleteWindows
380	383	} -result {{{XXX .f1 {} {}}} {{XXX .f1 {} {}}}}
381	384	test unixEmbed-3.2 {ContainerEventProc procedure, set size on creation} -constraints {

417	420	unix
418	421	} -setup {
419	422	deleteWindows
420		catch {interp delete slave}
421		::_test_tmp::testInterp slave
422		load {} Tktest slave
423		} -body {
424		frame .f1 -container 1 -width 200 -height 50
425		pack .f1
426		slave alias w1 winfo id .f1
427		slave eval {
	423	catch {interp delete child}
	424	::_test_tmp::testInterp child
	425	load {} Tktest child
	426	} -body {
	427	frame .f1 -container 1 -width 200 -height 50
	428	pack .f1
	429	child alias w1 winfo id .f1
	430	child eval {
428	431	destroy [winfo child .]
429	432	toplevel .t1 -use [w1] -bd 2 -relief raised
430	433	update

433	436	wm geometry .t1
434	437	}
435	438	} -cleanup {
436		interp delete slave
	439	interp delete child
437	440	deleteWindows
438	441	} -result {200x200+0+0}
439	442	test unixEmbed-3.4 {ContainerEventProc procedure, disallow position changes} -constraints {

461	464	unix
462	465	} -setup {
463	466	deleteWindows
464		catch {interp delete slave}
465		::_test_tmp::testInterp slave
466		load {} Tktest slave
467		} -body {
468		frame .f1 -container 1 -width 200 -height 50
469		pack .f1
470		slave alias w1 winfo id .f1
471		slave eval {
	467	catch {interp delete child}
	468	::_test_tmp::testInterp child
	469	load {} Tktest child
	470	} -body {
	471	frame .f1 -container 1 -width 200 -height 50
	472	pack .f1
	473	child alias w1 winfo id .f1
	474	child eval {
472	475	destroy [winfo child .]
473	476	toplevel .t1 -use [w1]
474	477	update

477	480	wm geometry .t1
478	481	}
479	482	} -cleanup {
480		interp delete slave
	483	interp delete child
481	484	deleteWindows
482	485	} -result {300x100+0+0}
483	486	test unixEmbed-3.5 {ContainerEventProc procedure, geometry requests} -constraints {

505	508	unix
506	509	} -setup {
507	510	deleteWindows
508		catch {interp delete slave}
509		::_test_tmp::testInterp slave
510		load {} Tktest slave
511		} -body {
512		frame .f1 -container 1 -width 200 -height 50
513		pack .f1
514		slave alias w1 winfo id .f1
515		slave eval {
	511	catch {interp delete child}
	512	::_test_tmp::testInterp child
	513	load {} Tktest child
	514	} -body {
	515	frame .f1 -container 1 -width 200 -height 50
	516	pack .f1
	517	child alias w1 winfo id .f1
	518	child eval {
516	519	destroy [winfo child .]
517	520	toplevel .t1 -use [w1]
518	521	.t1 configure -width 300 -height 80
519	522	update
520	523	}
521		list [winfo width .f1] [winfo height .f1] [slave eval {wm geometry .t1}]
522		} -cleanup {
523		interp delete slave
	524	list [winfo width .f1] [winfo height .f1] [child eval {wm geometry .t1}]
	525	} -cleanup {
	526	interp delete child
524	527	deleteWindows
525	528	} -result {300 80 300x80+0+0}
526	529	test unixEmbed-3.6 {ContainerEventProc procedure, map requests} -constraints {

550	553	unix
551	554	} -setup {
552	555	deleteWindows
553		catch {interp delete slave}
554		::_test_tmp::testInterp slave
555		load {} Tktest slave
556		} -body {
557		frame .f1 -container 1 -width 200 -height 50
558		pack .f1
559		slave alias w1 winfo id .f1
560		slave eval {
	556	catch {interp delete child}
	557	::_test_tmp::testInterp child
	558	load {} Tktest child
	559	} -body {
	560	frame .f1 -container 1 -width 200 -height 50
	561	pack .f1
	562	child alias w1 winfo id .f1
	563	child eval {
561	564	destroy [winfo child .]
562	565	toplevel .t1 -use [w1]
563	566	set x unmapped

568	571	set x
569	572	}
570	573	} -cleanup {
571		interp delete slave
	574	interp delete child
572	575	deleteWindows
573	576	} -result {mapped}
574	577	test unixEmbed-3.7 {ContainerEventProc procedure, destroy events} -constraints {

598	601	unix
599	602	} -setup {
600	603	deleteWindows
601		catch {interp delete slave}
602		::_test_tmp::testInterp slave
603		load {} Tktest slave
604		} -body {
605		frame .f1 -container 1 -width 200 -height 50
606		pack .f1
607		slave alias w1 winfo id .f1
	604	catch {interp delete child}
	605	::_test_tmp::testInterp child
	606	load {} Tktest child
	607	} -body {
	608	frame .f1 -container 1 -width 200 -height 50
	609	pack .f1
	610	child alias w1 winfo id .f1
608	611	bind .f1 <Destroy> {set x dead}
609	612	set x alive
610		slave eval {
	613	child eval {
611	614	destroy [winfo child .]
612	615	toplevel .t1 -use [w1]
613	616	update

616	619	update
617	620	list $x [winfo exists .f1]
618	621	} -cleanup {
619		interp delete slave
	622	interp delete child
620	623	deleteWindows
621	624	} -result {dead 0}
622	625

647	650	unix
648	651	} -setup {
649	652	deleteWindows
650		catch {interp delete slave}
651		::_test_tmp::testInterp slave
652		load {} Tktest slave
653		} -body {
654		frame .f1 -container 1 -width 200 -height 50
655		pack .f1
656		slave alias w1 winfo id .f1
657		slave eval {
	653	catch {interp delete child}
	654	::_test_tmp::testInterp child
	655	load {} Tktest child
	656	} -body {
	657	frame .f1 -container 1 -width 200 -height 50
	658	pack .f1
	659	child alias w1 winfo id .f1
	660	child eval {
658	661	destroy [winfo child .]
659	662	toplevel .t1 -use [w1]
660	663	update

663	666	winfo geometry .t1
664	667	}
665	668	} -cleanup {
666		interp delete slave
	669	interp delete child
667	670	deleteWindows
668	671	} -result {180x100+0+0}
669	672	test unixEmbed-4.2 {EmbedStructureProc procedure, destroy events} -constraints {

690	693	unix testembed
691	694	} -setup {
692	695	deleteWindows
693		catch {interp delete slave}
694		::_test_tmp::testInterp slave
695		load {} Tktest slave
696		} -body {
697		frame .f1 -container 1 -width 200 -height 50
698		pack .f1
699		update
700		slave alias w1 winfo id .f1
701		slave eval {
	696	catch {interp delete child}
	697	::_test_tmp::testInterp child
	698	load {} Tktest child
	699	} -body {
	700	frame .f1 -container 1 -width 200 -height 50
	701	pack .f1
	702	update
	703	child alias w1 winfo id .f1
	704	child eval {
702	705	destroy [winfo child .]
703	706	toplevel .t1 -use [w1]
704	707	}

706	709	destroy .f1
707	710	list $x [testembed]
708	711	} -cleanup {
709		interp delete slave
	712	interp delete child
710	713	deleteWindows
711	714	} -result "{{XXX .f1 {} {}}} {}"
712	715

736	739	unix
737	740	} -setup {
738	741	deleteWindows
739		catch {interp delete slave}
740		::_test_tmp::testInterp slave
741		load {} Tktest slave
742		} -body {
743		frame .f1 -container 1 -width 200 -height 50
744		pack .f1
745		slave alias w1 winfo id .f1
746		slave eval {
	742	catch {interp delete child}
	743	::_test_tmp::testInterp child
	744	load {} Tktest child
	745	} -body {
	746	frame .f1 -container 1 -width 200 -height 50
	747	pack .f1
	748	child alias w1 winfo id .f1
	749	child eval {
747	750	destroy [winfo child .]
748	751	toplevel .t1 -use [w1]
749	752	bind .t1 <FocusIn> {lappend x "focus in %W"}

753	756	}
754	757	focus -force .f1
755	758	update
756		slave eval {set x}
757		} -cleanup {
758		interp delete slave
	759	child eval {set x}
	760	} -cleanup {
	761	interp delete child
759	762	deleteWindows
760	763	} -result {{focus in .t1}}
761	764	test unixEmbed-5.2 {EmbedFocusProc procedure, focusing on dead window} -constraints {

784	787	unix
785	788	} -setup {
786	789	deleteWindows
787		catch {interp delete slave}
788		::_test_tmp::testInterp slave
789		load {} Tktest slave
790		} -body {
791		frame .f1 -container 1 -width 200 -height 50
792		pack .f1
793		slave alias w1 winfo id .f1
794		slave eval {
	790	catch {interp delete child}
	791	::_test_tmp::testInterp child
	792	load {} Tktest child
	793	} -body {
	794	frame .f1 -container 1 -width 200 -height 50
	795	pack .f1
	796	child alias w1 winfo id .f1
	797	child eval {
795	798	destroy [winfo child .]
796	799	toplevel .t1 -use [w1]
797	800	update

801	804	focus -force .f1
802	805	update
803	806	} -cleanup {
804		interp delete slave
	807	interp delete child
805	808	deleteWindows
806	809	} -result {}
807	810	test unixEmbed-5.3 {EmbedFocusProc procedure, FocusOut events} -constraints {

832	835	unix
833	836	} -setup {
834	837	deleteWindows
835		catch {interp delete slave}
836		::_test_tmp::testInterp slave
837		load {} Tktest slave
838		} -body {
839		frame .f1 -container 1 -width 200 -height 50
840		pack .f1
841		slave alias w1 winfo id .f1
842		slave eval {
	838	catch {interp delete child}
	839	::_test_tmp::testInterp child
	840	load {} Tktest child
	841	} -body {
	842	frame .f1 -container 1 -width 200 -height 50
	843	pack .f1
	844	child alias w1 winfo id .f1
	845	child eval {
843	846	destroy [winfo child .]
844	847	toplevel .t1 -use [w1]
845	848	set x {}

849	852	}
850	853	focus -force .f1
851	854	update
852		set x [slave eval {update; set x }]
	855	set x [child eval {update; set x }]
853	856	focus .
854	857	update
855		list $x [slave eval {update; set x}]
856		} -cleanup {
857		interp delete slave
	858	list $x [child eval {update; set x}]
	859	} -cleanup {
	860	interp delete child
858	861	deleteWindows
859	862	} -result {{{focus in .t1}} {{focus in .t1} {focus out .t1}}}
860	863

884	887	unix
885	888	} -setup {
886	889	deleteWindows
887		catch {interp delete slave}
888		::_test_tmp::testInterp slave
889		load {} Tktest slave
890		} -body {
891		frame .f1 -container 1 -width 200 -height 50
892		pack .f1
893		slave alias w1 winfo id .f1
894		slave eval {
	890	catch {interp delete child}
	891	::_test_tmp::testInterp child
	892	load {} Tktest child
	893	} -body {
	894	frame .f1 -container 1 -width 200 -height 50
	895	pack .f1
	896	child alias w1 winfo id .f1
	897	child eval {
895	898	destroy [winfo child .]
896	899	toplevel .t1 -use [w1]
897	900	update

902	905	list $x [winfo geom .t1]
903	906	}
904	907	} -cleanup {
905		interp delete slave
	908	interp delete child
906	909	deleteWindows
907	910	} -result {{configure .t1 300 120} 300x120+0+0}
908	911	test unixEmbed-6.2 {EmbedGeometryRequest procedure, window changes size} -constraints {

930	933	unix
931	934	} -setup {
932	935	deleteWindows
933		catch {interp delete slave}
934		::_test_tmp::testInterp slave
935		load {} Tktest slave
	936	catch {interp delete child}
	937	::_test_tmp::testInterp child
	938	load {} Tktest child
936	939	} -body {
937	940	frame .f1 -container 1 -width 200 -height 50
938	941	place .f1 -width 200 -height 200
939	942	update
940		slave alias w1 winfo id .f1
941		slave eval {
	943	child alias w1 winfo id .f1
	944	child eval {
942	945	destroy [winfo child .]
943	946	toplevel .t1 -use [w1]
944	947	update

949	952	list $x [winfo geom .t1]
950	953	}
951	954	} -cleanup {
952		interp delete slave
	955	interp delete child
953	956	deleteWindows
954	957	} -result {{configure .t1 200 200} 200x200+0+0}
955	958

987	990	# TkpRedirectKeyEvent is not implemented in win or aqua. If someone
988	991	# implements it they should change the constraints for this test.
989	992	test unixEmbed-7.1a {TkpRedirectKeyEvent procedure, forward keystroke} -constraints {
990		unix notAqua
991		} -setup {
992		deleteWindows
993		catch {interp delete slave}
994		::_test_tmp::testInterp slave
995		load {} Tktest slave
996		} -body {
997		deleteWindows
998		frame .f1 -container 1 -width 200 -height 50
999		pack .f1
1000		slave alias w1 winfo id .f1
1001		slave eval {
	993	unix notAqua failsOnXQuarz
	994	} -setup {
	995	deleteWindows
	996	catch {interp delete child}
	997	::_test_tmp::testInterp child
	998	load {} Tktest child
	999	} -body {
	1000	deleteWindows
	1001	frame .f1 -container 1 -width 200 -height 50
	1002	pack .f1
	1003	child alias w1 winfo id .f1
	1004	child eval {
1002	1005	destroy [winfo child .]
1003	1006	toplevel .t1 -use [w1]
1004	1007	}
1005	1008	focus -force .
1006	1009	bind . <KeyPress> {lappend x {key %A %E}}
1007	1010	set x {}
1008		set y [slave eval {
	1011	set y [child eval {
1009	1012	update
1010	1013	bind .t1 <KeyPress> {lappend y {key %A}}
1011	1014	set y {}

1015	1018	update
1016	1019	list $x $y
1017	1020	} -cleanup {
1018		interp delete slave
	1021	interp delete child
1019	1022	deleteWindows
1020	1023	bind . <KeyPress> {}
1021	1024	} -result {{{key a 1}} {}}

1053	1056	unix
1054	1057	} -setup {
1055	1058	deleteWindows
1056		catch {interp delete slave}
1057		::_test_tmp::testInterp slave
1058		load {} Tktest slave
1059		} -body {
1060		frame .f1 -container 1 -width 200 -height 50
1061		pack .f1
1062		slave alias w1 winfo id .f1
1063		slave eval {
	1059	catch {interp delete child}
	1060	::_test_tmp::testInterp child
	1061	load {} Tktest child
	1062	} -body {
	1063	frame .f1 -container 1 -width 200 -height 50
	1064	pack .f1
	1065	child alias w1 winfo id .f1
	1066	child eval {
1064	1067	destroy [winfo child .]
1065	1068	toplevel .t1 -use [w1]
1066	1069	}

1069	1072	update
1070	1073	bind . <KeyPress> {lappend x {key %A}}
1071	1074	set x {}
1072		set y [slave eval {
	1075	set y [child eval {
1073	1076	update
1074	1077	bind .t1 <KeyPress> {lappend y {key %A}}
1075	1078	set y {}

1079	1082	update
1080	1083	list $x $y
1081	1084	} -cleanup {
1082		interp delete slave
	1085	interp delete child
1083	1086	deleteWindows
1084	1087	bind . <KeyPress> {}
1085	1088	} -result {{} {{key b}}}
1086	1089
1087	1090	test unixEmbed-8.1 {TkpClaimFocus procedure} -constraints {
1088		unix notAqua
	1091	unix notAqua failsOnUbuntu failsOnXQuarz
1089	1092	} -setup {
1090	1093	deleteWindows
1091	1094	} -body {

1112	1115	} -result {{{} .t1} .f1}
1113	1116	test unixEmbed-8.1a {TkpClaimFocus procedure} -constraints unix -setup {
1114	1117	deleteWindows
1115		catch {interp delete slave}
1116		::_test_tmp::testInterp slave
1117		load {} Tktest slave
	1118	catch {interp delete child}
	1119	::_test_tmp::testInterp child
	1120	load {} Tktest child
1118	1121	} -body {
1119	1122	frame .f1 -container 1 -width 200 -height 50
1120	1123	frame .f2 -width 200 -height 50
1121	1124	pack .f1 .f2
1122	1125	update
1123		slave alias w1 winfo id .f1
1124		slave eval {
	1126	child alias w1 winfo id .f1
	1127	child eval {
1125	1128	destroy [winfo child .]
1126	1129	toplevel .t1 -use [w1] -highlightthickness 2 -bd 2 -relief sunken
1127	1130	}
1128	1131	# This should clear focus from the application embedded in .f1
1129	1132	focus -force .f2
1130	1133	update
1131		list [slave eval {
	1134	list [child eval {
1132	1135	set x [list [focus]]
1133	1136	focus .t1
1134	1137	update
1135	1138	lappend x [focus]
1136	1139	}] [focus]
1137	1140	} -cleanup {
1138		interp delete slave
	1141	interp delete child
1139	1142	deleteWindows
1140	1143	} -result {{{} .t1} .f1}
1141	1144	test unixEmbed-8.2 {TkpClaimFocus procedure} -constraints unix -setup {

1187	1190	deleteWindows
1188	1191	} -result {{{XXX .f4 {} {}} {XXX .f3 {} {}} {XXX .f2 {} {}} {XXX .f1 {} {}}} {{XXX .f4 {} {}} {XXX .f2 {} {}} {XXX .f1 {} {}}} {{XXX .f2 {} {}} {XXX .f1 {} {}}} {{XXX .f2 {} {}}} {}}
1189	1192	test unixEmbed-9.2 {EmbedWindowDeleted procedure, check embeddedPtr} -constraints {
1190		unix testembed notAqua
1191		} -setup {
1192		deleteWindows
	1193	unix testembed notAqua
	1194	} -setup {
	1195	deleteWindows
1193	1196	} -body {
1194	1197	frame .f1 -container 1 -width 200 -height 50
1195	1198	pack .f1

1210	1213	unix testembed
1211	1214	} -setup {
1212	1215	deleteWindows
1213		catch {interp delete slave}
1214		::_test_tmp::testInterp slave
1215		load {} Tktest slave
1216		} -body {
1217		frame .f1 -container 1 -width 200 -height 50
1218		pack .f1
1219		slave alias w1 winfo id .f1
1220		slave eval {
	1216	catch {interp delete child}
	1217	::_test_tmp::testInterp child
	1218	load {} Tktest child
	1219	} -body {
	1220	frame .f1 -container 1 -width 200 -height 50
	1221	pack .f1
	1222	child alias w1 winfo id .f1
	1223	child eval {
1221	1224	destroy [winfo child .]
1222	1225	toplevel .t1 -use [w1] -highlightthickness 2 -bd 2 -relief sunken
1223	1226	set x {}

1226	1229	lappend x [testembed]
1227	1230	}
1228	1231	} -cleanup {
1229		interp delete slave
	1232	interp delete child
1230	1233	deleteWindows
1231	1234	} -result {{{XXX {} {} .t1}} {}}
1232	1235
1233	1236
1234	1237	test unixEmbed-10.1 {geometry propagation in tkUnixWm.c/UpdateGeometryInfo} -constraints {
1235		unix
1236		} -setup {
1237		deleteWindows
1238		} -body {
1239		frame .f1 -container 1 -width 200 -height 50
1240		update
1241		pack .f1
1242		update
	1238	unix failsOnUbuntu failsOnXQuarz
	1239	} -setup {
	1240	deleteWindows
	1241	} -body {
	1242	frame .f1 -container 1 -width 200 -height 50
	1243	pack .f1
	1244	update idletasks
1243	1245	toplevel .t1 -use [winfo id .f1] -width 150 -height 80
1244		update
	1246	update idletasks
1245	1247	wm geometry .t1 +40+50
1246		update
	1248	update idletasks
1247	1249	wm geometry .t1
1248	1250	} -cleanup {
1249	1251	deleteWindows
1250	1252	} -result {150x80+0+0}
1251	1253	test unixEmbed-10.2 {geometry propagation in tkUnixWm.c/UpdateGeometryInfo} -constraints {
1252		unix
1253		} -setup {
1254		deleteWindows
1255		} -body {
1256		frame .f1 -container 1 -width 200 -height 50
1257		pack .f1
	1254	unix failsOnUbuntu failsOnXQuarz
	1255	} -setup {
	1256	deleteWindows
	1257	} -body {
	1258	frame .f1 -container 1 -width 200 -height 50
	1259	pack .f1
	1260	update idletasks
1258	1261	toplevel .t1 -use [winfo id .f1] -width 150 -height 80
1259		update
	1262	update idletasks
1260	1263	wm geometry .t1 70x300+10+20
1261		update
	1264	update idletasks
1262	1265	wm geometry .t1
1263	1266	} -cleanup {
1264	1267	deleteWindows
1265	1268	} -result {70x300+0+0}
1266	1269
1267	1270	test unixEmbed-11.1 {focus -force works for embedded toplevels} -constraints {
1268		unix
1269		} -setup {
1270		deleteWindows
	1271	unix
	1272	} -setup {
	1273	deleteWindows
1271	1274	} -body {
1272	1275	toplevel .t
1273	1276	pack [frame .t.f -container 1 -width 200 -height 200] -fill both

1281	1284	deleteWindows
1282	1285	} -result .embed
1283	1286	test unixEmbed-11.2 {mouse coordinates in embedded toplevels} -constraints {
1284		unix pressbutton
1285		} -setup {
1286		deleteWindows
	1287	unix pressbutton
	1288	} -setup {
	1289	deleteWindows
1287	1290	} -body {
1288	1291	toplevel .main
1289	1292	set result {}

+20

-16

tests/unixFont.test less more

11	11	# Copyright (c) 1998-1999 by Scriptics Corporation.
12	12	# All rights reserved.
13	13
14		package require tcltest 2.1
	14	package require tcltest 2.2
15	15	eval tcltest::configure $argv
16	16	tcltest::loadTestedCommands
	17
	18	testConstraint failsOnUbuntu [expr {![info exists ::env(CI)] \|\| ![string match Linux $::tcl_platform(os)]}]
	19	testConstraint failsOnUbuntuNoXft [expr {[testConstraint failsOnUbuntu] \|\| (![catch {tk::pkgconfig get fontsystem} fs] && ($fs eq "xft"))}]
	20	testConstraint failsOnXQuarz [expr {$tcl_platform(os) ne "Darwin" \|\| [tk windowingsystem] ne "x11" }]
17	21
18	22	if {[tk windowingsystem] eq "x11"} {
19	23	set xlsf [auto_execok xlsfonts]

68	72	test unixfont-1.1 {TkpGetNativeFont procedure: not native} {x11 noExceed} {
69	73	list [catch {font measure {} xyz} msg] $msg
70	74	} {1 {font "" doesn't exist}}
71		test unixfont-1.2 {TkpGetNativeFont procedure: native} x11 {
	75	test unixfont-1.2 {TkpGetNativeFont procedure: native} {x11 failsOnUbuntu} {
72	76	font measure fixed 0
73	77	} {6}
74	78

77	81	set x {}
78	82	} {}
79	83	test unixfont-2.2 {TkpGetFontFromAttributes procedure: Times relatives} \
80		{x11 noExceed hasTimesNew} {
	84	{x11 noExceed hasTimesNew failsOnUbuntu} {
81	85	set x {}
82	86	lappend x [lindex [font actual {-family "Times New Roman"}] 1]
83	87	lappend x [lindex [font actual {-family "New York"}] 1]
84	88	lappend x [lindex [font actual {-family "Times"}] 1]
85	89	} {times times times}
86	90	test unixfont-2.3 {TkpGetFontFromAttributes procedure: Courier relatives} \
87		{x11 noExceed hasCourierNew} {
	91	{x11 noExceed hasCourierNew failsOnUbuntu} {
88	92	set x {}
89	93	lappend x [lindex [font actual {-family "Courier New"}] 1]
90	94	lappend x [lindex [font actual {-family "Monaco"}] 1]
91	95	lappend x [lindex [font actual {-family "Courier"}] 1]
92	96	} {courier courier courier}
93	97	test unixfont-2.4 {TkpGetFontFromAttributes procedure: Helvetica relatives} \
94		{x11 noExceed hasArial} {
	98	{x11 noExceed hasArial failsOnUbuntu} {
95	99	set x {}
96	100	lappend x [lindex [font actual {-family "Arial"}] 1]
97	101	lappend x [lindex [font actual {-family "Geneva"}] 1]

101	105	font actual {-xyz-xyz------------}
102	106	set x {}
103	107	} {}
104		test unixfont-2.6 {TkpGetFontFromAttributes: fallback to fixed family} x11 {
	108	test unixfont-2.6 {TkpGetFontFromAttributes: fallback to fixed family} {x11 failsOnUbuntu} {
105	109	lindex [font actual {-family fixed -size 10}] 1
106	110	} {fixed}
107	111	test unixfont-2.7 {TkpGetFontFromAttributes: fixed family not available!} x11 {
108	112	# no test available
109	113	} {}
110		test unixfont-2.8 {TkpGetFontFromAttributes: loop over returned font names} x11 {
	114	test unixfont-2.8 {TkpGetFontFromAttributes: loop over returned font names} {x11 failsOnUbuntu} {
111	115	lindex [font actual {-family fixed -size 31}] 1
112	116	} {fixed}
113		test unixfont-2.9 {TkpGetFontFromAttributes: reject adobe courier if possible} {x11 noExceed} {
	117	test unixfont-2.9 {TkpGetFontFromAttributes: reject adobe courier if possible} {x11 noExceed failsOnUbuntu} {
114	118	lindex [font actual {-family courier}] 1
115	119	} {courier}
116		test unixfont-2.10 {TkpGetFontFromAttributes: scalable font found} x11 {
	120	test unixfont-2.10 {TkpGetFontFromAttributes: scalable font found} {x11 failsOnUbuntuNoXft} {
117	121	lindex [font actual {-family courier -size 37}] 3
118	122	} {37}
119	123	test unixfont-2.11 {TkpGetFontFromAttributes: font cannot be loaded} x11 {

165	169	.b.l config -text "000000 00000"
166	170	getsize
167	171	} "[expr $ax6] [expr $ay2]"
168		test unixfont-5.8 {Tk_MeasureChars procedure: internal spaces significant} x11 {
	172	test unixfont-5.8 {Tk_MeasureChars procedure: internal spaces significant} {x11 failsOnUbuntu} {
169	173	.b.l config -text "00 000 00000"
170	174	getsize
171	175	} "[expr $ax7] [expr $ay2]"
172		test unixfont-5.9 {Tk_MeasureChars procedure: TK_PARTIAL_OK} x11 {
	176	test unixfont-5.9 {Tk_MeasureChars procedure: TK_PARTIAL_OK} {x11 failsOnUbuntu} {
173	177	.b.c dchars $t 0 end
174	178	.b.c insert $t 0 "0000"
175	179	.b.c index $t @[expr int($ax*2.5)],1

185	189	.b.l config -wrap $a
186	190	set x
187	191	} "$ax [expr $ay*6]"
188		test unixfont-5.12 {Tk_MeasureChars procedure: include eol spaces} x11 {
	192	test unixfont-5.12 {Tk_MeasureChars procedure: include eol spaces} {x11 failsOnUbuntu} {
189	193	.b.l config -text "000 \n000"
190	194	getsize
191	195	} "[expr $ax6] [expr $ay2]"

252	256	catch {unset fontArray}
253	257	set result
254	258	} {-family -overstrike -size -slant -underline -weight}
255		test unixfont-8.4 {AllocFont procedure: classify characters} x11 {
	259	test unixfont-8.4 {AllocFont procedure: classify characters} {x11 failsOnUbuntu failsOnXQuarz} {
256	260	set x 0
257	261	incr x [font measure $courier "\u4000"] ;# 6
258	262	incr x [font measure $courier "\002"] ;# 4

263	267	test unixfont-8.5 {AllocFont procedure: setup widths of normal chars} x11 {
264	268	font metrics $courier -fixed
265	269	} {1}
266		test unixfont-8.6 {AllocFont procedure: setup widths of special chars} x11 {
	270	test unixfont-8.6 {AllocFont procedure: setup widths of special chars} {x11 failsOnUbuntu failsOnXQuarz} {
267	271	set x 0
268	272	incr x [font measure $courier "\001"] ;# 4
269	273	incr x [font measure $courier "\002"] ;# 4

291	295	set x {}
292	296	} {}
293	297
294		test unixfont-9.1 {GetControlCharSubst procedure: 2 chars subst} x11 {
	298	test unixfont-9.1 {GetControlCharSubst procedure: 2 chars subst} {x11 failsOnUbuntu failsOnXQuarz} {
295	299	.b.c dchars $t 0 end
296	300	.b.c insert $t 0 "0\a0"
297	301	set x {}

300	304	lappend x [.b.c index $t @[expr $ax*2],0]
301	305	lappend x [.b.c index $t @[expr $ax*3],0]
302	306	} {0 1 1 2}
303		test unixfont-9.2 {GetControlCharSubst procedure: 4 chars subst} x11 {
	307	test unixfont-9.2 {GetControlCharSubst procedure: 4 chars subst} {x11 failsOnUbuntu failsOnXQuarz} {
304	308	.b.c dchars $t 0 end
305	309	.b.c insert $t 0 "0\0010"
306	310	set x {}

+78

-78

tests/unixMenu.test less more

34	34
35	35
36	36	test unixMenu-4.1 {TkpConfigureMenuEntry - non-cascade entry} -constraints {
37		unix
	37	unix
38	38	} -setup {
39	39	destroy .m1
40	40	} -body {

43	43	list [.m1 entryconfigure test -label foo] [destroy .m1]
44	44	} -returnCodes ok -result {{} {}}
45	45	test unixMenu-4.2 {TkpConfigureMenuEntry - cascade entry} -constraints {
46		unix
	46	unix
47	47	} -setup {
48	48	destroy .m1
49	49	} -body {

78	78
79	79
80	80	test unixMenu-8.1 {GetMenuIndicatorGeometry - indicator off} -constraints {
81		unix
	81	unix
82	82	} -setup {
83	83	destroy .m1
84	84	} -body {

88	88	destroy .m1
89	89	} -returnCodes ok
90	90	test unixMenu-8.2 {GetMenuIndicatorGeometry - not checkbutton or radio} -constraints {
91		unix
	91	unix
92	92	} -setup {
93	93	destroy .m1
94	94	} -body {

111	111	destroy .m1
112	112	} -cleanup {
113	113	image delete image1
114		} -returnCodes ok
	114	} -returnCodes ok
115	115	test unixMenu-8.4 {GetMenuIndicatorGeometry - checkbutton bitmap} -constraints {
116		unix
	116	unix
117	117	} -setup {
118	118	destroy .m1
119	119	} -body {

124	124	destroy .m1
125	125	} -returnCodes ok
126	126	test unixMenu-8.5 {GetMenuIndicatorGeometry - checkbutton} -constraints {
127		unix
	127	unix
128	128	} -setup {
129	129	destroy .m1
130	130	} -body {

149	149	image delete image1
150	150	} -returnCodes ok
151	151	test unixMenu-8.7 {GetMenuIndicatorGeometry - radiobutton bitmap} -constraints {
152		unix
	152	unix
153	153	} -setup {
154	154	destroy .m1
155	155	} -body {

158	158	.m1 invoke foo
159	159	tk::TearOffMenu .m1 40 40
160	160	destroy .m1
161		} -returnCodes ok
	161	} -returnCodes ok
162	162	test unixMenu-8.8 {GetMenuIndicatorGeometry - radiobutton} -constraints {
163		unix
	163	unix
164	164	} -setup {
165	165	destroy .m1
166	166	} -body {

171	171	destroy .m1
172	172	} -returnCodes ok
173	173	test unixMenu-8.9 {GetMenuIndicatorGeometry - hideMargin} -constraints {
174		unix
	174	unix
175	175	} -setup {
176	176	destroy .m1
177	177	} -body {

180	180	.m1 invoke foo
181	181	tk::TearOffMenu .m1 40 40
182	182	destroy .m1
183		} -returnCodes ok
	183	} -returnCodes ok
184	184
185	185
186	186	test unixMenu-9.1 {GetMenuAccelGeometry - cascade entry} -constraints {
187		unix
	187	unix
188	188	} -setup {
189	189	destroy .m1
190	190	} -body {

194	194	destroy .m1
195	195	} -returnCodes ok
196	196	test unixMenu-9.2 {GetMenuAccelGeometry - non-null label} -constraints {
197		unix
	197	unix
198	198	} -setup {
199	199	destroy .m1
200	200	} -body {

214	214
215	215
216	216	test unixMenu-10.1 {DrawMenuEntryBackground - active menubar} -constraints {
217		unix
	217	unix
218	218	} -setup {
219	219	destroy .m1
220	220	} -body {

234	234	list [update] [destroy .m1]
235	235	} -returnCodes ok -result {{} {}}
236	236	test unixMenu-10.3 {DrawMenuEntryBackground - non-active} -constraints {
237		unix
	237	unix
238	238	} -setup {
239	239	destroy .m1
240	240	} -body {

246	246
247	247
248	248	test unixMenu-11.1 {DrawMenuEntryAccelerator - menubar} -constraints {
249		unix
	249	unix
250	250	} -setup {
251	251	destroy .m1
252	252	} -body {

257	257	} -result {{} {} {}}
258	258	# drawArrow parameter is never false under Unix
259	259	test unixMenu-11.2 {DrawMenuEntryAccelerator - cascade entry} -constraints {
260		unix
	260	unix
261	261	} -setup {
262	262	destroy .m1
263	263	} -body {

267	267	list [update] [destroy .m1]
268	268	} -result {{} {}}
269	269	test unixMenu-11.3 {DrawMenuEntryAccelerator - normal entry} -constraints {
270		unix
	270	unix
271	271	} -setup {
272	272	destroy .m1
273	273	} -body {

277	277	list [update] [destroy .m1]
278	278	} -result {{} {}}
279	279	test unixMenu-11.4 {DrawMenuEntryAccelerator - null entry} -constraints {
280		unix
	280	unix
281	281	} -setup {
282	282	destroy .m1
283	283	} -body {

289	289
290	290
291	291	test unixMenu-12.1 {DrawMenuEntryIndicator - non-check or radio} -constraints {
292		unix
	292	unix
293	293	} -setup {
294	294	destroy .m1
295	295	} -body {

299	299	list [update] [destroy .m1]
300	300	} -result {{} {}}
301	301	test unixMenu-12.2 {DrawMenuEntryIndicator - checkbutton - indicator off} -constraints {
302		unix
	302	unix
303	303	} -setup {
304	304	destroy .m1
305	305	} -body {

309	309	list [update] [destroy .m1]
310	310	} -result {{} {}}
311	311	test unixMenu-12.3 {DrawMenuEntryIndicator - checkbutton - not selected} -constraints {
312		unix
	312	unix
313	313	} -setup {
314	314	destroy .m1
315	315	} -body {

319	319	list [update] [destroy .m1]
320	320	} -result {{} {}}
321	321	test unixMenu-12.4 {DrawMenuEntryIndicator - checkbutton - selected} -constraints {
322		unix
	322	unix
323	323	} -setup {
324	324	destroy .m1
325	325	} -body {

330	330	list [update] [destroy .m1]
331	331	} -result {{} {}}
332	332	test unixMenu-12.5 {DrawMenuEntryIndicator - radiobutton - indicator off} -constraints {
333		unix
	333	unix
334	334	} -setup {
335	335	destroy .m1
336	336	} -body {

340	340	list [update] [destroy .m1]
341	341	} -result {{} {}}
342	342	test unixMenu-12.6 {DrawMenuEntryIndicator - radiobutton - not selected} -constraints {
343		unix
	343	unix
344	344	} -setup {
345	345	destroy .m1
346	346	} -body {

350	350	list [update] [destroy .m1]
351	351	} -result {{} {}}
352	352	test unixMenu-12.7 {DrawMenuEntryIndicator - radiobutton - selected} -constraints {
353		unix
	353	unix
354	354	} -setup {
355	355	destroy .m1
356	356	} -body {

445	445	# Don't know how to reproduce the case where the tkwin has been deleted.
446	446
447	447	test unixMenu-19.1 {TkpComputeMenubarGeometry - zero entries} -constraints {
448		unix
	448	unix
449	449	} -setup {
450	450	destroy .m1
451	451	} -body {

455	455	} -result {{} {} {}}
456	456	# Don't know how to generate one width windows
457	457	test unixMenu-19.2 {TkpComputeMenubarGeometry - one entry} -constraints {
458		unix
	458	unix
459	459	} -setup {
460	460	destroy .m1
461	461	} -body {

465	465	list [update] [. configure -menu ""] [destroy .m1]
466	466	} -result {{} {} {}}
467	467	test unixMenu-19.3 {TkpComputeMenubarGeometry - entry with different font} -constraints {
468		unix
	468	unix
469	469	} -setup {
470	470	destroy .m1
471	471	} -body {

475	475	list [update] [. configure -menu ""] [destroy .m1]
476	476	} -result {{} {} {}}
477	477	test unixMenu-19.4 {TkpComputeMenubarGeometry - separator} -constraints {
478		unix
	478	unix
479	479	} -setup {
480	480	destroy .m1
481	481	} -body {

485	485	list [update] [. configure -menu ""] [destroy .m1]
486	486	} -result {{} {} {}}
487	487	test unixMenu-19.5 {TkpComputeMenubarGeometry - First entry} -constraints {
488		unix
	488	unix
489	489	} -setup {
490	490	destroy .m1
491	491	} -body {

495	495	list [update] [. configure -menu ""] [destroy .m1]
496	496	} -result {{} {} {}}
497	497	test unixMenu-19.6 {TkpComputeMenubarGeometry - First entry too wide} -constraints {
498		unix
	498	unix
499	499	} -setup {
500	500	destroy .m1
501	501	} -body {

506	506	list [update] [. configure -menu ""] [destroy .m1]
507	507	} -result {{} {} {}}
508	508	test unixMenu-19.7 {TkpComputeMenubarGeometry - two entries fit} -constraints {
509		unix
	509	unix
510	510	} -setup {
511	511	destroy .m1
512	512	} -body {

518	518	list [update] [. configure -menu ""] [destroy .m1]
519	519	} -result {{} {} {}}
520	520	test unixMenu-19.8 {TkpComputeMenubarGeometry - two entries; 2nd don't fit} -constraints {
521		unix
	521	unix
522	522	} -setup {
523	523	destroy .m1
524	524	} -body {

530	530	list [update] [. configure -menu ""] [destroy .m1]
531	531	} -result {{} {} {}}
532	532	test unixMenu-19.9 {TkpComputeMenubarGeometry - two entries; 1st dont fit} -constraints {
533		unix
	533	unix
534	534	} -setup {
535	535	destroy .m1
536	536	} -body {

542	542	list [update] [. configure -menu ""] [destroy .m1]
543	543	} -result {{} {} {}}
544	544	test unixMenu-19.10 {TkpComputeMenubarGeometry - two entries; neither fit} -constraints {
545		unix
	545	unix
546	546	} -setup {
547	547	destroy .m1
548	548	} -body {

644	644	list [update] [. configure -menu ""] [destroy .m1]
645	645	} -result {{} {} {}}
646	646	test unixMenu-19.19 {TkpComputeMenubarGeometry - help menu in first position} -constraints {
647		unix
	647	unix
648	648	} -setup {
649	649	destroy .m1
650	650	} -body {

660	660	list [update] [. configure -menu ""] [destroy .m1]
661	661	} -result {{} {} {}}
662	662	test unixMenu-19.20 {TkpComputeMenubarGeometry - help menu in middle} -constraints {
663		unix
	663	unix
664	664	} -setup {
665	665	destroy .m1
666	666	} -body {

676	676	list [update] [. configure -menu ""] [destroy .m1]
677	677	} -result {{} {} {}}
678	678	test unixMenu-19.21 {TkpComputeMenubarGeometry - help menu in first position} -constraints {
679		unix
	679	unix
680	680	} -setup {
681	681	destroy .m1
682	682	} -body {

692	692	list [update] [. configure -menu ""] [destroy .m1]
693	693	} -result {{} {} {}}
694	694	test unixMenu-19.22 {TkpComputeMenubarGeometry - help item fits} -constraints {
695		unix
	695	unix
696	696	} -setup {
697	697	destroy .m1
698	698	} -body {

706	706	list [update] [. configure -menu ""] [destroy .m1]
707	707	} -result {{} {} {}}
708	708	test unixMenu-19.23 {TkpComputeMenubarGeometry - help item does not fit} -constraints {
709		unix
	709	unix
710	710	} -setup {
711	711	destroy .m1
712	712	} -body {

720	720	list [update] [. configure -menu ""] [destroy .m1]
721	721	} -result {{} {} {}}
722	722	test unixMenu-19.24 {TkpComputeMenubarGeometry - help item only one} -constraints {
723		unix
	723	unix
724	724	} -setup {
725	725	destroy .m1
726	726	} -body {

765	765	} -result {.m1.test {}}
766	766	# Don't know how to automate missing tkwins
767	767	test unixMenu-22.2 {SetHelpMenu - menubar but no help menu} -constraints {
768		unix
	768	unix
769	769	} -setup {
770	770	destroy .m1
771	771	} -body {

775	775	list [menu .m1.file] [. configure -menu ""] [destroy .m1]
776	776	} -result {.m1.file {} {}}
777	777	test unixMenu-22.3 {SetHelpMenu - menubar with help menu} -constraints {
778		unix
	778	unix
779	779	} -setup {
780	780	destroy .m1
781	781	} -body {

785	785	list [menu .m1.help] [. configure -menu ""] [destroy .m1]
786	786	} -result {.m1.help {} {}}
787	787	test unixMenu-22.4 {SetHelpMenu - multiple menubars with same help menu} -constraints {
788		unix
	788	unix
789	789	} -setup {
790	790	destroy .m1 .t2
791	791	} -body {

800	800
801	801
802	802	test unixMenu-23.1 {TkpDrawMenuEntry - gc for active and not strict motif} -constraints {
803		unix
	803	unix
804	804	} -setup {
805	805	destroy .m1
806	806	} -body {

811	811	list [update] [destroy .m1]
812	812	} -result {{} {}}
813	813	test unixMenu-23.2 {TkpDrawMenuEntry - gc for active menu item with its own gc} -constraints {
814		unix
	814	unix
815	815	} -setup {
816	816	destroy .m1
817	817	} -body {

822	822	list [update] [destroy .m1]
823	823	} -result {{} {}}
824	824	test unixMenu-23.3 {TkpDrawMenuEntry - gc for active and strict motif} -constraints {
825		unix
	825	unix
826	826	} -setup {
827	827	destroy .m1
828	828	} -body {

834	834	list [update] [destroy .m1] [set tk_strictMotif 0]
835	835	} -result {{} {} 0}
836	836	test unixMenu-23.4 {TkpDrawMenuEntry - gc for disabled with disabledfg and custom entry} -constraints {
837		unix
	837	unix
838	838	} -setup {
839	839	destroy .m1
840	840	} -body {

844	844	list [update] [destroy .m1]
845	845	} -result {{} {}}
846	846	test unixMenu-23.5 {TkpDrawMenuEntry - gc for disabled with disabledFg} -constraints {
847		unix
	847	unix
848	848	} -setup {
849	849	destroy .m1
850	850	} -body {

854	854	list [update] [destroy .m1]
855	855	} -result {{} {}}
856	856	test unixMenu-23.6 {TkpDrawMenuEntry - gc for disabled - no disabledFg} -constraints {
857		unix
	857	unix
858	858	} -setup {
859	859	destroy .m1
860	860	} -body {

864	864	list [update] [destroy .m1]
865	865	} -result {{} {}}
866	866	test unixMenu-23.7 {TkpDrawMenuEntry - gc for normal - custom entry} -constraints {
867		unix
	867	unix
868	868	} -setup {
869	869	destroy .m1
870	870	} -body {

882	882	list [update] [destroy .m1]
883	883	} -result {{} {}}
884	884	test unixMenu-23.9 {TkpDrawMenuEntry - gc for indicator - custom entry} -constraints {
885		unix
	885	unix
886	886	} -setup {
887	887	destroy .m1
888	888	} -body {

893	893	list [update] [destroy .m1]
894	894	} -result {{} {}}
895	895	test unixMenu-23.10 {TkpDrawMenuEntry - gc for indicator} -constraints {
896		unix
	896	unix
897	897	} -setup {
898	898	destroy .m1
899	899	} -body {

904	904	list [update] [destroy .m1]
905	905	} -result {{} {}}
906	906	test unixMenu-23.11 {TkpDrawMenuEntry - border - custom entry} -constraints {
907		unix
	907	unix
908	908	} -setup {
909	909	destroy .m1
910	910	} -body {

924	924	list [update] [destroy .m1]
925	925	} -result {{} {}}
926	926	test unixMenu-23.13 {TkpDrawMenuEntry - active border - strict motif} -constraints {
927		unix
	927	unix
928	928	} -setup {
929	929	destroy .m1
930	930	} -body {

936	936	list [update] [destroy .m1] [set tk_strictMotif 0]
937	937	} -result {{} {} 0}
938	938	test unixMenu-23.14 {TkpDrawMenuEntry - active border - custom entry} -constraints {
939		unix
	939	unix
940	940	} -setup {
941	941	destroy .m1
942	942	} -body {

956	956	list [update] [destroy .m1]
957	957	} -result {{} {}}
958	958	test unixMenu-23.16 {TkpDrawMenuEntry - font - custom entry} -constraints {
959		unix
	959	unix
960	960	} -setup {
961	961	destroy .m1
962	962	} -body {

990	990	list [update] [destroy .m1]
991	991	} -result {{} {}}
992	992	test unixMenu-23.20 {TkpDrawMenuEntry - disabled cascade item} -constraints {
993		unix
	993	unix
994	994	} -setup {
995	995	destroy .m1
996	996	} -body {

1057	1057
1058	1058
1059	1059	test unixMenu-25.1 {TkpComputeStandardMenuGeometry - no entries} -constraints {
1060		unix
	1060	unix
1061	1061	} -setup {
1062	1062	destroy .m1
1063	1063	} -body {

1065	1065	list [update idletasks] [destroy .m1]
1066	1066	} -result {{} {}}
1067	1067	test unixMenu-25.2 {TkpComputeStandardMenuGeometry - one entry} -constraints {
1068		unix
	1068	unix
1069	1069	} -setup {
1070	1070	destroy .m1
1071	1071	} -body {

1074	1074	list [update idletasks] [destroy .m1]
1075	1075	} -result {{} {}}
1076	1076	test unixMenu-25.3 {TkpComputeStandardMenuGeometry - more than one entry} -constraints {
1077		unix
	1077	unix
1078	1078	} -setup {
1079	1079	destroy .m1
1080	1080	} -body {

1084	1084	list [update idletasks] [destroy .m1]
1085	1085	} -result {{} {}}
1086	1086	test unixMenu-25.4 {TkpComputeStandardMenuGeometry - separator} -constraints {
1087		unix
	1087	unix
1088	1088	} -setup {
1089	1089	destroy .m1
1090	1090	} -body {

1105	1105	list [update] [tk::MenuUnpost .mb.m] [destroy .mb]
1106	1106	} -result {{} {} {}}
1107	1107	test unixMenu-25.6 {TkpComputeStandardMenuGeometry - standard label geometry} -constraints {
1108		unix
	1108	unix
1109	1109	} -setup {
1110	1110	destroy .m1
1111	1111	} -body {

1114	1114	list [update idletasks] [destroy .m1]
1115	1115	} -result {{} {}}
1116	1116	test unixMenu-25.7 {TkpComputeStandardMenuGeometry - different font for entry} -constraints {
1117		unix
	1117	unix
1118	1118	} -setup {
1119	1119	destroy .m1
1120	1120	} -body {

1123	1123	list [update idletasks] [destroy .m1]
1124	1124	} -result {{} {}}
1125	1125	test unixMenu-25.8 {TkpComputeStandardMenuGeometry - second entry larger} -constraints {
1126		unix
	1126	unix
1127	1127	} -setup {
1128	1128	destroy .m1
1129	1129	} -body {

1133	1133	list [update idletasks] [destroy .m1]
1134	1134	} -result {{} {}}
1135	1135	test unixMenu-25.9 {TkpComputeStandardMenuGeometry - first entry larger} -constraints {
1136		unix
	1136	unix
1137	1137	} -setup {
1138	1138	destroy .m1
1139	1139	} -body {

1143	1143	list [update idletasks] [destroy .m1]
1144	1144	} -result {{} {}}
1145	1145	test unixMenu-25.10 {TkpComputeStandardMenuGeometry - accelerator} -constraints {
1146		unix
	1146	unix
1147	1147	} -setup {
1148	1148	destroy .m1
1149	1149	} -body {

1152	1152	list [update idletasks] [destroy .m1]
1153	1153	} -result {{} {}}
1154	1154	test unixMenu-25.11 {TkpComputeStandardMenuGeometry - second accel larger} -constraints {
1155		unix
	1155	unix
1156	1156	} -setup {
1157	1157	destroy .m1
1158	1158	} -body {

1162	1162	list [update idletasks] [destroy .m1]
1163	1163	} -result {{} {}}
1164	1164	test unixMenu-25.12 {TkpComputeStandardMenuGeometry - second accel smaller} -constraints {
1165		unix
	1165	unix
1166	1166	} -setup {
1167	1167	destroy .m1
1168	1168	} -body {

1172	1172	list [update idletasks] [destroy .m1]
1173	1173	} -result {{} {}}
1174	1174	test unixMenu-25.13 {TkpComputeStandardMenuGeometry - indicator} -constraints {
1175		unix
	1175	unix
1176	1176	} -setup {
1177	1177	destroy .m1
1178	1178	} -body {

1210	1210	list [update idletasks] [destroy .m1] [image delete image1]
1211	1211	} -result {{} {} {}}
1212	1212	test unixMenu-25.16 {TkpComputeStandardMenuGeometry - zero sized menus} -constraints {
1213		unix
	1213	unix
1214	1214	} -setup {
1215	1215	destroy .m1
1216	1216	} -body {

1218	1218	list [update idletasks] [destroy .m1]
1219	1219	} -result {{} {}}
1220	1220	test unixMenu-25.17 {TkpComputeStandardMenuGeometry - first column bigger} -constraints {
1221		unix
	1221	unix
1222	1222	} -setup {
1223	1223	destroy .m1
1224	1224	} -body {

1229	1229	list [update idletasks] [destroy .m1]
1230	1230	} -result {{} {}}
1231	1231	test unixMenu-25.18 {TkpComputeStandardMenuGeometry - second column bigger} -constraints {
1232		unix
	1232	unix
1233	1233	} -setup {
1234	1234	destroy .m1
1235	1235	} -body {

1240	1240	list [update idletasks] [destroy .m1]
1241	1241	} -result {{} {}}
1242	1242	test unixMenu-25.19 {TkpComputeStandardMenuGeometry - three columns} -constraints {
1243		unix
	1243	unix
1244	1244	} -setup {
1245	1245	destroy .m1
1246	1246	} -body {

1251	1251	.m1 add command -label four
1252	1252	.m1 add command -label five -columnbreak 1
1253	1253	.m1 add command -label six
1254		list [update idletasks] [destroy .m1]
	1254	list [update idletasks] [destroy .m1]
1255	1255	} -result {{} {}}
1256	1256	test unixMenu-25.20 {TkpComputeStandardMenuGeometry - hide margin} -constraints {
1257		unix
	1257	unix
1258	1258	} -setup {
1259	1259	destroy .m1
1260	1260	} -body {

+66

-78

tests/unixWm.test less more

12	12
13	13	namespace import -force ::tk::test:loadTkCommand
14	14
	15	testConstraint failsOnUbuntu [expr {![info exists ::env(CI)] \|\| ![string match Linux $::tcl_platform(os)]}]
	16	testConstraint failsOnXQuarz [expr {$tcl_platform(os) ne "Darwin" \|\| [tk windowingsystem] ne "x11" }]
	17
15	18	proc sleep ms {
16	19	global x
17	20	after $ms {set x 1}
18	21	vwait x
19	22	}
20
21		# The macOS window manager shows an animation when a window is deiconified.
22		# Tests which check the geometry of a window after deiconifying it should
23		# wait for the animation to finish.
24
25		proc animationDelay {} {
26		if {[tk windowingsystem] == "aqua"} {
27		sleep 250
28		}
29		}
30	23
31	24	# Procedure to set up a collection of top-level windows
32	25

45	38	# larger than the height of the menubar (normally 23 pixels).
46	39
47	40	if {[tk windowingsystem] eq "aqua"} {
48		set Y0 23
49		set Y2 25
50		set Y5 28
	41	set mb [expr [menubarheight] + 1]
	42	set Y0 $mb
	43	set Y2 [expr $mb + 2]
	44	set Y5 [expr $mb + 5]
51	45	} else {
52	46	set Y0 0
53	47	set Y2 2

55	49	}
56	50
57	51	set i 1
58		foreach geom "+23+80 +80+23 +0+$Y0" {
	52	foreach geom "+$Y0+80 +80+$Y0 +0+$Y0" {
59	53	destroy .t
60	54	test unixWm-1.$i {initial window position} unix {
61	55	toplevel .t -width 200 -height 150

81	75	scan [wm geom .t] %dx%d+%d+%d width height x y
82	76	set xerr [expr 150-$x]
83	77	set yerr [expr 150-$y]
84		foreach geom "+20+80 +80+23 +0+$Y0 -0-0 +0-0 -0+$Y0 -10-5 -10+$Y5 +10-5" {
	78	foreach geom "+20+80 +80+$Y0 +0+$Y0 -0-0 +0-0 -0+$Y0 -10-5 -10+$Y5 +10-5" {
85	79	test unixWm-2.$i {moving window while mapped} unix {
86	80	wm geom .t $geom
87	81	update

93	87	}
94	88
95	89	set i 1
96		foreach geom "+20+80 +80+23 +0+$Y0 -0-0 +0-0 -0+$Y0 -10-5 -10+$Y5 +10-5" {
	90	foreach geom "+20+80 +80+$Y0 +0+$Y0 -0-0 +0-0 -0+$Y0 -10-5 -10+$Y5 +10-5" {
97	91	test unixWm-3.$i {moving window while iconified} unix {
98	92	wm iconify .t
99		sleep 200
	93	update idletasks
100	94	wm geom .t $geom
101		update
	95	update idletasks
102	96	wm deiconify .t
103		animationDelay
	97	update idletasks
104	98	scan [wm geom .t] %dx%d%1s%d%1s%d width height xsign x ysign y
105	99	format "%s%d%s%d" $xsign [eval expr $x$xsign$xerr] $ysign \
106	100	[eval expr $y$ysign$yerr]

112	106	foreach geom "+20+80 +100+40 +0+$Y0" {
113	107	test unixWm-4.$i {moving window while withdrawn} unix {
114	108	wm withdraw .t
115		sleep 200
	109	update idletasks
116	110	wm geom .t $geom
117		update
	111	update idletasks
118	112	wm deiconify .t
119		animationDelay
	113	update idletasks
120	114	wm geom .t
121	115	} 100x150$geom
122	116	incr i

193	187
194	188	destroy .t
195	189	toplevel .t -width 200 -height 100
196		wm geom .t +10+23
	190	wm geom .t +10+$Y0
197	191	wm minsize .t 1 1
198	192	update
199	193	test unixWm-6.1 {size changes} unix {
200	194	.t config -width 180 -height 150
201	195	update
202	196	wm geom .t
203		} 180x150+10+23
	197	} 180x150+10+$Y0
204	198	test unixWm-6.2 {size changes} unix {
205	199	wm geom .t 250x60
206	200	.t config -width 170 -height 140
207	201	update
208	202	wm geom .t
209		} 250x60+10+23
	203	} 250x60+10+$Y0
210	204	test unixWm-6.3 {size changes} unix {
211	205	wm geom .t 250x60
212	206	.t config -width 170 -height 140
213	207	wm geom .t {}
214	208	update
215	209	wm geom .t
216		} 170x140+10+23
	210	} 170x140+10+$Y0
217	211	test unixWm-6.4 {size changes} {unix nonPortable userInteraction} {
218	212	wm minsize .t 1 1
219	213	update

295	289	toplevel .t -width 100 -height 30
296	290	list [catch {wm iconwindow .t b c} msg] $msg
297	291	} {1 {wrong # args: should be "wm iconwindow window ?pathName?"}}
298		test unixWm-8.4 {icon windows} unix {
	292	test unixWm-8.4 {icon windows} {unix failsOnUbuntu} {
299	293	destroy .t
300	294	destroy .icon
301	295	toplevel .t -width 100 -height 30
302	296	wm geom .t +0+0
	297	update idletasks
303	298	set result [wm iconwindow .t]
304	299	toplevel .icon -width 50 -height 50 -bg red
305	300	wm iconwindow .t .icon

309	304	update
310	305	lappend result [winfo ismapped .t] [winfo ismapped .icon]
311	306	wm iconify .t
312		update
	307	update idletasks
313	308	lappend result [winfo ismapped .t] [winfo ismapped .icon]
314	309	} {.icon icon {} withdrawn 1 0 0 0}
315	310	test unixWm-8.5 {icon windows} unix {

347	342	wm geom .t +0+0
348	343	tkwait visibility .t ;# Needed to keep tvtwm happy.
349	344	wm iconwindow .t .icon
350		sleep 500
351	345	lappend result [winfo ismapped .t] [winfo ismapped .icon]
352	346	} {1 1 0}
353	347	test unixWm-8.9 {icon windows} {unix nonPortable} {

419	413	toplevel .t -width 100 -height 300 -bg blue
420	414	wm geom .t +0+0
421	415	wm iconify .t
422		sleep 500
423	416	winfo ismapped .t
424	417	} {0}
425	418	test unixWm-9.4 {TkWmMapWindow procedure, icon windows} unix {
426	419	destroy .t
427		sleep 500
428	420	toplevel .t -width 100 -height 50 -bg blue
429	421	tkwait visibility .t
430	422	wm iconwindow . .t

642	634	destroy .icon
643	635	set result
644	636	} {1 {can't deiconify .icon: it is an icon for .t}}
645		test unixWm-16.3 {Tk_WmCmd procedure, "deiconify" option} unix {
	637	test unixWm-16.3 {Tk_WmCmd procedure, "deiconify" option} {unix failsOnUbuntu} {
646	638	wm iconify .t
647	639	set result {}
648	640	lappend result [winfo ismapped .t] [wm state .t]

861	853	destroy .t2
862	854	set result
863	855	} {1 {can't iconify .t2: it is an icon for .t}}
864		test unixWm-23.5 {Tk_WmCmd procedure, "iconify" option} unix {
	856	test unixWm-23.5 {Tk_WmCmd procedure, "iconify" option} {unix failsOnUbuntu} {
865	857	destroy .t2
866	858	toplevel .t2
867	859	wm geom .t2 +0+0
868		update
	860	update idletasks
869	861	wm iconify .t2
870		update
	862	update idletasks
871	863	set result [winfo ismapped .t2]
872	864	destroy .t2
873	865	set result
874	866	} {0}
875		test unixWm-23.6 {Tk_WmCmd procedure, "iconify" option} unix {
	867	test unixWm-23.6 {Tk_WmCmd procedure, "iconify" option} {unix failsOnUbuntu} {
876	868	destroy .t2
877	869	toplevel .t2
878	870	wm geom .t2 -0+0
879		update
	871	update idletasks
880	872	set result [winfo ismapped .t2]
881	873	wm iconify .t2
882		update
	874	update idletasks
883	875	lappend result [winfo ismapped .t2]
884	876	destroy .t2
885	877	set result

1308	1300	destroy .t2
1309	1301	set result
1310	1302	} {{} {} .t 0 {} {}}
1311		test unixWm-37.4 {TkWmDeadWindow, destroy on master should clear transient} {unix testwrapper} {
	1303	test unixWm-37.4 {TkWmDeadWindow, destroy on toplevel should clear transient} {unix testwrapper} {
1312	1304	destroy .t2
1313	1305	toplevel .t2
1314	1306	destroy .t3

1319	1311	update
1320	1312	list [wm transient .t2] [testprop [testwrapper .t2] WM_TRANSIENT_FOR]
1321	1313	} {{} {}}
1322		test unixWm-37.5 {Tk_WmCmd procedure, "transient" option, create master wrapper} {unix testwrapper} {
	1314	test unixWm-37.5 {Tk_WmCmd procedure, "transient" option, create toplevel wrapper} {unix testwrapper} {
1323	1315	destroy .t2
1324	1316	destroy .t3
1325	1317	toplevel .t2 -width 120 -height 300

1383	1375	test unixWm-41.1 {ConfigureEvent procedure, internally generated size changes} unix {
1384	1376	destroy .t
1385	1377	toplevel .t -width 400 -height 150
	1378	tkwait visibility .t
1386	1379	wm geometry .t +0+0
1387		tkwait visibility .t
	1380	update idletasks
1388	1381	set result {}
1389	1382	lappend result [winfo width .t] [winfo height .t]
1390	1383	.t configure -width 200 -height 300
1391		sleep 500
	1384	update idletasks
1392	1385	lappend result [winfo width .t] [winfo height .t]
1393	1386	} {400 150 200 300}
1394	1387	test unixWm-41.2 {ConfigureEvent procedure, menubars} {nonPortable testmenubar} {

1442	1435	# No tests for ReparentEvent or ComputeReparentGeometry; I can't figure
1443	1436	# out how to exercise these procedures reliably.
1444	1437
1445		test unixWm-42.1 {WrapperEventProc procedure, map and unmap events} unix {
	1438	test unixWm-42.1 {WrapperEventProc procedure, map and unmap events} {unix failsOnUbuntu} {
1446	1439	destroy .t
1447	1440	toplevel .t -width 400 -height 150
1448	1441	wm geometry .t +0+0

1452	1445	bind .t <Unmap> {set x "unmapped"}
1453	1446	set x {no event}
1454	1447	wm iconify .t
1455		animationDelay
	1448	update idletasks
1456	1449	lappend result $x [winfo ismapped .t]
1457	1450	set x {no event}
1458	1451	wm deiconify .t
1459		animationDelay
	1452	update idletasks
1460	1453	lappend result $x [winfo ismapped .t]
1461	1454	} {unmapped 0 mapped 1}
1462	1455

1559	1552	} {100 1}
1560	1553	destroy .t
1561	1554	toplevel .t -width 80 -height 60
1562		test unixWm-44.7 {UpdateGeometryInfo procedure, computing position} unix {
	1555	test unixWm-44.7 {UpdateGeometryInfo procedure, computing position} {unix failsOnXQuarz} {
1563	1556	tkwait visibility .t
1564	1557	wm overrideredirect .t 1
1565	1558	update

1569	1562	} [list 5 [expr [winfo screenheight .t] - 70]]
1570	1563	destroy .t
1571	1564	toplevel .t -width 80 -height 60
1572		test unixWm-44.8 {UpdateGeometryInfo procedure, computing position} unix {
	1565	test unixWm-44.8 {UpdateGeometryInfo procedure, computing position} {unix failsOnXQuarz} {
1573	1566	tkwait visibility .t
1574	1567	wm overrideredirect .t 1
1575	1568	update

1619	1612	[expr [lindex $property 7]] [expr [lindex $property 8]] \
1620	1613	[expr [lindex $property 9]] [expr [lindex $property 10]]
1621	1614	} {40 30 320 210 10 5}
1622		test unixWm-45.2 {UpdateSizeHints procedure} {unix testwrapper} {
	1615	test unixWm-45.2 {UpdateSizeHints procedure} {unix testwrapper failsOnUbuntu failsOnXQuarz} {
1623	1616	destroy .t
1624	1617	toplevel .t -width 80 -height 60
1625	1618	wm minsize .t 30 40

1647	1640	[expr [lindex $property 7]] [expr [lindex $property 8]] \
1648	1641	[expr [lindex $property 9]] [expr [lindex $property 10]]
1649	1642	} {60 40 53 320 233 10 5}
1650		test unixWm-45.4 {UpdateSizeHints procedure, not resizable with menu} {testmenubar testwrapper} {
	1643	test unixWm-45.4 {UpdateSizeHints procedure, not resizable with menu} {testmenubar testwrapper failsOnUbuntu failsOnXQuarz} {
1651	1644	destroy .t
1652	1645	toplevel .t -width 80 -height 60
1653	1646	frame .t.menu -height 23 -width 50

1801	1794	# Windows are assumed to have a border (invisible in Gnome 3).
1802	1795	set result_50_1 {{} {} .t {} .t2 {} .t2 {} .t}
1803	1796	}
1804		test unixWm-50.1 {Tk_CoordsToWindow procedure, finding a toplevel, x-coords, title bar} unix {
	1797	test unixWm-50.1 {Tk_CoordsToWindow procedure, finding a toplevel, x-coords, title bar} {unix failsOnUbuntu failsOnXQuarz} {
1805	1798	update
1806	1799	toplevel .t -width 300 -height 400 -bg green
1807	1800	wm geom .t +100+100

1849	1842	Tk_CoordsToWindow procedure, finding a toplevel with embedding
1850	1843	} tempNotWin {
1851	1844	deleteWindows
1852		catch {interp delete slave}
	1845	catch {interp delete child}
1853	1846
1854	1847	toplevel .t -width 300 -height 400 -bg blue
1855	1848	wm geom .t +100+100

1857	1850	place .t.f -x 150 -y 50
1858	1851	tkwait visibility .t.f
1859	1852	update
1860		interp create slave
1861		load {} Tk slave
1862		slave alias frameid winfo id .t.f
1863		slave eval {
	1853	interp create child
	1854	load {} Tk child
	1855	child alias frameid winfo id .t.f
	1856	child eval {
1864	1857	wm withdraw .
1865	1858	toplevel .x -width 100 -height 80 -use [frameid] -bg yellow
1866	1859	tkwait visibility .x

1868	1861	set x [winfo rootx .x]
1869	1862	set y [winfo rooty .x]
1870	1863	}
1871		set result [list [slave eval {winfo containing [expr $x - 1] [expr $y + 50]}] \
1872		[slave eval {winfo containing $x [expr $y + 50]}]]
1873		interp delete slave
	1864	set result [list [child eval {winfo containing [expr $x - 1] [expr $y + 50]}] \
	1865	[child eval {winfo containing $x [expr $y + 50]}]]
	1866	interp delete child
1874	1867	set x [winfo rootx .t]
1875	1868	set y [winfo rooty .t]
1876	1869	lappend result [winfo containing [expr $x + 200] [expr $y + 49]] \

1880	1873	test unixWm-50.4 {Tk_CoordsToWindow procedure, window in other application} unix {
1881	1874	destroy .t
1882	1875
1883		catch {interp delete slave}
	1876	catch {interp delete child}
1884	1877	toplevel .t -width 200 -height 200 -bg green
1885	1878	wm geometry .t +100+100
1886	1879	tkwait visibility .t
1887	1880	update
1888		interp create slave
1889		load {} Tk slave
1890		slave eval {wm geometry . 200x200+100+100; tkwait visibility . ; update}
	1881	interp create child
	1882	load {} Tk child
	1883	child eval {wm geometry . 200x200+100+100; tkwait visibility . ; update}
1891	1884	set result [list [winfo containing 200 200] \
1892		[slave eval {winfo containing 200 200}]]
1893		interp delete slave
	1885	[child eval {winfo containing 200 200}]]
	1886	interp delete child
1894	1887	set result
1895	1888	} {{} .}
1896	1889	test unixWm-50.5 {Tk_CoordsToWindow procedure, handling menubars} {unix testmenubar} {

1952	1945	test unixWm-50.8 {Tk_CoordsToWindow procedure, more basics} unix {
1953	1946	destroy .t
1954	1947	toplevel .t -width 400 -height 300 -bg green
1955		wm geom .t +0+0
	1948	wm geom .t +0+30
1956	1949	frame .t.f -width 200 -height 100 -bd 2 -relief raised
1957	1950	place .t.f -x 100 -y 100
1958	1951	frame .t.f.f -width 200 -height 100 -bd 2 -relief raised
1959	1952	place .t.f.f -x 100 -y 0
1960	1953	update
1961		set x [winfo rooty .t]
	1954	set x [winfo rootx .t]
1962	1955	set y [expr [winfo rooty .t] + 150]
1963	1956	list [winfo containing [expr $x + 50] $y] \
1964	1957	[winfo containing [expr $x + 150] $y] \

1966	1959	[winfo containing [expr $x + 350] $y] \
1967	1960	[winfo containing [expr $x + 450] $y]
1968	1961	} {.t .t.f .t.f.f .t {}}
1969		test unixWm-50.9 {Tk_CoordsToWindow procedure, unmapped windows} unix {
1970		destroy .t
1971		destroy .t2
1972		sleep 500 ;# Give window manager time to catch up.
	1962	test unixWm-50.9 {Tk_CoordsToWindow procedure, unmapped windows} {unix failsOnUbuntu} {
	1963	destroy .t
	1964	destroy .t2
1973	1965	toplevel .t -width 200 -height 200 -bg green
1974	1966	wm geometry .t +0+0
1975	1967	tkwait visibility .t

1978	1970	tkwait visibility .t2
1979	1971	set result [list [winfo containing 100 100]]
1980	1972	wm iconify .t2
1981		animationDelay
	1973	update idletasks
1982	1974	lappend result [winfo containing 100 100]
1983	1975	} {.t2 .t}
1984	1976	test unixWm-50.10 {Tk_CoordsToWindow procedure, unmapped windows} unix {

1988	1980	frame .t.f -width 150 -height 150 -bd 2 -relief raised
1989	1981	place .t.f -x 25 -y 25
1990	1982	tkwait visibility .t.f
	1983	update idletasks
1991	1984	set result [list [winfo containing 100 100]]
1992	1985	place forget .t.f
1993		update
	1986	update idletasks
1994	1987	lappend result [winfo containing 100 100]
1995	1988	} {.t.f .t}
1996	1989	deleteWindows

2020	2013	set result [winfo containing [winfo rootx .raise1] \
2021	2014	[winfo rooty .raise1]]
2022	2015	destroy .raise2
2023		sleep 500
2024	2016	list $result [winfo containing [winfo rootx .raise1] \
2025	2017	[winfo rooty .raise1]]
2026	2018	} {.raise2 .raise1}

2031	2023	lower .raise3 .raise1
2032	2024	set result [winfo containing 100 100]
2033	2025	destroy .raise1
2034		sleep 500
2035	2026	lappend result [winfo containing 100 100]
2036	2027	} {.raise1 .raise3}
2037	2028	test unixWm-51.5 {TkWmRestackToplevel procedure, basic tests} {unix nonPortable} {

2046	2037	set result [winfo containing [winfo rootx .raise1] \
2047	2038	[winfo rooty .raise1]]
2048	2039	destroy .raise1
2049		sleep 500
2050	2040	list $result [winfo containing [winfo rootx .raise2] \
2051	2041	[winfo rooty .raise2]]
2052	2042	} {.raise1 .raise3}

2061	2051	wm geometry .t2 +0+0
2062	2052	winfo containing 100 100
2063	2053	} {.t}
2064		test unixWm-51.7 {TkWmRestackToplevel procedure, other window isn't mapped} unix {
	2054	test unixWm-51.7 {TkWmRestackToplevel procedure, other window isn't mapped} {unix failsOnXQuarz} {
2065	2055	foreach w {.t .t2 .t3} {
2066	2056	destroy $w
2067	2057	update

2069	2059	wm geometry $w +0+0
2070	2060	}
2071	2061	raise .t .t2
2072		sleep 2000
2073	2062	update
2074	2063	set result [list [winfo containing 100 100]]
2075	2064	lower .t3
2076		sleep 2000
2077	2065	lappend result [winfo containing 100 100]
2078	2066	} {.t3 .t}
2079	2067	test unixWm-51.8 {TkWmRestackToplevel procedure, overrideredirect windows} unix {

+6

-6

tests/visual_bb.test less more

51	51	frame .menu -relief raised -borderwidth 1
52	52	message .msg -font {Times 18} -relief raised -width 4i \
53	53	-borderwidth 1 -text "This application provides a collection of visual tests for the Tk toolkit. Each menu entry invokes a test, which displays information on the screen. You can then verify visually that the information is being displayed in the correct way. The tests under the \"Postscript\" menu exercise the Postscript-generation capabilities of canvas widgets."
54
	54
55	55	pack .menu -side top -fill x
56	56	pack .msg -side bottom -expand yes -fill both
57	57

63	63	menubutton .menu.file -text "File" -menu .menu.file.m
64	64	menu .menu.file.m
65	65	.menu.file.m add command -label "Quit" -command end
66
	66
67	67	menubutton .menu.group1 -text "Group 1" -menu .menu.group1.m
68	68	menu .menu.group1.m
69	69	.menu.group1.m add command -label "Canvas arcs" -command {runTest arc.tcl}

75	75	-command {runTest butGeom.tcl}
76	76	.menu.group1.m add command -label "Label/button colors" \
77	77	-command {runTest butGeom2.tcl}
78
	78
79	79	menubutton .menu.ps -text "Canvas Postscript" -menu .menu.ps.m
80	80	menu .menu.ps.m
81	81	.menu.ps.m add command -label "Rectangles and other graphics" \

88	88	-command {runTest canvPsImg.tcl}
89	89	.menu.ps.m add command -label "Arcs" \
90	90	-command {runTest canvPsArc.tcl}
91
	91
92	92	pack .menu.file .menu.group1 .menu.ps -side left -padx 1m
93
	93
94	94	# Set up for keyboard-based menu traversal
95
	95
96	96	bind . <Any-FocusIn> {
97	97	if {("%d" == "NotifyVirtual") && ("%m" == "NotifyNormal")} {
98	98	focus .menu

+22

-7

tests/winDialog.test less more

254	254	set y [then {
255	255	Click cancel
256	256	}]
257		# Note this also tests fix for
	257	# Note this also tests fix for
258	258	# https://core.tcl-lang.org/tk/tktview/4a0451f5291b3c9168cc560747dae9264e1d2ef6
259	259	# $x is expected to be empty
260	260	append x $y

440	440	nt testwinevent
441	441	} -body {
442	442	# case FILE_TYPES:
443
	443
444	444	start {tk_getSaveFile -filetypes {{"foo files" .foo FOOF}} -title Foo}
445	445	# XXX - currently disabled for vista style dialogs because the file
446	446	# types control has no control ID and we don't have a mechanism to

503	503	test winDialog-5.12.2 {tk_getSaveFile: initial directory: ~user} -constraints {
504	504	nt testwinevent
505	505	} -body {
506
	506
507	507	# Note: this test will fail on Tcl versions 8.6.4 and earlier due
508	508	# to a bug in file normalize for names of the form ~xxx that
509	509	# returns the wrong dir on Windows. In particular (in Win8 at

590	590	string equal $x [file join $dir testfile]
591	591	} -result 1
592	592
593		test winDialog-5.12.7 {tk_getOpenFile: initial directory: ~} -constraints {
	593	test winDialog-5.12.7 {tk_getOpenFile: initial directory: ~} -setup {
	594	# Ensure there's at least one file in the home directory in CI environments
	595	set makeEmpty [expr {![llength [glob -nocomplain -type f -directory ~ *]]}]
	596	if {$makeEmpty} {
	597	for {set i 1} {$i < 1000} {incr i} {
	598	# Technically a race condition...
	599	set actualFilename [format "~/tkWinDialog5_12_7_%03d" $i]
	600	if {![file exists $actualFilename]} break
	601	}
	602	close [open $actualFilename w]
	603	}
	604	} -constraints {
594	605	nt testwinevent
595	606	} -body {
596	607	set fn [file tail [lindex [glob -types f ~/*] 0]]

602	613	Click ok
603	614	}
604	615	string equal $x [file normalize [file join ~ $fn]]
	616	} -cleanup {
	617	if {$makeEmpty} {
	618	file delete $actualFilename
	619	}
605	620	} -result 1
606	621
607	622	test winDialog-5.12.8 {tk_getOpenFile: initial directory: .} -constraints {

730	745	nt testwinevent
731	746	} -body {
732	747	# case FILE_TITLE:
733
	748
734	749	start {tk_getOpenFile -title Narf}
735	750	then {
736	751	Click cancel

793	808	nt testwinevent english
794	809	} -body {
795	810	# winCode = GetOpenFileName(&ofn);
796
	811
797	812	start {tk_getOpenFile -title Open}
798	813	then {
799	814	set x [GetText ok]

926	941	} -body {
927	942	# if (Tcl_TranslateFileName(interp, string,
928	943	# &utfDirString) == NULL)
929
	944
930	945	tk_chooseDirectory -initialdir ~12x/455
931	946	} -returnCodes error -result {user "12x" doesn't exist}
932	947

+11

-11

tests/winFont.test less more

3	3	# Many of these tests are visually oriented and cannot be checked
4	4	# programmatically (such as "does an underlined font appear to be
5	5	# underlined?"); these tests attempt to exercise the code in question,
6		# but there are no results that can be checked.
	6	# but there are no results that can be checked.
7	7	#
8	8	# Copyright (c) 1996-1997 Sun Microsystems, Inc.
9	9	# Copyright (c) 1998-1999 by Scriptics Corporation.

140	140	update
141	141	set ax [winfo reqwidth .t.l]
142	142	set ay [winfo reqheight .t.l]
143
	143
144	144	.t.l config -wrap 0 -text "000000"
145	145	list [expr {[winfo reqwidth .t.l] eq 6*$ax}] \
146	146	[expr {[winfo reqheight .t.l] eq $ay}]

159	159	update
160	160	set ax [winfo reqwidth .t.l]
161	161	set ay [winfo reqheight .t.l]
162
	162
163	163	.t.l config -wrap 100000 -text "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
164	164	list [expr {[winfo reqwidth .t.l] eq 256*$ax}] \
165	165	[expr {[winfo reqheight .t.l] eq $ay}]

178	178	update
179	179	set ax [winfo reqwidth .t.l]
180	180	set ay [winfo reqheight .t.l]
181
	181
182	182	.t.l config -wrap [expr {$ax*10}] -text "00000000"
183	183	list [expr {[winfo reqwidth .t.l] eq 8*$ax}] \
184	184	[expr {[winfo reqheight .t.l] eq $ay}]

197	197	update
198	198	set ax [winfo reqwidth .t.l]
199	199	set ay [winfo reqheight .t.l]
200
	200
201	201	.t.l config -wrap [expr {$ax*6}] -text "00000000"
202	202	list [expr {[winfo reqwidth .t.l] eq 6*$ax}] \
203	203	[expr {[winfo reqheight .t.l] eq 2*$ay}]

233	233	update
234	234	set ax [winfo reqwidth .t.l]
235	235	set ay [winfo reqheight .t.l]
236
	236
237	237	.t.l config -text "000000" -wrap 1
238	238	list [expr {[winfo reqwidth .t.l] eq $ax}] \
239	239	[expr {[winfo reqheight .t.l] eq 6*$ay}]

252	252	update
253	253	set ax [winfo reqwidth .t.l]
254	254	set ay [winfo reqheight .t.l]
255
	255
256	256	.t.l config -wrap [expr {$ax*8}] -text "000000 0000"
257	257	list [expr {[winfo reqwidth .t.l] eq 6*$ax}] \
258	258	[expr {[winfo reqheight .t.l] eq 2*$ay}]

271	271	update
272	272	set ax [winfo reqwidth .t.l]
273	273	set ay [winfo reqheight .t.l]
274
	274
275	275	.t.l config -wrap [expr {$ax*12}] -text "000000 0000000"
276	276	list [expr {[winfo reqwidth .t.l] eq 7*$ax}] \
277	277	[expr {[winfo reqheight .t.l] eq 2*$ay}]

290	290	update
291	291	set ax [winfo reqwidth .t.l]
292	292	set ay [winfo reqheight .t.l]
293
	293
294	294	.t.l config -wrap [expr {$ax*12}] -text "000 00 00000"
295	295	list [expr {[winfo reqwidth .t.l] eq 7*$ax}] \
296	296	[expr {[winfo reqheight .t.l] eq 2*$ay}]

309	309	update
310	310	set ax [winfo reqwidth .t.l]
311	311	set ay [winfo reqheight .t.l]
312
	312
313	313	.t.l config -wrap [expr {$ax*12}] -text "0000000000000000"
314	314	list [expr {[winfo reqwidth .t.l] eq 12*$ax}] \
315	315	[expr {[winfo reqheight .t.l] eq 2*$ay}]

326	326	-text "0" -font systemfixed
327	327	pack .t.l
328	328	update
329
	329
330	330	set font [.t.l cget -font]
331	331	.t.l config -font {{MS Sans Serif} 8} -text "W"
332	332	set width [winfo reqwidth .t.l]

+3

-3

tests/winMenu.test less more

480	480	"error 1"
481	481	(menu invoke)}} {} {}}
482	482
483
	483
484	484	# Can't test WM_MENUCHAR
485	485
486	486	test winMenu-11.4 {TkWinHandleMenuEvent - WM_MEASUREITEM} -constraints {

787	787	.m1 add command -label foo -underline 0
788	788	set tearoff [tk::TearOffMenu .m1 40 40]
789	789	list [update] [destroy .m1]
790		} -result {{} {}}
	790	} -result {{} {}}
791	791
792	792
793	793	test winMenu-23.1 {Don't know how to test MenuKeyBindProc} -constraints {

1342	1342	.m1 add command -label four
1343	1343	.m1 add command -label five -columnbreak 1
1344	1344	.m1 add command -label six
1345		list [update idletasks] [destroy .m1]
	1345	list [update idletasks] [destroy .m1]
1346	1346	} -result {{} {}}
1347	1347
1348	1348

+1

-1

tests/winSend.test less more

6	6	# Copyright (c) 1998-1999 by Scriptics Corporation.
7	7	# All rights reserved.
8	8
9		package require tcltest 2.1
	9	package require tcltest 2.2
10	10	eval tcltest::configure $argv
11	11	tcltest::loadTestedCommands
12	12

+10

-10

tests/winWm.test less more

473	473	global winwm90done
474	474	set winwm90done wait
475	475	toplevel .t
476		} -body {
	476	} -body {
477	477	pack [button .t.b -text "Show" -command {winwm90proc1 .tx}]
478	478	bind .t.b <Map> {bind %W <Map> {}; after idle {winwm90click %W}}
479	479	after 5000 {set winwm90done timeout}

484	484	rename winwm90$cmd {}
485	485	}
486	486	destroy .tx .t .sd
487		} -result {ok}
	487	} -result ok
488	488
489	489	test winWm-9.1 "delayed activation of grabbed destroyed window" -constraints win -setup {
490	490	proc winwm91click {w} {

518	518	global winwm91done
519	519	set winwm91done wait
520	520	toplevel .t
521		} -body {
	521	} -body {
522	522	pack [button .t.b -text "Show" -command {winwm91proc1 .tx}]
523	523	bind .t.b <Map> {bind %W <Map> {}; after idle {winwm91click %W}}
524	524	after 5000 {set winwm91done timeout}

529	529	rename winwm91$cmd {}
530	530	}
531	531	destroy .tx .t .sd
532		} -result {ok}
533
534		test winWm-9.2 "check wm forget for unmapped parent (#3205464,#2967911)" -setup {
	532	} -result ok
	533
	534	test winWm-9.2 "check wm forget for unmapped parent (#3205464,#2967911)" -constraints failsOnUbuntu -setup {
535	535	destroy .t
536	536	toplevel .t
537	537	set winwm92 {}

540	540	} -body {
541	541	pack .t.f.x
542	542	pack .t.f
543		lappend aid [after 2000 {set ::winwm92 timeout}] [after 100 {
	543	lappend aid [after 5000 {set ::winwm92 timeout}] [after 500 {
544	544	wm manage .t.f
545	545	wm iconify .t
546		lappend aid [after 100 {
	546	lappend aid [after 500 {
547	547	wm forget .t.f
548	548	wm deiconify .t
549		lappend aid [after 100 {
	549	lappend aid [after 500 {
550	550	pack .t.f
551		lappend aid [after 100 {
	551	lappend aid [after 500 {
552	552	set ::winwm92 [expr {
553	553	[winfo rooty .t.f.x] == 0 ? "failed" : "ok"}]}]
554	554	}]

+5

-2

tests/winfo.test less more

9	9	namespace import ::tcltest::*
10	10	tcltest::configure {*}$argv
11	11	tcltest::loadTestedCommands
	12
	13	testConstraint failsOnUbuntu [expr {![info exists ::env(CI)] \|\| ![string match Linux $::tcl_platform(os)]}]
	14	testConstraint failsOnXQuarz [expr {$tcl_platform(os) ne "Darwin" \|\| [tk windowingsystem] ne "x11" }]
12	15
13	16	# eatColors --
14	17	# Creates a toplevel window and allocates enough colors in it to

290	293	test winfo-9.3 {"winfo viewable" command} -body {
291	294	winfo viewable .
292	295	} -result {1}
293		test winfo-9.4 {"winfo viewable" command} -body {
	296	test winfo-9.4 {"winfo viewable" command} -constraints failsOnUbuntu -body {
294	297	wm iconify .
295	298	winfo viewable .
296	299	} -cleanup {

319	322	} -cleanup {
320	323	deleteWindows
321	324	} -result {0 0}
322		test winfo-9.7 {"winfo viewable" command} -setup {
	325	test winfo-9.7 {"winfo viewable" command} -constraints {failsOnUbuntu failsOnXQuarz} -setup {
323	326	deleteWindows
324	327	} -body {
325	328	frame .f1 -width 100 -height 100 -relief raised -bd 2

+124

-115

tests/wm.test less more

10	10	# Window manager tests that only work on a specific platform should be placed
11	11	# in unixWm.test or winWm.test.
12	12
13		package require tcltest 2.1
	13	package require tcltest 2.2
14	14	eval tcltest::configure $argv
15	15	tcltest::loadTestedCommands
16	16

26	26	update
27	27	}
28	28
	29	testConstraint failsOnUbuntu [expr {![info exists ::env(CI)] \|\| ![string match Linux $::tcl_platform(os)]}]
	30	testConstraint failsOnXQuarz [expr {$tcl_platform(os) ne "Darwin" \|\| [tk windowingsystem] ne "x11" }]
	31
29	32	# [raise] and [lower] may return before the window manager has completed the
30	33	# operation. The raiseDelay procedure idles for a while to give the operation
31	34	# a chance to complete.
32	35	#
33	36
34	37	proc raiseDelay {} {
35		after 100; update
	38	after 100;
	39	update
	40	update idletasks
36	41	}
37	42
38	43	# How to carry out a small delay while processing events

804	809	destroy .t2 .r.f
805	810	} -result {can't iconify .t2: it is an embedded window}
806	811
807		test wm-iconify-3.1 {iconify behavior} -body {
	812	test wm-iconify-3.1 {iconify behavior} -constraints failsOnUbuntu -body {
808	813	toplevel .t2
809	814	wm geom .t2 -0+0
810		update
	815	update idletasks
811	816	set result [winfo ismapped .t2]
812	817	wm iconify .t2
813		update
	818	update idletasks
814	819	lappend result [winfo ismapped .t2]
815	820	} -cleanup {
816	821	destroy .t2

1412	1417
1413	1418	deleteWindows
1414	1419
1415		test wm-stackorder-3.1 {unmapped toplevel} -body {
	1420	test wm-stackorder-3.1 {unmapped toplevel} -constraints failsOnUbuntu -body {
1416	1421	toplevel .t1 ; update
1417	1422	toplevel .t2 ; update
1418	1423	wm iconify .t1

1522	1527	destroy .t
1523	1528	} -result {.t .}
1524	1529	test wm-stackorder-5.2 {A normal toplevel can't be raised above an \
1525		overrideredirect toplevel on unix} -constraints x11 -body {
1526		toplevel .t
1527		tkwait visibility .t
	1530	overrideredirect toplevel on unix} -constraints {x11 failsOnUbuntu failsOnXQuarz} -body {
	1531	toplevel .t
	1532	tkwait visibility .t
1528	1533	wm overrideredirect .t 1
1529	1534	raise .
1530	1535	update

1536	1541	test wm-stackorder-5.2.1 {A normal toplevel can be raised above an \
1537	1542	overrideredirect toplevel on macOS or win} -constraints aquaOrWin32 -body {
1538	1543	toplevel .t
1539		tkwait visibility .t
	1544	tkwait visibility .t
1540	1545	wm overrideredirect .t 1
1541	1546	raise .
1542	1547	update

1546	1551	destroy .t
1547	1552	} -result 1
1548	1553	test wm-stackorder-5.3 {An overrideredirect window\
1549		can be explicitly lowered} -body {
1550		toplevel .t
1551		tkwait visibility .t
	1554	can be explicitly lowered} -constraints failsOnXQuarz -body {
	1555	toplevel .t
	1556	tkwait visibility .t
1552	1557	wm overrideredirect .t 1
1553	1558	lower .t
1554	1559	update

1605	1610	} -result {bad window path name "foo"}
1606	1611	deleteWindows
1607	1612	test wm-transient-1.4 {usage} -returnCodes error -body {
1608		toplevel .master
	1613	toplevel .top
1609	1614	toplevel .subject
1610		wm transient .subject .master
	1615	wm transient .subject .top
1611	1616	wm iconify .subject
1612	1617	} -cleanup {
1613	1618	deleteWindows

1631	1636	deleteWindows
1632	1637	} -result {can't make ".icon" a master: it is an icon for .top}
1633	1638	test wm-transient-1.7 {usage} -returnCodes error -body {
1634		toplevel .master
1635		wm transient .master .master
1636		} -cleanup {
1637		deleteWindows
1638		} -result {setting ".master" as master creates a transient/master cycle}
	1639	toplevel .top
	1640	wm transient .top .top
	1641	} -cleanup {
	1642	deleteWindows
	1643	} -result {setting ".top" as master creates a transient/master cycle}
1639	1644	test wm-transient-1.8 {usage} -returnCodes error -body {
1640	1645	toplevel .t1
1641	1646	toplevel .t2

1647	1652	deleteWindows
1648	1653	} -result {setting ".t3" as master creates a transient/master cycle}
1649	1654	test wm-transient-1.9 {usage} -returnCodes error -body {
1650		toplevel .master
1651		frame .master.f
1652		wm transient .master .master.f
1653		} -cleanup {
1654		deleteWindows
1655		} -result {setting ".master" as master creates a transient/master cycle}
1656
1657		test wm-transient-2.1 {basic get/set of master} -setup {
	1655	toplevel .top
	1656	frame .top.f
	1657	wm transient .top .top.f
	1658	} -cleanup {
	1659	deleteWindows
	1660	} -result {setting ".top" as master creates a transient/master cycle}
	1661
	1662	test wm-transient-2.1 {basic get/set of toplevel} -setup {
1658	1663	set results [list]
1659	1664	} -body {
1660		toplevel .master
	1665	toplevel .top
1661	1666	toplevel .subject
1662	1667	lappend results [wm transient .subject]
1663		wm transient .subject .master
	1668	wm transient .subject .top
1664	1669	lappend results [wm transient .subject]
1665	1670	wm transient .subject {}
1666	1671	lappend results [wm transient .subject]
1667	1672	} -cleanup {
1668	1673	deleteWindows
1669		} -result {{} .master {}}
1670		test wm-transient-2.2 {first toplevel parent of non-toplevel master is used} -body {
1671		toplevel .master
1672		frame .master.f
	1674	} -result {{} .top {}}
	1675	test wm-transient-2.2 {first toplevel parent of non-toplevel container window is used} -body {
	1676	toplevel .top
	1677	frame .top.f
1673	1678	toplevel .subject
1674		wm transient .subject .master.f
	1679	wm transient .subject .top.f
1675	1680	wm transient .subject
1676	1681	} -cleanup {
1677	1682	deleteWindows
1678		} -result {.master}
	1683	} -result {.top}
1679	1684
1680	1685	test wm-transient-3.1 {transient toplevel is withdrawn
1681		when mapped if master is withdrawn} -body {
1682		toplevel .master
1683		wm withdraw .master
	1686	when mapped if toplevel is withdrawn} -body {
	1687	toplevel .top
	1688	wm withdraw .top
1684	1689	update
1685	1690	toplevel .subject
1686		wm transient .subject .master
	1691	wm transient .subject .top
1687	1692	update
1688	1693	list [wm state .subject] [winfo ismapped .subject]
1689	1694	} -cleanup {
1690	1695	deleteWindows
1691	1696	} -result {withdrawn 0}
1692	1697	test wm-transient-3.2 {already mapped transient toplevel
1693		takes on withdrawn state of master} -body {
1694		toplevel .master
1695		wm withdraw .master
	1698	takes on withdrawn state of toplevel} -body {
	1699	toplevel .top
	1700	wm withdraw .top
1696	1701	update
1697	1702	toplevel .subject
1698	1703	update
1699		wm transient .subject .master
	1704	wm transient .subject .top
1700	1705	update
1701	1706	list [wm state .subject] [winfo ismapped .subject]
1702	1707	} -cleanup {
1703	1708	deleteWindows
1704	1709	} -result {withdrawn 0}
1705		test wm-transient-3.3 {withdraw/deiconify on the master
	1710	test wm-transient-3.3 {withdraw/deiconify on the toplevel
1706	1711	also does a withdraw/deiconify on the transient} -setup {
1707	1712	set results [list]
1708	1713	} -body {
1709		toplevel .master
	1714	toplevel .top
1710	1715	toplevel .subject
1711	1716	update
1712		wm transient .subject .master
1713		wm withdraw .master
	1717	wm transient .subject .top
	1718	wm withdraw .top
1714	1719	update
1715	1720	lappend results [wm state .subject] [winfo ismapped .subject]
1716		wm deiconify .master
	1721	wm deiconify .top
1717	1722	update
1718	1723	lappend results [wm state .subject] [winfo ismapped .subject]
1719	1724	} -cleanup {

1721	1726	} -result {withdrawn 0 normal 1}
1722	1727
1723	1728	test wm-transient-4.1 {transient toplevel is withdrawn
1724		when mapped if master is iconic} -body {
1725		toplevel .master
1726		wm iconify .master
	1729	when mapped if toplevel is iconic} -constraints {failsOnUbuntu failsOnXQuarz} -body {
	1730	toplevel .top
	1731	wm iconify .top
1727	1732	update
1728	1733	toplevel .subject
1729		wm transient .subject .master
	1734	wm transient .subject .top
1730	1735	update
1731	1736	list [wm state .subject] [winfo ismapped .subject]
1732	1737	} -cleanup {
1733	1738	deleteWindows
1734	1739	} -result {withdrawn 0}
1735	1740	test wm-transient-4.2 {already mapped transient toplevel
1736		is withdrawn if master is iconic} -body {
1737		toplevel .master
	1741	is withdrawn if toplevel is iconic} -constraints failsOnUbuntu -body {
	1742	toplevel .top
1738	1743	raiseDelay
1739		wm iconify .master
1740		update
	1744	wm iconify .top
	1745	update idletasks
1741	1746	toplevel .subject
1742		update
1743		wm transient .subject .master
1744		update
	1747	update idletasks
	1748	wm transient .subject .top
	1749	update idletasks
1745	1750	list [wm state .subject] [winfo ismapped .subject]
1746	1751	} -cleanup {
1747	1752	deleteWindows
1748	1753	} -result {withdrawn 0}
1749		test wm-transient-4.3 {iconify/deiconify on the master
1750		does a withdraw/deiconify on the transient} -setup {
	1754	test wm-transient-4.3 {iconify/deiconify on the toplevel
	1755	does a withdraw/deiconify on the transient} -constraints failsOnUbuntu -setup {
1751	1756	set results [list]
1752	1757	} -body {
1753		toplevel .master
	1758	toplevel .top
1754	1759	toplevel .subject
1755		update
1756		wm transient .subject .master
1757		wm iconify .master
1758		update
	1760	update idletasks
	1761	wm transient .subject .top
	1762	wm iconify .top
	1763	update idletasks
1759	1764	lappend results [wm state .subject] [winfo ismapped .subject]
1760		wm deiconify .master
1761		update
	1765	wm deiconify .top
	1766	update idletasks
1762	1767	lappend results [wm state .subject] [winfo ismapped .subject]
1763	1768	} -cleanup {
1764	1769	deleteWindows

1768	1773	cause the map/unmap binding to be deleted} -setup {
1769	1774	set results [list]
1770	1775	} -body {
1771		toplevel .master
	1776	toplevel .top
1772	1777	toplevel .subject
1773	1778	update
1774		wm transient .subject .master
	1779	wm transient .subject .top
1775	1780	# Expect a bad window path error here
1776	1781	lappend results [catch {wm transient .subject .bad}]
1777		wm withdraw .master
	1782	wm withdraw .top
1778	1783	update
1779	1784	lappend results [wm state .subject]
1780		wm deiconify .master
	1785	wm deiconify .top
1781	1786	update
1782	1787	lappend results [wm state .subject]
1783	1788	} -cleanup {
1784	1789	deleteWindows
1785	1790	} -result {1 withdrawn normal}
1786		test wm-transient-5.2 {remove transient property when master
	1791	test wm-transient-5.2 {remove transient property when toplevel
1787	1792	is destroyed} -body {
1788		toplevel .master
	1793	toplevel .top
1789	1794	toplevel .subject
1790		wm transient .subject .master
1791		update
1792		destroy .master
	1795	wm transient .subject .top
	1796	update
	1797	destroy .top
1793	1798	update
1794	1799	wm transient .subject
1795	1800	} -cleanup {
1796	1801	deleteWindows
1797	1802	} -result {}
1798	1803	test wm-transient-5.3 {remove transient property from window
1799		that had never been mapped when master is destroyed} -body {
1800		toplevel .master
	1804	that had never been mapped when toplevel is destroyed} -body {
	1805	toplevel .top
1801	1806	toplevel .subject
1802		wm transient .subject .master
1803		destroy .master
	1807	wm transient .subject .top
	1808	destroy .top
1804	1809	wm transient .subject
1805	1810	} -cleanup {
1806	1811	deleteWindows
1807	1812	} -result {}
1808	1813
1809	1814	test wm-transient-6.1 {a withdrawn transient does not track
1810		state changes in the master} -body {
1811		toplevel .master
	1815	state changes in the toplevel} -body {
	1816	toplevel .top
1812	1817	toplevel .subject
1813	1818	update
1814		wm transient .subject .master
	1819	wm transient .subject .top
1815	1820	wm withdraw .subject
1816		wm withdraw .master
1817		wm deiconify .master
	1821	wm withdraw .top
	1822	wm deiconify .top
1818	1823	# idle handler should not map the transient
1819	1824	update
1820	1825	wm state .subject

1822	1827	deleteWindows
1823	1828	} -result {withdrawn}
1824	1829	test wm-transient-6.2 {a withdrawn transient does not track
1825		state changes in the master} -setup {
	1830	state changes in the toplevel} -setup {
1826	1831	set results [list]
1827	1832	} -body {
1828		toplevel .master
	1833	toplevel .top
1829	1834	toplevel .subject
1830	1835	update
1831		wm transient .subject .master
	1836	wm transient .subject .top
1832	1837	wm withdraw .subject
1833		wm withdraw .master
1834		wm deiconify .master
	1838	wm withdraw .top
	1839	wm deiconify .top
1835	1840	# idle handler should not map the transient
1836	1841	update
1837	1842	lappend results [wm state .subject]
1838	1843	wm deiconify .subject
1839	1844	lappend results [wm state .subject]
1840		wm withdraw .master
	1845	wm withdraw .top
1841	1846	lappend results [wm state .subject]
1842		wm deiconify .master
	1847	wm deiconify .top
1843	1848	# idle handler should map transient
1844	1849	update
1845	1850	lappend results [wm state .subject]

1847	1852	deleteWindows
1848	1853	} -result {withdrawn normal withdrawn normal}
1849	1854	test wm-transient-6.3 {a withdrawn transient does not track
1850		state changes in the master} -body {
1851		toplevel .master
	1855	state changes in the toplevel} -body {
	1856	toplevel .top
1852	1857	toplevel .subject
1853	1858	update
1854	1859	# withdraw before making window a transient
1855	1860	wm withdraw .subject
1856		wm transient .subject .master
1857		wm withdraw .master
1858		wm deiconify .master
	1861	wm transient .subject .top
	1862	wm withdraw .top
	1863	wm deiconify .top
1859	1864	# idle handler should not map the transient
1860	1865	update
1861	1866	wm state .subject

1863	1868	deleteWindows
1864	1869	} -result {withdrawn}
1865	1870
1866		# wm-transient-7.*: See SF Tk Bug #592201 "wm transient fails with two masters"
	1871	# wm-transient-7.*: See SF Tk Bug #592201 "wm transient fails with two toplevels"
1867	1872	# wm-transient-7.3 through 7.5 all caused panics on Unix in Tk 8.4b1.
1868	1873	# 7.1 and 7.2 added to catch (potential) future errors.
1869	1874	#

1877	1882	} -cleanup {
1878	1883	deleteWindows
1879	1884	}
1880		test wm-transient-7.2 {Destroying master} -body {
1881		toplevel .t
	1885	test wm-transient-7.2 {Destroying toplevel} -body {
	1886	toplevel .top
1882	1887	toplevel .transient
1883		wm transient .transient .t
1884		destroy .t
	1888	wm transient .transient .top
	1889	destroy .top
1885	1890	wm transient .transient
1886	1891	} -cleanup {
1887	1892	deleteWindows
1888	1893	} -result {}
1889		test wm-transient-7.3 {Reassign transient, destroy old master} -body {
	1894	test wm-transient-7.3 {Reassign transient, destroy old toplevel} -body {
1890	1895	toplevel .t1
1891	1896	toplevel .t2
1892	1897	toplevel .transient

1898	1903	} -cleanup {
1899	1904	deleteWindows
1900	1905	}
1901		test wm-transient-7.4 {Reassign transient, destroy new master} -body {
	1906	test wm-transient-7.4 {Reassign transient, destroy new toplevel} -body {
1902	1907	toplevel .t1
1903	1908	toplevel .t2
1904	1909	toplevel .transient

1923	1928	deleteWindows
1924	1929	}
1925	1930
1926		test wm-transient-8.1 {transient to withdrawn window, Bug 1163496} -setup {
	1931	test wm-transient-8.1 {transient to withdrawn window, Bug 1163496} -constraints {failsOnUbuntu failsOnXQuarz} -setup {
1927	1932	deleteWindows
1928	1933	set result {}
1929	1934	} -body {
1930		# Verifies that transients stay on top of their masters, even if they were
1931		# made transients when those masters were withdrawn.
	1935	# Verifies that transients stay on top of their toplevels, even if they were
	1936	# made transients when those toplevels were withdrawn.
1932	1937	toplevel .t1; wm withdraw .t1; update
1933	1938	toplevel .t2; wm transient .t2 .t1; update
1934	1939	lappend result [winfo ismapped .t1] [winfo ismapped .t2]

2000	2005	} -cleanup {
2001	2006	deleteWindows
2002	2007	} -result {iconic}
2003		test wm-state-2.8 {state change after map} -body {
	2008	test wm-state-2.8 {state change after map} -constraints failsOnUbuntu -body {
2004	2009	toplevel .t
2005	2010	update
2006	2011	wm state .t iconic

2008	2013	} -cleanup {
2009	2014	deleteWindows
2010	2015	} -result {iconic}
2011		test wm-state-2.9 {state change after map} -body {
	2016	test wm-state-2.9 {state change after map} -constraints failsOnUbuntu -body {
2012	2017	toplevel .t
2013	2018	update
2014	2019	wm iconify .t

2309	2314	test wm-forget-2 {bug [e9112ef96e] - [wm forget] doesn't completely} -setup {
2310	2315	catch {destroy .l .f.b .f}
2311	2316	set res {}
	2317	if {[tk windowingsystem] == "aqua"} {
	2318	proc doUpdate {} {update idletasks}
	2319	} else {
	2320	proc doUpdate {} {update}
	2321	}
2312	2322	} -body {
2313	2323	label .l -text "Top Dot"
2314	2324	frame .f

2316	2326	pack .l -side top
2317	2327	pack .f.b
2318	2328	pack .f -side bottom
2319		update
2320	2329	set res [winfo manager .f]
2321	2330	pack forget .f
2322		update
	2331	doUpdate
2323	2332	lappend res [winfo manager .f]
2324	2333	wm manage .f
2325		update
	2334	doUpdate
2326	2335	lappend res [winfo manager .f]
2327	2336	wm forget .f
2328		update
	2337	doUpdate
2329	2338	lappend res [winfo manager .f]
2330	2339	} -cleanup {
2331	2340	destroy .l .f.b .f

+37

-29

unix/Makefile.in less more

100	100	# The directory containing the Tcl sources and headers appropriate
101	101	# for this version of Tk ("srcdir" will be replaced or has already
102	102	# been replaced by the configure script):
103		TCL_GENERIC_DIR = @TCL_SRC_DIR@/generic
	103	TCLDIR = @TCL_SRC_DIR@
	104	TCL_GENERIC_DIR = $(TCLDIR)/generic
104	105
105	106	# The directory containing the platform specific Tcl sources and headers
106	107	# appropriate for this version of Tk:
107		TCL_PLATFORM_DIR = @TCL_SRC_DIR@/unix
	108	TCL_PLATFORM_DIR = $(TCLDIR)/unix
108	109
109	110	# The directory containing the Tcl library archive file appropriate
110	111	# for this version of Tk:

310	311	TTK_DIR = $(GENERIC_DIR)/ttk
311	312	UNIX_DIR = $(TOP_DIR)/unix
312	313	BMAP_DIR = $(TOP_DIR)/bitmaps
313		TOOL_DIR = @TCL_SRC_DIR@/tools
	314	TOOL_DIR = $(TCLDIR)/tools
314	315	TEST_DIR = $(TOP_DIR)/tests
315	316	MAC_OSX_DIR = $(TOP_DIR)/macosx
316	317	XLIB_DIR = $(TOP_DIR)/xlib

327	328
328	329	CC = @CC@
329	330
330		CC_SWITCHES_NO_STUBS = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
331		-I${UNIX_DIR} -I${GENERIC_DIR} -I${BMAP_DIR} -I${TCL_GENERIC_DIR} \
332		-I${TCL_PLATFORM_DIR} ${@TK_WINDOWINGSYSTEM@_INCLUDES} ${AC_FLAGS} \
	331	CC_SWITCHES_NO_STUBS = -I${UNIX_DIR} -I${GENERIC_DIR} -I${BMAP_DIR} \
	332	${@TK_WINDOWINGSYSTEM@_INCLUDES} ${CFLAGS} ${CFLAGS_WARNING} \
	333	${SHLIB_CFLAGS} -I${TCL_GENERIC_DIR} -I${TCL_PLATFORM_DIR} ${AC_FLAGS} \
333	334	${PROTO_FLAGS} ${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS} \
334	335	${NO_DEPRECATED_FLAGS} @EXTRA_CC_SWITCHES@
335	336

337	338
338	339	APP_CC_SWITCHES = $(CC_SWITCHES_NO_STUBS) @EXTRA_APP_CC_SWITCHES@
339	340
340		DEPEND_SWITCHES = ${CFLAGS} -I${UNIX_DIR} -I${GENERIC_DIR} -I${BMAP_DIR} \
341		-I${TCL_GENERIC_DIR} -I${TCL_PLATFORM_DIR} ${@TK_WINDOWINGSYSTEM@_INCLUDES} \
342		${AC_FLAGS} ${PROTO_FLAGS} ${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} \
343		${KEYSYM_FLAGS} @EXTRA_CC_SWITCHES@
	341	DEPEND_SWITCHES = -I${UNIX_DIR} -I${GENERIC_DIR} -I${BMAP_DIR} \
	342	${@TK_WINDOWINGSYSTEM@_INCLUDES} ${CFLAGS} -I${TCL_GENERIC_DIR} \
	343	-I${TCL_PLATFORM_DIR} ${AC_FLAGS} ${PROTO_FLAGS} ${SECURITY_FLAGS} \
	344	${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS} @EXTRA_CC_SWITCHES@
344	345
345	346	WISH_OBJS = tkAppInit.o
346	347

569	570	SHELL_ENV = \
570	571	@LD_LIBRARY_PATH_VAR@="`pwd`:${TCL_BIN_DIR}:$${@LD_LIBRARY_PATH_VAR@}"; \
571	572	export @LD_LIBRARY_PATH_VAR@; \
572		TCL_LIBRARY=@TCL_SRC_DIR@/library; export TCL_LIBRARY; \
	573	TCL_LIBRARY=$(TCLDIR)/library; export TCL_LIBRARY; \
573	574	TK_LIBRARY=@TK_SRC_DIR@/library; export TK_LIBRARY;
574	575
575	576	all: binaries libraries doc

579	580	libraries:
580	581
581	582	$(TOP_DIR)/doc/man.macros:
582		$(INSTALL_DATA) @TCL_SRC_DIR@/doc/man.macros $(TOP_DIR)/doc/man.macros
	583	$(INSTALL_DATA) $(TCLDIR)/doc/man.macros $(TOP_DIR)/doc/man.macros
583	584
584	585	doc: $(TOP_DIR)/doc/man.macros
585	586

632	633	$(MAKE) tktest-real LIB_RUNTIME_DIR="`pwd`:$(TCL_BIN_DIR)"
633	634
634	635	tktest-real: ${TK_STUB_LIB_FILE}
635		${CC} ${CFLAGS} ${LDFLAGS} $(TKTEST_OBJS) ${TK_STUB_LIB_FILE} ${TCL_STUB_LIB_SPEC} @TK_BUILD_LIB_SPEC@ \
636		$(WISH_LIBS) $(CC_SEARCH_FLAGS) -o $(TKTEST_EXE)
	636	${CC} ${CFLAGS} ${LDFLAGS} $(TKTEST_OBJS) @TK_BUILD_LIB_SPEC@ $(WISH_LIBS) \
	637	${TK_STUB_LIB_FILE} ${TCL_STUB_LIB_SPEC} $(CC_SEARCH_FLAGS) -o $(TKTEST_EXE)
637	638
638	639	# # FIXME: This xttest rule seems to be broken in a number of ways. It should
639	640	# # use CC_SEARCH_FLAGS, it does not include the shared lib location logic from

685	686	# This target can be used to run wish inside either gdb or insight
686	687	gdb: ${WISH_EXE}
687	688	@echo "set env @LD_LIBRARY_PATH_VAR@=\"`pwd`:${TCL_BIN_DIR}:$${@LD_LIBRARY_PATH_VAR@}\"" > gdb.run
688		@echo "set env TCL_LIBRARY=@TCL_SRC_DIR@/library" >> gdb.run
	689	@echo "set env TCL_LIBRARY=$(TCLDIR)/library" >> gdb.run
689	690	@echo "set env TK_LIBRARY=@TK_SRC_DIR@/library" >> gdb.run
690	691	gdb ./${WISH_EXE} --command=gdb.run
691	692	rm gdb.run

747	748	@if test -f "tk${MAJOR_VERSION}${MINOR_VERSION}.dll"; then \
748	749	$(INSTALL_LIBRARY) "tk${MAJOR_VERSION}${MINOR_VERSION}.dll" "$(DLL_INSTALL_DIR)";\
749	750	chmod 555 "$(DLL_INSTALL_DIR)/tk${MAJOR_VERSION}${MINOR_VERSION}.dll";\
750		$(INSTALL_LIBRARY) "../win/libtk${MAJOR_VERSION}${MINOR_VERSION}.a" "$(LIB_INSTALL_DIR)";\
751		chmod 555 "$(LIB_INSTALL_DIR)/libtk${MAJOR_VERSION}${MINOR_VERSION}.a";\
	751	$(INSTALL_LIBRARY) "../win/libtk${MAJOR_VERSION}${MINOR_VERSION}.dll.a" "$(LIB_INSTALL_DIR)";\
	752	chmod 555 "$(LIB_INSTALL_DIR)/libtk${MAJOR_VERSION}${MINOR_VERSION}.dll.a";\
752	753	fi
753	754	@echo "Installing ${WISH_EXE} as $(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}"
754	755	@$(INSTALL_PROGRAM) ${WISH_EXE} "$(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}"

760	761	fi
761	762	@EXTRA_INSTALL_BINARIES@
762	763	@echo "Installing pkg-config file to $(LIB_INSTALL_DIR)/pkgconfig/"
763		@$(INSTALL_DATA_DIR) $(LIB_INSTALL_DIR)/pkgconfig
764		@$(INSTALL_DATA) tk.pc $(LIB_INSTALL_DIR)/pkgconfig/tk.pc
	764	@$(INSTALL_DATA_DIR) "$(LIB_INSTALL_DIR)/pkgconfig"
	765	@$(INSTALL_DATA) tk.pc "$(LIB_INSTALL_DIR)/pkgconfig/tk.pc"
765	766
766	767	install-libraries: libraries
767	768	@for i in "$(SCRIPT_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)/images" \

1204	1205	$(CC) -c $(CC_SWITCHES) $(XFT_CFLAGS) $(UNIX_DIR)/tkUnixRFont.c
1205	1206
1206	1207	tkUnixInit.o: $(UNIX_DIR)/tkUnixInit.c tkConfig.sh
1207		$(CC) -c $(CC_SWITCHES) -DTK_LIBRARY=\"${TK_LIBRARY}\" \
	1208	$(CC) -c $(CC_SWITCHES) \
1208	1209	$(UNIX_DIR)/tkUnixInit.c
1209	1210
1210	1211	tkUnixKey.o: $(UNIX_DIR)/tkUnixKey.c

1280	1281	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXImage.c
1281	1282
1282	1283	tkMacOSXInit.o: $(MAC_OSX_DIR)/tkMacOSXInit.c tkConfig.sh
1283		$(CC) -c $(CC_SWITCHES) -DTK_LIBRARY=\"${TK_LIBRARY}\" \
	1284	$(CC) -c $(CC_SWITCHES) \
1284	1285	$(MAC_OSX_DIR)/tkMacOSXInit.c
1285	1286
1286	1287	tkMacOSXKeyboard.o: $(MAC_OSX_DIR)/tkMacOSXKeyboard.c

1529	1530
1530	1531	#
1531	1532	# Target to create a proper Tk distribution from information in the
1532		# master source directory. DISTDIR must be defined to indicate where
	1533	# source directory. DISTDIR must be defined to indicate where
1533	1534	# to put the distribution. DISTDIR must be an absolute path name.
1534	1535	#
1535	1536

1537	1538	DISTNAME = tk${VERSION}${PATCH_LEVEL}
1538	1539	ZIPNAME = tk${MAJOR_VERSION}${MINOR_VERSION}${PATCH_LEVEL}-src.zip
1539	1540	DISTDIR = $(DISTROOT)/$(DISTNAME)
1540		TCLDIR = @TCL_SRC_DIR@
1541	1541	$(UNIX_DIR)/configure: $(UNIX_DIR)/configure.in $(UNIX_DIR)/tcl.m4 \
1542	1542	$(UNIX_DIR)/aclocal.m4
1543	1543	cd $(UNIX_DIR); autoconf

1546	1546	$(UNIX_DIR)/tkConfig.h.in: $(MAC_OSX_DIR)/configure
1547	1547	cd $(MAC_OSX_DIR); autoheader; touch $@
1548	1548
1549		dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in $(UNIX_DIR)/tk.pc.in $(MAC_OSX_DIR)/configure genstubs
	1549	$(TOP_DIR)/manifest.uuid:
	1550	printf "git." >$(TOP_DIR)/manifest.uuid
	1551	git rev-parse HEAD >>$(TOP_DIR)/manifest.uuid
	1552
	1553	dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in $(UNIX_DIR)/tk.pc.in $(MAC_OSX_DIR)/configure $(TOP_DIR)/doc/man.macros $(TOP_DIR)/manifest.uuid
1550	1554	rm -rf $(DISTDIR)
1551	1555	mkdir -p $(DISTDIR)/unix
	1556	cp -p $(TOP_DIR)/manifest.uuid $(DISTDIR)
1552	1557	cp -p $(UNIX_DIR)/.c $(UNIX_DIR)/.h $(DISTDIR)/unix
1553	1558	cp $(TOP_DIR)/license.terms $(UNIX_DIR)/Makefile.in $(DISTDIR)/unix
1554	1559	chmod 664 $(DISTDIR)/unix/Makefile.in
1555	1560	cp $(UNIX_DIR)/configure $(UNIX_DIR)/configure.in $(UNIX_DIR)/tk.spec \
1556	1561	$(UNIX_DIR)/aclocal.m4 $(UNIX_DIR)/tcl.m4 \
1557		$(UNIX_DIR)/tkConfig.sh.in $(TCLDIR)/unix/install-sh \
	1562	$(UNIX_DIR)/tkConfig.sh.in $(UNIX_DIR)/install-sh \
1558	1563	$(UNIX_DIR)/README $(UNIX_DIR)/installManPage \
1559	1564	$(UNIX_DIR)/tkConfig.h.in $(UNIX_DIR)/tk.pc.in $(DISTDIR)/unix
1560		chmod 775 $(DISTDIR)/unix/configure $(DISTDIR)/unix/configure.in
	1565	chmod 775 $(DISTDIR)/unix/configure
1561	1566	mkdir $(DISTDIR)/bitmaps
1562	1567	@(cd $(TOP_DIR); for i in bitmaps/* ; do \
1563	1568	if [ -f $$i ] ; then \

1607	1612	$(MAC_OSX_DIR)/Tk.xcodeproj/default.pbxuser \
1608	1613	$(DISTDIR)/macosx/Tk.xcodeproj
1609	1614	mkdir $(DISTDIR)/compat
1610		cp -p $(TOP_DIR)/license.terms $(TCLDIR)/compat/unistd.h \
1611		$(TCLDIR)/compat/stdlib.h \
	1615	cp -p $(TOP_DIR)/license.terms $(TOP_DIR)/compat/unistd.h \
	1616	$(TOP_DIR)/compat/stdlib.h \
1612	1617	$(DISTDIR)/compat
1613	1618	mkdir $(DISTDIR)/xlib
1614	1619	cp -p $(XLIB_DIR)/*.[ch] $(DISTDIR)/xlib

1655	1660	done;)
1656	1661	mkdir $(DISTDIR)/doc
1657	1662	cp -p $(TOP_DIR)/license.terms $(TOP_DIR)/doc/*.[13n] \
1658		$(TCLDIR)/doc/man.macros $(DISTDIR)/doc
	1663	$(TOP_DIR)/doc/man.macros $(DISTDIR)/doc
1659	1664	mkdir $(DISTDIR)/tests
1660	1665	cp -p $(TOP_DIR)/license.terms $(TEST_DIR)/*.{test,tcl} \
1661	1666	$(TEST_DIR)/README $(TEST_DIR)/*.{gif,png,ppm,xbm} \
1662	1667	$(TEST_DIR)/option.file* $(DISTDIR)/tests
1663	1668	mkdir $(DISTDIR)/tests/ttk
1664	1669	cp -p $(TEST_DIR)/ttk/*.{test,tcl} $(DISTDIR)/tests/ttk
	1670	cp -p $(TOP_DIR)/.travis.yml $(DISTDIR)
	1671	mkdir -p $(DISTDIR)/.github/workflows
	1672	cp -p $(TOP_DIR)/.github/workflows/*.yml $(DISTDIR)/.github/workflows
1665	1673
1666	1674	alldist: dist
1667	1675	rm -f $(DISTROOT)/$(DISTNAME)-src.tar.gz $(DISTROOT)/$(ZIPNAME)

+29

-40

unix/configure less more

1337	1337	TK_VERSION=8.6
1338	1338	TK_MAJOR_VERSION=8
1339	1339	TK_MINOR_VERSION=6
1340		TK_PATCH_LEVEL=".10"
	1340	TK_PATCH_LEVEL=".11"
1341	1341	VERSION=${TK_VERSION}
1342	1342	LOCALES="cs da de el en en_gb eo es fr hu it nl pl pt ru sv"
1343	1343

1485	1485	echo "$as_me:$LINENO: result: could not find ${TCL_BIN_DIR}/tclConfig.sh" >&5
1486	1486	echo "${ECHO_T}could not find ${TCL_BIN_DIR}/tclConfig.sh" >&6
1487	1487	fi
1488
1489		# eval is required to do the TCL_DBGX substitution
1490		eval "TCL_LIB_FILE=\"${TCL_LIB_FILE}\""
1491		eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
1492	1488
1493	1489	# If the TCL_BIN_DIR is the build directory (not the install directory),
1494	1490	# then set the common variable name to the value of the build variables.

1523	1519	esac
1524	1520	fi
1525	1521
1526		# eval is required to do the TCL_DBGX substitution
1527		eval "TCL_LIB_FLAG=\"${TCL_LIB_FLAG}\""
1528		eval "TCL_LIB_SPEC=\"${TCL_LIB_SPEC}\""
1529		eval "TCL_STUB_LIB_FLAG=\"${TCL_STUB_LIB_FLAG}\""
1530		eval "TCL_STUB_LIB_SPEC=\"${TCL_STUB_LIB_SPEC}\""
1531
1532	1522
1533	1523
1534	1524

3058	3048	cat >>conftest.$ac_ext <<_ACEOF
3059	3049	/* end confdefs.h. */
3060	3050	#include <ctype.h>
	3051	#include <stdlib.h>
3061	3052	#if ((' ' & 0x0FF) == 0x020)
3062	3053	# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
3063	3054	# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))

4028	4019	else
4029	4020	tcl_ok=yes
4030	4021	fi;
4031
4032		if test "${enable_shared+set}" = set; then
4033		enableval="$enable_shared"
4034		tcl_ok=$enableval
4035		else
4036		tcl_ok=yes
4037		fi
4038
4039	4022	if test "$tcl_ok" = "yes" ; then
4040	4023	echo "$as_me:$LINENO: result: shared" >&5
4041	4024	echo "${ECHO_T}shared" >&6

4401	4384	if test "$GCC" = yes; then
4402	4385
4403	4386	CFLAGS_OPTIMIZE=-O2
4404		CFLAGS_WARNING="-Wall"
	4387	CFLAGS_WARNING="-Wall -Wpointer-arith"
4405	4388
4406	4389	else
4407	4390

4692	4675	CC_SEARCH_FLAGS=""
4693	4676	LD_SEARCH_FLAGS=""
4694	4677	;;
4695		CYGWIN_\|MINGW32)
	4678	CYGWIN_\|MINGW32_\|MSYS_*)
4696	4679	SHLIB_CFLAGS=""
4697	4680	SHLIB_LD='${CC} -shared'
4698	4681	SHLIB_SUFFIX=".dll"

4703	4686	CC_SEARCH_FLAGS=""
4704	4687	LD_SEARCH_FLAGS=""
4705	4688	TCL_NEEDS_EXP_FILE=1
4706		TCL_EXPORT_FILE_SUFFIX='${VERSION}\$\{DBGX\}.dll.a'
	4689	TCL_EXPORT_FILE_SUFFIX='${VERSION}.dll.a'
4707	4690	SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,--out-implib,\$@.a"
4708	4691	echo "$as_me:$LINENO: checking for Cygwin version of gcc" >&5
4709	4692	echo $ECHO_N "checking for Cygwin version of gcc... $ECHO_C" >&6

5004	4987	SHLIB_LD='${CC} -shared'
5005	4988	if test $doRpath = yes; then
5006	4989
5007		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
	4990	CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
5008	4991	fi
5009	4992
5010	4993	LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}

5128	5111
5129	5112	if test $doRpath = yes; then
5130	5113
5131		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
	5114	CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
5132	5115	LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
5133	5116	fi
5134	5117

5149	5132
5150	5133	if test $doRpath = yes; then
5151	5134
5152		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
	5135	CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
5153	5136	LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
5154	5137	fi
5155	5138

5190	5173
5191	5174	if test $doRpath = yes; then
5192	5175
5193		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
	5176	CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
5194	5177	LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
5195	5178	fi
5196	5179

5233	5216	LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
5234	5217	if test $doRpath = yes; then
5235	5218
5236		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
	5219	CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
5237	5220	fi
5238	5221
5239	5222	LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}

5333	5316	LD_FLAGS="-Wl,--export-dynamic"
5334	5317	if test $doRpath = yes; then
5335	5318
5336		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
5337		LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
	5319	CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
	5320	LD_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
5338	5321	fi
5339	5322
5340	5323	;;

5375	5358	DL_LIBS=""
5376	5359	if test $doRpath = yes; then
5377	5360
5378		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
	5361	CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
5379	5362	fi
5380	5363
5381	5364	LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}

5405	5388	LDFLAGS="$LDFLAGS -export-dynamic"
5406	5389	if test $doRpath = yes; then
5407	5390
5408		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
	5391	CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
5409	5392	fi
5410	5393
5411	5394	LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}

5427	5410	SHLIB_SUFFIX=".so"
5428	5411	DL_OBJS="tclLoadDl.o"
5429	5412	DL_LIBS=""
5430		LDFLAGS=""
5431	5413	if test $doRpath = yes; then
5432	5414
5433		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
5434		LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
	5415	CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
	5416	LD_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
5435	5417	fi
5436	5418
5437	5419	if test "${TCL_THREADS}" = "1"; then

5756	5738	#define MODULE_SCOPE __private_extern__
5757	5739	_ACEOF
5758	5740
	5741	tcl_cv_cc_visibility_hidden=yes
5759	5742
5760	5743	fi
5761	5744

6019	6002	DL_LIBS=""
6020	6003	if test $doRpath = yes; then
6021	6004
6022		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
	6005	CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
6023	6006	LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
6024	6007	fi
6025	6008

6618	6601	case $system in
6619	6602	AIX-*) ;;
6620	6603	BSD/OS*) ;;
6621		CYGWIN_\|MINGW32_) ;;
	6604	CYGWIN_\|MINGW32_\|MSYS_*) ;;
6622	6605	IRIX*) ;;
6623	6606	NetBSD-\|DragonFly-\|FreeBSD-\|OpenBSD-) ;;
6624	6607	Darwin-*) ;;

6654	6637	if test "${SHARED_BUILD}" = 1 -a "${SHLIB_SUFFIX}" != ""; then
6655	6638
6656	6639	LIB_SUFFIX=${SHARED_LIB_SUFFIX}
6657		MAKE_LIB='${SHLIB_LD} -o $@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
	6640	MAKE_LIB='${SHLIB_LD} -o $@ ${OBJS} ${LDFLAGS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
6658	6641	if test "${SHLIB_SUFFIX}" = ".dll"; then
6659	6642
6660	6643	INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)";if test -f $(LIB_FILE).a; then $(INSTALL_DATA) $(LIB_FILE).a "$(LIB_INSTALL_DIR)"; fi;'

6830	6813	tcl_ok=no
6831	6814	fi;
6832	6815	# FIXME: Currently, LDFLAGS_DEFAULT is not used, it should work like CFLAGS_DEFAULT.
6833		DBGX=""
6834	6816	if test "$tcl_ok" = "no"; then
6835	6817	CFLAGS_DEFAULT='$(CFLAGS_OPTIMIZE)'
6836	6818	LDFLAGS_DEFAULT='$(LDFLAGS_OPTIMIZE)'

8815	8797	int
8816	8798	main ()
8817	8799	{
8818		struct passwd pwd; pwd.pw_gecos;
	8800	struct passwd pwd; (void)pwd.pw_gecos;
8819	8801	;
8820	8802	return 0;
8821	8803	}

10990	10972	echo "$LDFLAGS " \| grep -q -- '-prebind ' && TK_SHLIB_LD_EXTRAS="${TK_SHLIB_LD_EXTRAS}"' -seg1addr 0xb000000'
10991	10973	TK_SHLIB_LD_EXTRAS="${TK_SHLIB_LD_EXTRAS}"' -sectcreate __TEXT __info_plist Tk-Info.plist'
10992	10974	EXTRA_WISH_LIBS='-sectcreate __TEXT __info_plist Wish-Info.plist'
	10975	EXTRA_WISH_LIBS=${EXTRA_WISH_LIBS}' -sectcreate __TEXT __credits_html Credits.html'
	10976	if test "${SHARED_BUILD}" = "0"; then
	10977	EXTRA_WISH_LIBS=${EXTRA_WISH_LIBS}' -ObjC'
	10978	fi
10993	10979	EXTRA_APP_CC_SWITCHES="${EXTRA_APP_CC_SWITCHES}"' -mdynamic-no-pic'
10994		ac_config_files="$ac_config_files Tk-Info.plist:../macosx/Tk-Info.plist.in Wish-Info.plist:../macosx/Wish-Info.plist.in"
	10980	ac_config_files="$ac_config_files Tk-Info.plist:../macosx/Tk-Info.plist.in Wish-Info.plist:../macosx/Wish-Info.plist.in Credits.html:../macosx/Credits.html.in"
10995	10981
10996	10982	for l in ${LOCALES}; do CFBUNDLELOCALIZATIONS="${CFBUNDLELOCALIZATIONS}<string>$l</string>"; done
10997	10983	TK_YEAR="`date +%Y`"

11027	11013	EXTRA_INSTALL="install-private-headers html-tk"
11028	11014	EXTRA_BUILD_HTML='@ln -fs contents.htm "$(HTML_INSTALL_DIR)"/TkTOC.html'
11029	11015	EXTRA_INSTALL_BINARIES='@echo "Installing Info.plist to $(LIB_INSTALL_DIR)/Resources/" && $(INSTALL_DATA_DIR) "$(LIB_INSTALL_DIR)/Resources" && $(INSTALL_DATA) Tk-Info.plist "$(LIB_INSTALL_DIR)/Resources/Info.plist"'
	11016	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing Credits.html to $(LIB_INSTALL_DIR)/Resources/" && $(INSTALL_DATA_DIR) "$(LIB_INSTALL_DIR)/Resources" && $(INSTALL_DATA) Credits.html "$(LIB_INSTALL_DIR)/Resources"'
11030	11017	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing license.terms to $(LIB_INSTALL_DIR)/Resources/" && $(INSTALL_DATA) "$(TOP_DIR)/license.terms" "$(LIB_INSTALL_DIR)/Resources"'
11031	11018	if test $tk_aqua = yes; then
11032	11019	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing Images to $(LIB_INSTALL_DIR)/Resources/" && $(INSTALL_DATA_DIR) "$(LIB_INSTALL_DIR)/Resources" && for i in Tk.tiff Tk.icns; do $(INSTALL_DATA) "$(MAC_OSX_DIR)/$$i" "$(LIB_INSTALL_DIR)/Resources"; done'

11036	11023	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing Wish.icns to $(BIN_INSTALL_DIR)/../Resources" && $(INSTALL_DATA_DIR) "$(BIN_INSTALL_DIR)/../Resources"'
11037	11024	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && $(INSTALL_DATA) "$(MAC_OSX_DIR)/Tk.icns" "$(BIN_INSTALL_DIR)/../Resources/Wish.icns"'
11038	11025	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing Wish.sdef to $(BIN_INSTALL_DIR)/../Resources" && $(INSTALL_DATA) "$(MAC_OSX_DIR)/Wish.sdef" "$(BIN_INSTALL_DIR)/../Resources"'
	11026	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing Credits.html to $(BIN_INSTALL_DIR)/../Resources" && $(INSTALL_DATA) Credits.html "$(BIN_INSTALL_DIR)/../Resources"'
11039	11027	fi
11040	11028	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Finalizing Tk.framework" && rm -f "$(LIB_INSTALL_DIR)/../Current" && ln -s "$(VERSION)" "$(LIB_INSTALL_DIR)/../Current" && for f in "$(LIB_FILE)" tkConfig.sh Resources Headers PrivateHeaders; do rm -f "$(LIB_INSTALL_DIR)/../../$$f" && ln -s "Versions/Current/$$f" "$(LIB_INSTALL_DIR)/../.."; done && f="$(STUB_LIB_FILE)" && rm -f "$(LIB_INSTALL_DIR)/../../$$f" && ln -s "Versions/$(VERSION)/$$f" "$(LIB_INSTALL_DIR)/../.."'
11041	11029	# Don't use AC_DEFINE for the following as the framework version define

11708	11696	# Handling of arguments.
11709	11697	"Tk-Info.plist" ) CONFIG_FILES="$CONFIG_FILES Tk-Info.plist:../macosx/Tk-Info.plist.in" ;;
11710	11698	"Wish-Info.plist" ) CONFIG_FILES="$CONFIG_FILES Wish-Info.plist:../macosx/Wish-Info.plist.in" ;;
	11699	"Credits.html" ) CONFIG_FILES="$CONFIG_FILES Credits.html:../macosx/Credits.html.in" ;;
11711	11700	"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile:../unix/Makefile.in" ;;
11712	11701	"tkConfig.sh" ) CONFIG_FILES="$CONFIG_FILES tkConfig.sh:../unix/tkConfig.sh.in" ;;
11713	11702	"tk.pc" ) CONFIG_FILES="$CONFIG_FILES tk.pc:../unix/tk.pc.in" ;;

+9

-3

unix/configure.in less more

24	24	TK_VERSION=8.6
25	25	TK_MAJOR_VERSION=8
26	26	TK_MINOR_VERSION=6
27		TK_PATCH_LEVEL=".10"
	27	TK_PATCH_LEVEL=".11"
28	28	VERSION=${TK_VERSION}
29	29	LOCALES="cs da de el en en_gb eo es fr hu it nl pl pt ru sv"
30	30

243	243
244	244	AC_CACHE_CHECK([pw_gecos in struct pwd], tcl_cv_pwd_pw_gecos, [
245	245	AC_TRY_COMPILE([#include <pwd.h>],
246		[struct passwd pwd; pwd.pw_gecos;],
	246	[struct passwd pwd; (void)pwd.pw_gecos;],
247	247	tcl_cv_pwd_pw_gecos=yes, tcl_cv_pwd_pw_gecos=no)])
248	248	if test $tcl_cv_pwd_pw_gecos = yes; then
249	249	AC_DEFINE(HAVE_PW_GECOS, 1, [Does struct password have a pw_gecos field?])

681	681	echo "$LDFLAGS " \| grep -q -- '-prebind ' && TK_SHLIB_LD_EXTRAS="${TK_SHLIB_LD_EXTRAS}"' -seg1addr 0xb000000'
682	682	TK_SHLIB_LD_EXTRAS="${TK_SHLIB_LD_EXTRAS}"' -sectcreate __TEXT __info_plist Tk-Info.plist'
683	683	EXTRA_WISH_LIBS='-sectcreate __TEXT __info_plist Wish-Info.plist'
	684	EXTRA_WISH_LIBS=${EXTRA_WISH_LIBS}' -sectcreate __TEXT __credits_html Credits.html'
	685	if test "${SHARED_BUILD}" = "0"; then
	686	EXTRA_WISH_LIBS=${EXTRA_WISH_LIBS}' -ObjC'
	687	fi
684	688	EXTRA_APP_CC_SWITCHES="${EXTRA_APP_CC_SWITCHES}"' -mdynamic-no-pic'
685		AC_CONFIG_FILES([Tk-Info.plist:../macosx/Tk-Info.plist.in Wish-Info.plist:../macosx/Wish-Info.plist.in])
	689	AC_CONFIG_FILES([Tk-Info.plist:../macosx/Tk-Info.plist.in Wish-Info.plist:../macosx/Wish-Info.plist.in Credits.html:../macosx/Credits.html.in])
686	690	for l in ${LOCALES}; do CFBUNDLELOCALIZATIONS="${CFBUNDLELOCALIZATIONS}<string>$l</string>"; done
687	691	TK_YEAR="`date +%Y`"
688	692	fi

719	723	EXTRA_INSTALL="install-private-headers html-tk"
720	724	EXTRA_BUILD_HTML='@ln -fs contents.htm "$(HTML_INSTALL_DIR)"/TkTOC.html'
721	725	EXTRA_INSTALL_BINARIES='@echo "Installing Info.plist to $(LIB_INSTALL_DIR)/Resources/" && $(INSTALL_DATA_DIR) "$(LIB_INSTALL_DIR)/Resources" && $(INSTALL_DATA) Tk-Info.plist "$(LIB_INSTALL_DIR)/Resources/Info.plist"'
	726	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing Credits.html to $(LIB_INSTALL_DIR)/Resources/" && $(INSTALL_DATA_DIR) "$(LIB_INSTALL_DIR)/Resources" && $(INSTALL_DATA) Credits.html "$(LIB_INSTALL_DIR)/Resources"'
722	727	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing license.terms to $(LIB_INSTALL_DIR)/Resources/" && $(INSTALL_DATA) "$(TOP_DIR)/license.terms" "$(LIB_INSTALL_DIR)/Resources"'
723	728	if test $tk_aqua = yes; then
724	729	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing Images to $(LIB_INSTALL_DIR)/Resources/" && $(INSTALL_DATA_DIR) "$(LIB_INSTALL_DIR)/Resources" && for i in Tk.tiff Tk.icns; do $(INSTALL_DATA) "$(MAC_OSX_DIR)/$$i" "$(LIB_INSTALL_DIR)/Resources"; done'

728	733	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing Wish.icns to $(BIN_INSTALL_DIR)/../Resources" && $(INSTALL_DATA_DIR) "$(BIN_INSTALL_DIR)/../Resources"'
729	734	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && $(INSTALL_DATA) "$(MAC_OSX_DIR)/Tk.icns" "$(BIN_INSTALL_DIR)/../Resources/Wish.icns"'
730	735	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing Wish.sdef to $(BIN_INSTALL_DIR)/../Resources" && $(INSTALL_DATA) "$(MAC_OSX_DIR)/Wish.sdef" "$(BIN_INSTALL_DIR)/../Resources"'
	736	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing Credits.html to $(BIN_INSTALL_DIR)/../Resources" && $(INSTALL_DATA) Credits.html "$(BIN_INSTALL_DIR)/../Resources"'
731	737	fi
732	738	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Finalizing Tk.framework" && rm -f "$(LIB_INSTALL_DIR)/../Current" && ln -s "$(VERSION)" "$(LIB_INSTALL_DIR)/../Current" && for f in "$(LIB_FILE)" tkConfig.sh Resources Headers PrivateHeaders; do rm -f "$(LIB_INSTALL_DIR)/../../$$f" && ln -s "Versions/Current/$$f" "$(LIB_INSTALL_DIR)/../.."; done && f="$(STUB_LIB_FILE)" && rm -f "$(LIB_INSTALL_DIR)/../../$$f" && ln -s "Versions/$(VERSION)/$$f" "$(LIB_INSTALL_DIR)/../.."'
733	739	# Don't use AC_DEFINE for the following as the framework version define

+207

-217

unix/install-sh less more

0	0	#!/bin/sh
1	1	# install - install a program, script, or datafile
2	2
3		scriptversion=2011-04-20.01; # UTC
	3	scriptversion=2020-07-26.22; # UTC
4	4
5	5	# This originates from X11R5 (mit/util/scripts/install.sh), which was
6	6	# later released in X11R6 (xc/config/util/install.sh) with the

34	34	# FSF changes to this file are in the public domain.
35	35	#
36	36	# Calling this script install-sh is preferred over install.sh, to prevent
37		# `make' implicit rules from creating a file called install from it
	37	# 'make' implicit rules from creating a file called install from it
38	38	# when there is no Makefile.
39	39	#
40	40	# This script is compatible with the BSD install script, but was written
41	41	# from scratch.
42	42
	43	tab=' '
43	44	nl='
44	45	'
45		IFS=" "" $nl"
46
47		# set DOITPROG to echo to test this script
48
49		# Don't use :- since 4.3BSD and earlier shells don't like it.
	46	IFS=" $tab$nl"
	47
	48	# Set DOITPROG to "echo" to test this script.
	49
50	50	doit=${DOITPROG-}
51		if test -z "$doit"; then
52		doit_exec=exec
53		else
54		doit_exec=$doit
55		fi
	51	doit_exec=${doit:-exec}
56	52
57	53	# Put in absolute file names if you don't have them in your path;
58	54	# or use environment vars.

67	63	rmprog=${RMPROG-rm}
68	64	stripprog=${STRIPPROG-strip}
69	65
70		posix_glob='?'
71		initialize_posix_glob='
72		test "$posix_glob" != "?" \|\| {
73		if (set -f) 2>/dev/null; then
74		posix_glob=
75		else
76		posix_glob=:
77		fi
78		}
79		'
80
81	66	posix_mkdir=
82	67
83	68	# Desired mode of installed file.
84	69	mode=0755
	70
	71	# Create dirs (including intermediate dirs) using mode 755.
	72	# This is like GNU 'install' as of coreutils 8.32 (2020).
	73	mkdir_umask=22
85	74
86	75	chgrpcmd=
87	76	chmodcmd=$chmodprog

96	85	dst_arg=
97	86
98	87	copy_on_change=false
99		no_target_directory=
	88	is_target_a_directory=possibly
100	89
101	90	usage="\
102	91	Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE

119	108	-m MODE $chmodprog installed files to MODE.
120	109	-o USER $chownprog installed files to USER.
121	110	-s $stripprog installed files.
122		-S $stripprog installed files.
	111	-S OPTION $stripprog installed files using OPTION.
123	112	-t DIRECTORY install into DIRECTORY.
124	113	-T report an error if DSTFILE is a directory.
125	114

137	126	-d) dir_arg=true;;
138	127
139	128	-g) chgrpcmd="$chgrpprog $2"
140		shift;;
	129	shift;;
141	130
142	131	--help) echo "$usage"; exit $?;;
143	132
144	133	-m) mode=$2
145		case $mode in
146		' ' \| ' ' \| *'
147		'* \| ''* \| '?' \| '[')
148		echo "$0: invalid mode: $mode" >&2
149		exit 1;;
150		esac
151		shift;;
	134	case $mode in
	135	' ' \| "$tab" \| "$nl" \| ''* \| '?' \| '[')
	136	echo "$0: invalid mode: $mode" >&2
	137	exit 1;;
	138	esac
	139	shift;;
152	140
153	141	-o) chowncmd="$chownprog $2"
154		shift;;
	142	shift;;
155	143
156	144	-s) stripcmd=$stripprog;;
157	145
158	146	-S) stripcmd="$stripprog $2"
159		shift;;
160
161		-t) dst_arg=$2
162		shift;;
163
164		-T) no_target_directory=true;;
	147	shift;;
	148
	149	-t)
	150	is_target_a_directory=always
	151	dst_arg=$2
	152	# Protect names problematic for 'test' and other utilities.
	153	case $dst_arg in
	154	-* \| [=!]) dst_arg=./$dst_arg;;
	155	esac
	156	shift;;
	157
	158	-T) is_target_a_directory=never;;
165	159
166	160	--version) echo "$0 $scriptversion"; exit $?;;
167	161
168		--) shift
169		break;;
170
171		-*) echo "$0: invalid option: $1" >&2
172		exit 1;;
	162	--) shift
	163	break;;
	164
	165	-*) echo "$0: invalid option: $1" >&2
	166	exit 1;;
173	167
174	168	*) break;;
175	169	esac
176	170	shift
177	171	done
	172
	173	# We allow the use of options -d and -T together, by making -d
	174	# take the precedence; this is for compatibility with GNU install.
	175
	176	if test -n "$dir_arg"; then
	177	if test -n "$dst_arg"; then
	178	echo "$0: target directory not allowed when installing a directory." >&2
	179	exit 1
	180	fi
	181	fi
178	182
179	183	if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
180	184	# When -d is used, all remaining arguments are directories to create.

189	193	fi
190	194	shift # arg
191	195	dst_arg=$arg
	196	# Protect names problematic for 'test' and other utilities.
	197	case $dst_arg in
	198	-* \| [=!]) dst_arg=./$dst_arg;;
	199	esac
192	200	done
193	201	fi
194	202

197	205	echo "$0: no input file specified." >&2
198	206	exit 1
199	207	fi
200		# It's OK to call `install-sh -d' without argument.
	208	# It's OK to call 'install-sh -d' without argument.
201	209	# This can happen when creating conditional directories.
202	210	exit 0
	211	fi
	212
	213	if test -z "$dir_arg"; then
	214	if test $# -gt 1 \|\| test "$is_target_a_directory" = always; then
	215	if test ! -d "$dst_arg"; then
	216	echo "$0: $dst_arg: Is not a directory." >&2
	217	exit 1
	218	fi
	219	fi
203	220	fi
204	221
205	222	if test -z "$dir_arg"; then

218	235
219	236	*[0-7])
220	237	if test -z "$stripcmd"; then
221		u_plus_rw=
	238	u_plus_rw=
222	239	else
223		u_plus_rw='% 200'
	240	u_plus_rw='% 200'
224	241	fi
225	242	cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
226	243	*)
227	244	if test -z "$stripcmd"; then
228		u_plus_rw=
	245	u_plus_rw=
229	246	else
230		u_plus_rw=,u+rw
	247	u_plus_rw=,u+rw
231	248	fi
232	249	cp_umask=$mode$u_plus_rw;;
233	250	esac

235	252
236	253	for src
237	254	do
238		# Protect names starting with `-'.
	255	# Protect names problematic for 'test' and other utilities.
239	256	case $src in
240		-*) src=./$src;;
	257	-* \| [=!]) src=./$src;;
241	258	esac
242	259
243	260	if test -n "$dir_arg"; then

259	276	echo "$0: no destination specified." >&2
260	277	exit 1
261	278	fi
262
263	279	dst=$dst_arg
264		# Protect names starting with `-'.
265		case $dst in
266		-*) dst=./$dst;;
267		esac
268
269		# If destination is a directory, append the input filename; won't work
270		# if double slashes aren't ignored.
	280
	281	# If destination is a directory, append the input filename.
271	282	if test -d "$dst"; then
272		if test -n "$no_target_directory"; then
273		echo "$0: $dst_arg: Is a directory" >&2
274		exit 1
	283	if test "$is_target_a_directory" = never; then
	284	echo "$0: $dst_arg: Is a directory" >&2
	285	exit 1
275	286	fi
276	287	dstdir=$dst
277		dst=$dstdir/`basename "$src"`
	288	dstbase=`basename "$src"`
	289	case $dst in
	290	*/) dst=$dst$dstbase;;
	291	*) dst=$dst/$dstbase;;
	292	esac
278	293	dstdir_status=0
279	294	else
280		# Prefer dirname, but fall back on a substitute if dirname fails.
281		dstdir=`
282		(dirname "$dst") 2>/dev/null \|\|
283		expr X"$dst" : 'X$.[^/]$//[^/][^/]/$' \\| \
284		X"$dst" : 'X$//$[^/]' \\| \
285		X"$dst" : 'X$//$$' \\| \
286		X"$dst" : 'X$/$' \\| . 2>/dev/null \|\|
287		echo X"$dst" \|
288		sed '/^X$.[^/]$\/\/[^/][^/]\/$/{
289		s//\1/
290		q
291		}
292		/^X$\/\/$[^/].*/{
293		s//\1/
294		q
295		}
296		/^X$\/\/$$/{
297		s//\1/
298		q
299		}
300		/^X$\/$.*/{
301		s//\1/
302		q
303		}
304		s/.*/./; q'
305		`
306
	295	dstdir=`dirname "$dst"`
307	296	test -d "$dstdir"
308	297	dstdir_status=$?
309	298	fi
310	299	fi
311	300
	301	case $dstdir in
	302	*/) dstdirslash=$dstdir;;
	303	*) dstdirslash=$dstdir/;;
	304	esac
	305
312	306	obsolete_mkdir_used=false
313	307
314	308	if test $dstdir_status != 0; then
315	309	case $posix_mkdir in
316	310	'')
317		# Create intermediate dirs using mode 755 as modified by the umask.
318		# This is like FreeBSD 'install' as of 1997-10-28.
319		umask=`umask`
320		case $stripcmd.$umask in
321		# Optimize common cases.
322		*[2367][2367]) mkdir_umask=$umask;;
323		.*0[02][02] \| .[02][02] \| .[02]) mkdir_umask=22;;
324
325		*[0-7])
326		mkdir_umask=`expr $umask + 22 \
327		- $umask % 100 % 40 + $umask % 20 \
328		- $umask % 10 % 4 + $umask % 2
329		`;;
330		*) mkdir_umask=$umask,go-w;;
331		esac
332
333		# With -d, create the new directory with the user-specified mode.
334		# Otherwise, rely on $mkdir_umask.
335		if test -n "$dir_arg"; then
336		mkdir_mode=-m$mode
	311	# With -d, create the new directory with the user-specified mode.
	312	# Otherwise, rely on $mkdir_umask.
	313	if test -n "$dir_arg"; then
	314	mkdir_mode=-m$mode
	315	else
	316	mkdir_mode=
	317	fi
	318
	319	posix_mkdir=false
	320	# The $RANDOM variable is not portable (e.g., dash). Use it
	321	# here however when possible just to lower collision chance.
	322	tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
	323
	324	trap '
	325	ret=$?
	326	rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null
	327	exit $ret
	328	' 0
	329
	330	# Because "mkdir -p" follows existing symlinks and we likely work
	331	# directly in world-writeable /tmp, make sure that the '$tmpdir'
	332	# directory is successfully created first before we actually test
	333	# 'mkdir -p'.
	334	if (umask $mkdir_umask &&
	335	$mkdirprog $mkdir_mode "$tmpdir" &&
	336	exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
	337	then
	338	if test -z "$dir_arg" \|\| {
	339	# Check for POSIX incompatibilities with -m.
	340	# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
	341	# other-writable bit of parent directory when it shouldn't.
	342	# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
	343	test_tmpdir="$tmpdir/a"
	344	ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
	345	case $ls_ld_tmpdir in
	346	d????-?r-*) different_mode=700;;
	347	d????-?--*) different_mode=755;;
	348	*) false;;
	349	esac &&
	350	$mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
	351	ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
	352	test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
	353	}
	354	}
	355	then posix_mkdir=:
	356	fi
	357	rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
337	358	else
338		mkdir_mode=
	359	# Remove any dirs left behind by ancient mkdir implementations.
	360	rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
339	361	fi
340
341		posix_mkdir=false
342		case $umask in
343		*[123567][0-7][0-7])
344		# POSIX mkdir -p sets u+wx bits regardless of umask, which
345		# is incompatible with FreeBSD 'install' when (umask & 300) != 0.
346		;;
347		*)
348		tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
349		trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
350
351		if (umask $mkdir_umask &&
352		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
353		then
354		if test -z "$dir_arg" \|\| {
355		# Check for POSIX incompatibilities with -m.
356		# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
357		# other-writeable bit of parent directory when it shouldn't.
358		# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
359		ls_ld_tmpdir=`ls -ld "$tmpdir"`
360		case $ls_ld_tmpdir in
361		d????-?r-*) different_mode=700;;
362		d????-?--*) different_mode=755;;
363		*) false;;
364		esac &&
365		$mkdirprog -m$different_mode -p -- "$tmpdir" && {
366		ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
367		test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
368		}
369		}
370		then posix_mkdir=:
371		fi
372		rmdir "$tmpdir/d" "$tmpdir"
373		else
374		# Remove any dirs left behind by ancient mkdir implementations.
375		rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
376		fi
377		trap '' 0;;
378		esac;;
	362	trap '' 0;;
379	363	esac
380	364
381	365	if
382	366	$posix_mkdir && (
383		umask $mkdir_umask &&
384		$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
	367	umask $mkdir_umask &&
	368	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
385	369	)
386	370	then :
387	371	else
388	372
389		# The umask is ridiculous, or mkdir does not conform to POSIX,
	373	# mkdir does not conform to POSIX,
390	374	# or it failed possibly due to a race condition. Create the
391	375	# directory the slow way, step by step, checking for races as we go.
392	376
393	377	case $dstdir in
394		/*) prefix='/';;
395		-*) prefix='./';;
396		*) prefix='';;
	378	/*) prefix='/';;
	379	[-=!]*) prefix='./';;
	380	*) prefix='';;
397	381	esac
398
399		eval "$initialize_posix_glob"
400	382
401	383	oIFS=$IFS
402	384	IFS=/
403		$posix_glob set -f
	385	set -f
404	386	set fnord $dstdir
405	387	shift
406		$posix_glob set +f
	388	set +f
407	389	IFS=$oIFS
408	390
409	391	prefixes=
410	392
411	393	for d
412	394	do
413		test -z "$d" && continue
414
415		prefix=$prefix$d
416		if test -d "$prefix"; then
417		prefixes=
418		else
419		if $posix_mkdir; then
420		(umask=$mkdir_umask &&
421		$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
422		# Don't fail if two instances are running concurrently.
423		test -d "$prefix" \|\| exit 1
424		else
425		case $prefix in
426		\') qprefix=`echo "$prefix" \| sed "s/'/'\\\\\\\\''/g"`;;
427		*) qprefix=$prefix;;
428		esac
429		prefixes="$prefixes '$qprefix'"
430		fi
431		fi
432		prefix=$prefix/
	395	test X"$d" = X && continue
	396
	397	prefix=$prefix$d
	398	if test -d "$prefix"; then
	399	prefixes=
	400	else
	401	if $posix_mkdir; then
	402	(umask $mkdir_umask &&
	403	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
	404	# Don't fail if two instances are running concurrently.
	405	test -d "$prefix" \|\| exit 1
	406	else
	407	case $prefix in
	408	\') qprefix=`echo "$prefix" \| sed "s/'/'\\\\\\\\''/g"`;;
	409	*) qprefix=$prefix;;
	410	esac
	411	prefixes="$prefixes '$qprefix'"
	412	fi
	413	fi
	414	prefix=$prefix/
433	415	done
434	416
435	417	if test -n "$prefixes"; then
436		# Don't fail if two instances are running concurrently.
437		(umask $mkdir_umask &&
438		eval "\$doit_exec \$mkdirprog $prefixes") \|\|
439		test -d "$dstdir" \|\| exit 1
440		obsolete_mkdir_used=true
	418	# Don't fail if two instances are running concurrently.
	419	(umask $mkdir_umask &&
	420	eval "\$doit_exec \$mkdirprog $prefixes") \|\|
	421	test -d "$dstdir" \|\| exit 1
	422	obsolete_mkdir_used=true
441	423	fi
442	424	fi
443	425	fi

450	432	else
451	433
452	434	# Make a couple of temp file names in the proper directory.
453		dsttmp=$dstdir/_inst.$$_
454		rmtmp=$dstdir/_rm.$$_
	435	dsttmp=${dstdirslash}_inst.$$_
	436	rmtmp=${dstdirslash}_rm.$$_
455	437
456	438	# Trap to clean up those temp files at exit.
457	439	trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
458	440
459	441	# Copy the file name to the temp name.
460		(umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
	442	(umask $cp_umask &&
	443	{ test -z "$stripcmd" \|\| {
	444	# Create $dsttmp read-write so that cp doesn't create it read-only,
	445	# which would cause strip to fail.
	446	if test -z "$doit"; then
	447	: >"$dsttmp" # No need to fork-exec 'touch'.
	448	else
	449	$doit touch "$dsttmp"
	450	fi
	451	}
	452	} &&
	453	$doit_exec $cpprog "$src" "$dsttmp") &&
461	454
462	455	# and set any options; do chmod last to preserve setuid bits.
463	456	#

472	465
473	466	# If -C, don't bother to copy if it wouldn't change the file.
474	467	if $copy_on_change &&
475		old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
476		new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
477
478		eval "$initialize_posix_glob" &&
479		$posix_glob set -f &&
	468	old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
	469	new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
	470	set -f &&
480	471	set X $old && old=:$2:$4:$5:$6 &&
481	472	set X $new && new=:$2:$4:$5:$6 &&
482		$posix_glob set +f &&
483
	473	set +f &&
484	474	test "$old" = "$new" &&
485	475	$cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
486	476	then

493	483	# to itself, or perhaps because mv is so ancient that it does not
494	484	# support -f.
495	485	{
496		# Now remove or move aside any old file at destination location.
497		# We try this two ways since rm can't unlink itself on some
498		# systems and the destination file might be busy for other
499		# reasons. In this case, the final cleanup might fail but the new
500		# file should still install successfully.
501		{
502		test ! -f "$dst" \|\|
503		$doit $rmcmd -f "$dst" 2>/dev/null \|\|
504		{ $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
505		{ $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
506		} \|\|
507		{ echo "$0: cannot unlink or rename $dst" >&2
508		(exit 1); exit 1
509		}
510		} &&
511
512		# Now rename the file to the real destination.
513		$doit $mvcmd "$dsttmp" "$dst"
	486	# Now remove or move aside any old file at destination location.
	487	# We try this two ways since rm can't unlink itself on some
	488	# systems and the destination file might be busy for other
	489	# reasons. In this case, the final cleanup might fail but the new
	490	# file should still install successfully.
	491	{
	492	test ! -f "$dst" \|\|
	493	$doit $rmcmd -f "$dst" 2>/dev/null \|\|
	494	{ $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
	495	{ $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
	496	} \|\|
	497	{ echo "$0: cannot unlink or rename $dst" >&2
	498	(exit 1); exit 1
	499	}
	500	} &&
	501
	502	# Now rename the file to the real destination.
	503	$doit $mvcmd "$dsttmp" "$dst"
514	504	}
515	505	fi \|\| exit 1
516	506

519	509	done
520	510
521	511	# Local variables:
522		# eval: (add-hook 'write-file-hooks 'time-stamp)
	512	# eval: (add-hook 'before-save-hook 'time-stamp)
523	513	# time-stamp-start: "scriptversion="
524	514	# time-stamp-format: "%:y-%02m-%02d.%02H"
525		# time-stamp-time-zone: "UTC"
	515	# time-stamp-time-zone: "UTC0"
526	516	# time-stamp-end: "; # UTC"
527		# End:
	517	# End:⏎

+7

-7

unix/installManPage less more

42	42	echo "source manual page file must exist"
43	43	exit 1
44	44	fi
45		if test -d $Dir ; then : ; else
	45	if test -d "$Dir" ; then : ; else
46	46	echo "target directory must exist"
47	47	exit 1
48	48	fi

98	98	### Process Page to Create Target Pages
99	99	###
100	100
101		Specials="FindPhoto FontId MeasureChar"
	101	Specials="DString Thread Notifier RegExp library packagens pkgMkIndex safesock FindPhoto FontId MeasureChar"
102	102	for n in $Specials; do
103	103	if [ "$Name" = "$n" ] ; then
104	104	Names="$n $Names"

108	108	First=""
109	109	for Target in $Names; do
110	110	Target=$Target.$Section$Suffix
111		rm -f $Dir/$Target $Dir/$Target.*
	111	rm -f "$Dir/$Target" "$Dir/$Target.*"
112	112	if test -z "$First" ; then
113	113	First=$Target
114	114	sed -e "/man\.macros/r $SrcDir/man.macros" -e "/man\.macros/d" \
115		$ManPage > $Dir/$First
116		chmod 644 $Dir/$First
117		$Gzip $Dir/$First
	115	$ManPage > "$Dir/$First"
	116	chmod 644 "$Dir/$First"
	117	$Gzip "$Dir/$First"
118	118	else
119		ln $SymOrLoc$First$Gz $Dir/$Target$Gz
	119	ln $SymOrLoc"$First$Gz" "$Dir/$Target$Gz"
120	120	fi
121	121	done
122	122

+24

-52

unix/tcl.m4 less more

291	291	else
292	292	AC_MSG_RESULT([could not find ${TCL_BIN_DIR}/tclConfig.sh])
293	293	fi
294
295		# eval is required to do the TCL_DBGX substitution
296		eval "TCL_LIB_FILE=\"${TCL_LIB_FILE}\""
297		eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
298	294
299	295	# If the TCL_BIN_DIR is the build directory (not the install directory),
300	296	# then set the common variable name to the value of the build variables.

329	325	esac
330	326	fi
331	327
332		# eval is required to do the TCL_DBGX substitution
333		eval "TCL_LIB_FLAG=\"${TCL_LIB_FLAG}\""
334		eval "TCL_LIB_SPEC=\"${TCL_LIB_SPEC}\""
335		eval "TCL_STUB_LIB_FLAG=\"${TCL_STUB_LIB_FLAG}\""
336		eval "TCL_STUB_LIB_SPEC=\"${TCL_STUB_LIB_SPEC}\""
337
338	328	AC_SUBST(TCL_VERSION)
339	329	AC_SUBST(TCL_PATCH_LEVEL)
340	330	AC_SUBST(TCL_BIN_DIR)

374	364	else
375	365	AC_MSG_RESULT([could not find ${TK_BIN_DIR}/tkConfig.sh])
376	366	fi
377
378		# eval is required to do the TK_DBGX substitution
379		eval "TK_LIB_FILE=\"${TK_LIB_FILE}\""
380		eval "TK_STUB_LIB_FILE=\"${TK_STUB_LIB_FILE}\""
381	367
382	368	# If the TK_BIN_DIR is the build directory (not the install directory),
383	369	# then set the common variable name to the value of the build variables.

412	398	esac
413	399	fi
414	400
415		# eval is required to do the TK_DBGX substitution
416		eval "TK_LIB_FLAG=\"${TK_LIB_FLAG}\""
417		eval "TK_LIB_SPEC=\"${TK_LIB_SPEC}\""
418		eval "TK_STUB_LIB_FLAG=\"${TK_STUB_LIB_FLAG}\""
419		eval "TK_STUB_LIB_SPEC=\"${TK_STUB_LIB_SPEC}\""
420
421	401	AC_SUBST(TK_VERSION)
422	402	AC_SUBST(TK_BIN_DIR)
423	403	AC_SUBST(TK_SRC_DIR)

530	510	AC_HELP_STRING([--enable-shared],
531	511	[build and link with shared libraries (default: on)]),
532	512	[tcl_ok=$enableval], [tcl_ok=yes])
533
534		if test "${enable_shared+set}" = set; then
535		enableval="$enable_shared"
536		tcl_ok=$enableval
537		else
538		tcl_ok=yes
539		fi
540
541	513	if test "$tcl_ok" = "yes" ; then
542	514	AC_MSG_RESULT([shared])
543	515	SHARED_BUILD=1

729	701	# Sets to $(CFLAGS_OPTIMIZE) if false
730	702	# LDFLAGS_DEFAULT Sets to $(LDFLAGS_DEBUG) if true
731	703	# Sets to $(LDFLAGS_OPTIMIZE) if false
732		# DBGX Formerly used as debug library extension;
733		# always blank now.
734	704	#------------------------------------------------------------------------
735	705
736	706	AC_DEFUN([SC_ENABLE_SYMBOLS], [

740	710	[build with debugging symbols (default: off)]),
741	711	[tcl_ok=$enableval], [tcl_ok=no])
742	712	# FIXME: Currently, LDFLAGS_DEFAULT is not used, it should work like CFLAGS_DEFAULT.
743		DBGX=""
744	713	if test "$tcl_ok" = "no"; then
745	714	CFLAGS_DEFAULT='$(CFLAGS_OPTIMIZE)'
746	715	LDFLAGS_DEFAULT='$(LDFLAGS_OPTIMIZE)'

1102	1071	CFLAGS_DEBUG=-g
1103	1072	AS_IF([test "$GCC" = yes], [
1104	1073	CFLAGS_OPTIMIZE=-O2
1105		CFLAGS_WARNING="-Wall"
	1074	CFLAGS_WARNING="-Wall -Wpointer-arith"
1106	1075	], [
1107	1076	CFLAGS_OPTIMIZE=-O
1108	1077	CFLAGS_WARNING=""

1211	1180	CC_SEARCH_FLAGS=""
1212	1181	LD_SEARCH_FLAGS=""
1213	1182	;;
1214		CYGWIN_\|MINGW32)
	1183	CYGWIN_\|MINGW32_\|MSYS_*)
1215	1184	SHLIB_CFLAGS=""
1216	1185	SHLIB_LD='${CC} -shared'
1217	1186	SHLIB_SUFFIX=".dll"

1222	1191	CC_SEARCH_FLAGS=""
1223	1192	LD_SEARCH_FLAGS=""
1224	1193	TCL_NEEDS_EXP_FILE=1
1225		TCL_EXPORT_FILE_SUFFIX='${VERSION}\$\{DBGX\}.dll.a'
	1194	TCL_EXPORT_FILE_SUFFIX='${VERSION}.dll.a'
1226	1195	SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,--out-implib,\$[@].a"
1227	1196	AC_CACHE_CHECK(for Cygwin version of gcc,
1228	1197	ac_cv_cygwin,

1311	1280	do64bit_ok=yes
1312	1281	SHLIB_LD='${CC} -shared'
1313	1282	AS_IF([test $doRpath = yes], [
1314		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
	1283	CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'])
1315	1284	LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
1316	1285	;;
1317	1286	*)

1346	1315	DL_LIBS=""
1347	1316	AC_LIBOBJ(mkstemp)
1348	1317	AS_IF([test $doRpath = yes], [
1349		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
	1318	CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
1350	1319	LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'])
1351	1320	;;
1352	1321	IRIX-6.*)

1357	1326	DL_LIBS=""
1358	1327	AC_LIBOBJ(mkstemp)
1359	1328	AS_IF([test $doRpath = yes], [
1360		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
	1329	CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
1361	1330	LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'])
1362	1331	AS_IF([test "$GCC" = yes], [
1363	1332	CFLAGS="$CFLAGS -mabi=n32"

1383	1352	DL_LIBS=""
1384	1353	AC_LIBOBJ(mkstemp)
1385	1354	AS_IF([test $doRpath = yes], [
1386		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
	1355	CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
1387	1356	LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'])
1388	1357
1389	1358	# Check to enable 64-bit flags for compiler/linker

1414	1383	DL_LIBS="-ldl"
1415	1384	LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
1416	1385	AS_IF([test $doRpath = yes], [
1417		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
	1386	CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'])
1418	1387	LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
1419	1388	AS_IF([test "`uname -m`" = "alpha"], [CFLAGS="$CFLAGS -mieee"])
1420	1389	AS_IF([test $do64bit = yes], [

1446	1415	DL_LIBS="-mshared -ldl"
1447	1416	LD_FLAGS="-Wl,--export-dynamic"
1448	1417	AS_IF([test $doRpath = yes], [
1449		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
1450		LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
	1418	CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
	1419	LD_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'])
1451	1420	;;
1452	1421	MP-RAS-02*)
1453	1422	SHLIB_CFLAGS="-K PIC"

1485	1454	DL_OBJS="tclLoadDl.o"
1486	1455	DL_LIBS=""
1487	1456	AS_IF([test $doRpath = yes], [
1488		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
	1457	CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'])
1489	1458	LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
1490	1459	SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
1491	1460	LDFLAGS="-Wl,-export-dynamic"

1509	1478	DL_LIBS=""
1510	1479	LDFLAGS="$LDFLAGS -export-dynamic"
1511	1480	AS_IF([test $doRpath = yes], [
1512		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
	1481	CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'])
1513	1482	LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
1514	1483	AS_IF([test "${TCL_THREADS}" = "1"], [
1515	1484	# The -pthread needs to go in the CFLAGS, not LIBS

1526	1495	SHLIB_SUFFIX=".so"
1527	1496	DL_OBJS="tclLoadDl.o"
1528	1497	DL_LIBS=""
1529		LDFLAGS=""
1530	1498	AS_IF([test $doRpath = yes], [
1531		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
1532		LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
	1499	CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
	1500	LD_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'])
1533	1501	AS_IF([test "${TCL_THREADS}" = "1"], [
1534	1502	# The -pthread needs to go in the LDFLAGS, not LIBS
1535	1503	LIBS=`echo $LIBS \| sed s/-pthread//`

1618	1586	AS_IF([test "$tcl_cv_cc_visibility_hidden" != yes], [
1619	1587	AC_DEFINE(MODULE_SCOPE, [__private_extern__],
1620	1588	[Compiler support for module scope symbols])
	1589	tcl_cv_cc_visibility_hidden=yes
1621	1590	])
1622	1591	CC_SEARCH_FLAGS=""
1623	1592	LD_SEARCH_FLAGS=""

1732	1701	DL_OBJS="tclLoadDl.o"
1733	1702	DL_LIBS=""
1734	1703	AS_IF([test $doRpath = yes], [
1735		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
	1704	CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
1736	1705	LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'])
1737	1706	AS_IF([test "$GCC" = yes], [CFLAGS="$CFLAGS -mieee"], [
1738	1707	CFLAGS="$CFLAGS -DHAVE_TZSET -std1 -ieee"])

2008	1977	case $system in
2009	1978	AIX-*) ;;
2010	1979	BSD/OS*) ;;
2011		CYGWIN_\|MINGW32_) ;;
	1980	CYGWIN_\|MINGW32_\|MSYS_*) ;;
2012	1981	IRIX*) ;;
2013	1982	NetBSD-\|DragonFly-\|FreeBSD-\|OpenBSD-) ;;
2014	1983	Darwin-*) ;;

2029	1998
2030	1999	AS_IF([test "${SHARED_BUILD}" = 1 -a "${SHLIB_SUFFIX}" != ""], [
2031	2000	LIB_SUFFIX=${SHARED_LIB_SUFFIX}
2032		MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
	2001	MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${LDFLAGS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
2033	2002	AS_IF([test "${SHLIB_SUFFIX}" = ".dll"], [
2034	2003	INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)";if test -f $(LIB_FILE).a; then $(INSTALL_DATA) $(LIB_FILE).a "$(LIB_INSTALL_DIR)"; fi;'
2035	2004	DLL_INSTALL_DIR="\$(BIN_INSTALL_DIR)"

2136	2105	#
2137	2106	# Defines some of the following vars:
2138	2107	# NO_DIRENT_H
	2108	# NO_FLOAT_H
2139	2109	# NO_VALUES_H
2140	2110	# NO_STDLIB_H
2141	2111	# NO_STRING_H
2142	2112	# NO_SYS_WAIT_H
2143	2113	# NO_DLFCN_H
2144	2114	# HAVE_SYS_PARAM_H
2145		#
2146	2115	# HAVE_STRING_H ?
2147	2116	#
2148	2117	#--------------------------------------------------------------------

2361	2330	fi
2362	2331
2363	2332	AC_CACHE_CHECK([tm_gmtoff in struct tm], tcl_cv_member_tm_gmtoff, [
2364		AC_TRY_COMPILE([#include <time.h>], [struct tm tm; tm.tm_gmtoff;],
	2333	AC_TRY_COMPILE([#include <time.h>], [struct tm tm; (void)tm.tm_gmtoff;],
2365	2334	tcl_cv_member_tm_gmtoff=yes, tcl_cv_member_tm_gmtoff=no)])
2366	2335	if test $tcl_cv_member_tm_gmtoff = yes ; then
2367	2336	AC_DEFINE(HAVE_TM_GMTOFF, 1, [Should we use the tm_gmtoff field of struct tm?])

2650	2619	AC_CHECK_FUNC($1, tcl_ok=1, tcl_ok=0)
2651	2620	if test ["$tcl_ok"] = 1; then
2652	2621	AC_CACHE_CHECK([proper ]$1[ implementation], [tcl_cv_]$1[_unbroken],
2653		AC_TRY_RUN([[int main() {]$2[}]],[tcl_cv_]$1[_unbroken]=ok,
	2622	AC_TRY_RUN([[
	2623	#include <stdlib.h>
	2624	#include <string.h>
	2625	int main() {]$2[}]],[tcl_cv_]$1[_unbroken]=ok,
2654	2626	[tcl_cv_]$1[_unbroken]=broken,[tcl_cv_]$1[_unbroken]=unknown))
2655	2627	if test ["$tcl_cv_]$1[_unbroken"] = "ok"; then
2656	2628	tcl_ok=1

+1

-1

unix/tk.spec less more

3	3
4	4	Name: tk
5	5	Summary: Tk graphical toolkit for the Tcl scripting language.
6		Version: 8.6.10
	6	Version: 8.6.11
7	7	Release: 2
8	8	License: BSD
9	9	Group: Development/Languages

+19

-1

unix/tkAppInit.c less more

14	14	#undef BUILD_tk
15	15	#undef STATIC_BUILD
16	16	#include "tk.h"
	17	#include "tkPort.h"
17	18
18	19	#ifdef TK_TEST
	20	#ifdef __cplusplus
	21	extern "C" {
	22	#endif
19	23	extern Tcl_PackageInitProc Tktest_Init;
	24	#ifdef __cplusplus
	25	}
	26	#endif
20	27	#endif /* TK_TEST */
21	28
22	29	/*

29	36	#define TK_LOCAL_APPINIT Tcl_AppInit
30	37	#endif
31	38	#ifndef MODULE_SCOPE
32		# define MODULE_SCOPE extern
	39	# ifdef __cplusplus
	40	# define MODULE_SCOPE extern "C"
	41	# else
	42	# define MODULE_SCOPE extern
	43	# endif
33	44	#endif
34	45	MODULE_SCOPE int TK_LOCAL_APPINIT(Tcl_Interp *);
35	46	MODULE_SCOPE int main(int, char **);

110	121	}
111	122	Tcl_StaticPackage(interp, "Tk", Tk_Init, Tk_SafeInit);
112	123
	124	#if defined(USE_CUSTOM_EXIT_PROC)
	125	if (TkpWantsExitProc()) {
	126	/* The cast below avoids warnings from old gcc compilers. */
	127	Tcl_SetExitProc((void *)TkpExitProc);
	128	}
	129	#endif
	130
113	131	#ifdef TK_TEST
114	132	if (Tktest_Init(interp) == TCL_ERROR) {
115	133	return TCL_ERROR;

+1

-1

unix/tkUnix.c less more

15	15	# include <X11/extensions/scrnsaver.h>
16	16	# ifdef __APPLE__
17	17	/* Support for weak-linked libXss. */
18		# define HaveXSSLibrary() (XScreenSaverQueryInfo != NULL)
	18	# define HaveXSSLibrary() (&XScreenSaverQueryInfo != NULL)
19	19	# else
20	20	/* Other platforms always link libXss. */
21	21	# define HaveXSSLibrary() (1)

+5

-9

unix/tkUnixButton.c less more

172	172	* Sanity check.
173	173	*/
174	174
175		if (tkwin == NULL \|\| display == None \|\| d == None \|\| bgBorder == NULL
	175	if (tkwin == NULL \|\| display == NULL \|\| d == None \|\| bgBorder == NULL
176	176	\|\| indicatorColor == NULL) {
177	177	return;
178	178	}

325	325
326	326	TkButton *
327	327	TkpCreateButton(
328		Tk_Window tkwin)
	328	TCL_UNUSED(Tk_Window))
329	329	{
330		UnixButton *butPtr = ckalloc(sizeof(UnixButton));
331
332		return (TkButton *) butPtr;
	330	return (TkButton *)ckalloc(sizeof(UnixButton));
333	331	}
334	332
335	333	/*

395	393	TkpDisplayButton(
396	394	ClientData clientData) /* Information about widget. */
397	395	{
398		register TkButton butPtr = (TkButton ) clientData;
	396	TkButton butPtr = (TkButton )clientData;
399	397	GC gc;
400	398	Tk_3DBorder border;
401	399	Pixmap pixmap;

806	804	butPtr->borderWidth, relief);
807	805	}
808	806	if (butPtr->highlightWidth > 0) {
809		GC gc;
810
811	807	if (butPtr->flags & GOT_FOCUS) {
812	808	gc = Tk_GCForColor(butPtr->highlightColorPtr, pixmap);
813	809	} else {

859	855
860	856	void
861	857	TkpComputeButtonGeometry(
862		register TkButton butPtr) / Button whose geometry may have changed. */
	858	TkButton butPtr) / Button whose geometry may have changed. */
863	859	{
864	860	int width, height, avgWidth, txtWidth, txtHeight;
865	861	int haveImage = 0, haveText = 0;

+5

-5

unix/tkUnixColor.c less more

135	135	if (*name != '#') {
136	136	XColor screen;
137	137
138		if (((*name - 'A') & 0xdf) < sizeof(tkWebColors)/sizeof(tkWebColors[0])) {
139		if (!((name[0] - 'G') & 0xdf) && !((name[1] - 'R') & 0xdf)
140		&& !((name[2] - 'A') & 0xdb) && !((name[3] - 'Y') & 0xdf)
	138	if (((*name - 'A') & 0xDF) < sizeof(tkWebColors)/sizeof(tkWebColors[0])) {
	139	if (!((name[0] - 'G') & 0xDF) && !((name[1] - 'R') & 0xDF)
	140	&& !((name[2] - 'A') & 0xDB) && !((name[3] - 'Y') & 0xDF)
141	141	&& !name[4]) {
142	142	name = "#808080808080";
143	143	goto gotWebColor;
144	144	} else {
145		const char p = tkWebColors[((name - 'A') & 0x1f)];
	145	const char p = tkWebColors[((name - 'A') & 0x1F)];
146	146	if (p) {
147	147	const char *q = name;
148		while (!((p - (++q)) & 0xdf)) {
	148	while (!((p - (++q)) & 0xDF)) {
149	149	if (!*p++) {
150	150	name = p;
151	151	goto gotWebColor;

+1

-1

unix/tkUnixCursor.c less more

244	244	if ((argv[0][0] != '@') && !inTkTable) {
245	245	XColor fg, bg;
246	246	unsigned int maskIndex;
247		register const struct CursorName *namePtr;
	247	const struct CursorName *namePtr;
248	248	TkDisplay *dispPtr;
249	249
250	250	/*

+6

-12

unix/tkUnixEvent.c less more

359	359	int type;
360	360	XEvent x;
361	361	TkKeyEvent k;
362		#ifdef GenericEvent
363		xGenericEvent xge;
364		#endif
365	362	} event;
366	363	Window w;
367	364	TkDisplay *dispPtr = NULL;

379	376
380	377	while (QLength(display) > 0) {
381	378	XNextEvent(display, &event.x);
382		#ifdef GenericEvent
383		if (event.type == GenericEvent) {
384		Tcl_Panic("Wild GenericEvent; panic! (extension=%d,evtype=%d)",
385		event.xge.extension, event.xge.evtype);
386		}
387		#endif
	379	if (event.type > MappingNotify) {
	380	continue;
	381	}
388	382	w = None;
389	383	if (event.type == KeyPress \|\| event.type == KeyRelease) {
390	384	for (dispPtr = TkGetDisplayList(); ; dispPtr = dispPtr->nextPtr) {

513	507	* nice (?!) message.
514	508	*/
515	509
516		void (*oldHandler)();
517
518		oldHandler = (void (*)()) signal(SIGPIPE, SIG_IGN);
	510	void (*oldHandler)(int);
	511
	512	oldHandler = (void (*)(int)) signal(SIGPIPE, SIG_IGN);
519	513	XNoOp(display);
520	514	XFlush(display);
521	515	(void) signal(SIGPIPE, oldHandler);

+156

-117

unix/tkUnixFont.c less more

11	11
12	12	#include "tkUnixInt.h"
13	13	#include "tkFont.h"
14		#include <netinet/in.h> /* for htons() prototype */
15		#include <arpa/inet.h> /* inet_ntoa() */
16	14
17	15	/*
18	16	* The preferred font encodings.
19	17	*/
20	18
21		static const char *const encodingList[] = {
22		"iso8859-1", "jis0208", "jis0212", NULL
	19	static const char encodingList[][10] = {
	20	"iso8859-1", "jis0208", "jis0212"
23	21	};
24	22
25	23	/*

37	35	#define FONTMAP_SHIFT 10
38	36
39	37	#define FONTMAP_BITSPERPAGE (1 << FONTMAP_SHIFT)
40		#define FONTMAP_PAGES (0x30000 / FONTMAP_BITSPERPAGE)
	38	#define FONTMAP_NUMCHARS 0x40000
	39	#define FONTMAP_PAGES (FONTMAP_NUMCHARS / FONTMAP_BITSPERPAGE)
41	40
42	41	typedef struct FontFamily {
43	42	struct FontFamily nextPtr; / Next in list of all known font families. */
44		int refCount; /* How many SubFonts are referring to this
	43	size_t refCount; /* How many SubFonts are referring to this
45	44	* FontFamily. When the refCount drops to
46	45	* zero, this FontFamily may be freed. */
47	46	/*

62	61	/* Two-level sparse table used to determine
63	62	* quickly if the specified character exists.
64	63	* As characters are encountered, more pages
65		* in this table are dynamically alloced. The
	64	* in this table are dynamically allocated. The
66	65	* contents of each page is a bitmask
67	66	* consisting of FONTMAP_BITSPERPAGE bits,
68	67	* representing whether this font can be used

193	192	* Functions used only in this file.
194	193	*/
195	194
196		static void FontPkgCleanup(ClientData clientData);
	195	static void FontPkgCleanup(void *clientData);
197	196	static FontFamily * AllocFontFamily(Display *display,
198	197	XFontStruct *fontStructPtr, int base);
199	198	static SubFont * CanUseFallback(UnixFont *fontPtr,

203	202	const char *fallbackName, int ch,
204	203	Tcl_DString *nameTriedPtr,
205	204	SubFont **fixSubFontPtrPtr);
206		static int ControlUtfProc(ClientData clientData, const char *src,
	205	static int ControlUtfProc(void clientData, const char src,
207	206	int srcLen, int flags, Tcl_EncodingState*statePtr,
208	207	char dst, int dstLen, int srcReadPtr,
209	208	int dstWrotePtr, int dstCharsPtr);

238	237	static void ReleaseFont(UnixFont *fontPtr);
239	238	static void ReleaseSubFont(Display display, SubFont subFontPtr);
240	239	static int SeenName(const char name, Tcl_DString dsPtr);
241		static int Ucs2beToUtfProc(ClientData clientData, const char*src,
	240	static int Ucs2beToUtfProc(void clientData, const charsrc,
242	241	int srcLen, int flags, Tcl_EncodingState*statePtr,
243	242	char dst, int dstLen, int srcReadPtr,
244	243	int dstWrotePtr, int dstCharsPtr);
245		static int UtfToUcs2beProc(ClientData clientData, const char*src,
	244	static int UtfToUcs2beProc(void clientData, const charsrc,
246	245	int srcLen, int flags, Tcl_EncodingState*statePtr,
247	246	char dst, int dstLen, int srcReadPtr,
248	247	int dstWrotePtr, int dstCharsPtr);

267	266
268	267	static void
269	268	FontPkgCleanup(
270		ClientData clientData)
271		{
272		ThreadSpecificData *tsdPtr =
	269	TCL_UNUSED(void *))
	270	{
	271	ThreadSpecificData tsdPtr = (ThreadSpecificData )
273	272	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
274	273
275	274	if (tsdPtr->controlFamily.encoding != NULL) {

306	305
307	306	void
308	307	TkpFontPkgInit(
309		TkMainInfo mainPtr) / The application being created. */
310		{
311		ThreadSpecificData *tsdPtr =
	308	TCL_UNUSED(TkMainInfo )) / The application being created. */
	309	{
	310	ThreadSpecificData tsdPtr = (ThreadSpecificData )
312	311	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
313	312	SubFont dummy;
314	313	int i;

362	361
363	362	static int
364	363	ControlUtfProc(
365		ClientData clientData, /* Not used. */
	364	TCL_UNUSED(void ), / Not used. */
366	365	const char src, / Source string in UTF-8. */
367	366	int srcLen, /* Source string length in bytes. */
368		int flags, /* Conversion control flags. */
369		Tcl_EncodingState statePtr,/ Place for conversion routine to store state
	367	TCL_UNUSED(int), /* Conversion control flags. */
	368	TCL_UNUSED(Tcl_EncodingState ),/ Place for conversion routine to store state
370	369	* information used during a piecewise
371	370	* conversion. Contents of statePtr are
372	371	* initialized and/or reset by conversion

390	389	const char srcStart, srcEnd;
391	390	char dstStart, dstEnd;
392	391	int ch, result;
393		static char hexChars[] = "0123456789abcdef";
394		static char mapChars[] = {
	392	static const char hexChars[] = "0123456789abcdef";
	393	static const char mapChars[] = {
395	394	0, 0, 0, 0, 0, 0, 0,
396	395	'a', 'b', 't', 'n', 'v', 'f', 'r'
397	396	};

416	415	dst += 2;
417	416	} else if ((size_t)ch < 256) {
418	417	dst[1] = 'x';
419		dst[2] = hexChars[(ch >> 4) & 0xf];
420		dst[3] = hexChars[ch & 0xf];
	418	dst[2] = hexChars[(ch >> 4) & 0xF];
	419	dst[3] = hexChars[ch & 0xF];
421	420	dst += 4;
422	421	} else if ((size_t)ch < 0x10000) {
423	422	dst[1] = 'u';
424		dst[2] = hexChars[(ch >> 12) & 0xf];
425		dst[3] = hexChars[(ch >> 8) & 0xf];
426		dst[4] = hexChars[(ch >> 4) & 0xf];
427		dst[5] = hexChars[ch & 0xf];
	423	dst[2] = hexChars[(ch >> 12) & 0xF];
	424	dst[3] = hexChars[(ch >> 8) & 0xF];
	425	dst[4] = hexChars[(ch >> 4) & 0xF];
	426	dst[5] = hexChars[ch & 0xF];
428	427	dst += 6;
429	428	} else {
430	429	/* TODO we can do better here */

460	459
461	460	static int
462	461	Ucs2beToUtfProc(
463		ClientData clientData, /* Not used. */
	462	TCL_UNUSED(void ), / Not used. */
464	463	const char src, / Source string in Unicode. */
465	464	int srcLen, /* Source string length in bytes. */
466	465	int flags, /* Conversion control flags. */
467		Tcl_EncodingState statePtr,/ Place for conversion routine to store state
	466	TCL_UNUSED(Tcl_EncodingState ),/ Place for conversion routine to store state
468	467	* information used during a piecewise
469	468	* conversion. Contents of statePtr are
470	469	* initialized and/or reset by conversion

486	485	* output buffer. */
487	486	{
488	487	const char srcStart, srcEnd;
489		char dstEnd, dstStart;
490		int result, numChars;
491
	488	const char dstEnd, dstStart;
	489	int result, numChars, charLimit = INT_MAX;
	490	unsigned short ch;
	491
	492	if (flags & TCL_ENCODING_CHAR_LIMIT) {
	493	charLimit = *dstCharsPtr;
	494	}
492	495	result = TCL_OK;
493	496
494	497	/* check alignment with ucs-2 (2 == sizeof(UCS-2)) */

506	509	srcEnd = src + srcLen;
507	510
508	511	dstStart = dst;
509		dstEnd = dst + dstLen - TCL_UTF_MAX;
510
511		for (numChars = 0; src < srcEnd; numChars++) {
	512	dstEnd = dst + dstLen - 4;
	513
	514	for (numChars = 0; src < srcEnd && numChars <= charLimit; numChars++) {
512	515	if (dst > dstEnd) {
513	516	result = TCL_CONVERT_NOSPACE;
514	517	break;
515	518	}
516	519
	520	ch = (src[0] & 0xFF) << 8 \| (src[1] & 0xFF);
	521	src += 2 /* sizeof(UTF-16) */;
	522
517	523	/*
518		* Need to swap byte-order on little-endian machines (x86) for
519		* UCS-2BE. We know this is an LE->BE swap.
	524	* Special case for 1-byte utf chars for speed. Make sure we work with
	525	* unsigned short-size data.
520	526	*/
521
522		dst += TkUniCharToUtf(htons(((short )src)), dst);
523		src += 2 /* sizeof(UCS-2) */;
	527	if (ch && ch < 0x80) {
	528	*dst++ = (ch & 0xFF);
	529	} else {
	530	dst += Tcl_UniCharToUtf(ch, dst);
	531	}
524	532	}
525	533
526	534	*srcReadPtr = src - srcStart;

547	555
548	556	static int
549	557	UtfToUcs2beProc(
550		ClientData clientData, /* TableEncodingData that specifies
	558	TCL_UNUSED(void ), / TableEncodingData that specifies
551	559	* encoding. */
552	560	const char src, / Source string in UTF-8. */
553	561	int srcLen, /* Source string length in bytes. */
554	562	int flags, /* Conversion control flags. */
555		Tcl_EncodingState statePtr,/ Place for conversion routine to store state
	563	TCL_UNUSED(Tcl_EncodingState ),/ Place for conversion routine to store state
556	564	* information used during a piecewise
557	565	* conversion. Contents of statePtr are
558	566	* initialized and/or reset by conversion

575	583	{
576	584	const char srcStart, srcEnd, srcClose, dstStart, *dstEnd;
577	585	int result, numChars;
578		Tcl_UniChar chPtr = (Tcl_UniChar )statePtr;
579
580		if (flags & TCL_ENCODING_START) {
581		*statePtr = 0;
582		}
	586	int ch;
583	587
584	588	srcStart = src;
585	589	srcEnd = src + srcLen;
586	590	srcClose = srcEnd;
587	591	if (!(flags & TCL_ENCODING_END)) {
588		srcClose -= TCL_UTF_MAX;
	592	srcClose -= 6;
589	593	}
590	594
591	595	dstStart = dst;

605	609	result = TCL_CONVERT_NOSPACE;
606	610	break;
607	611	}
608		src += Tcl_UtfToUniChar(src, chPtr);
	612	src += TkUtfToUniChar(src, &ch);
	613	if (ch > 0xFFFF) {
	614	ch = 0xFFFD;
	615	}
609	616
610	617	/*
611	618	* Ensure big-endianness (store big bits first).
612		* XXX: This hard-codes the assumed size of Tcl_UniChar as 2. Make
613		* sure to work in char* for Tcl_UtfToUniChar alignment. [Bug 1122671]
614	619	*/
615	620
616
617		dst++ = (char)(chPtr >> 8);
618		dst++ = (char)chPtr;
	621	*dst++ = (char)((ch >> 8) & 0xFF);
	622	*dst++ = (char)(ch & 0xFF);
619	623	}
620	624	*srcReadPtr = src - srcStart;
621	625	*dstWrotePtr = dst - dstStart;

700	704
701	705	if (name[0] == '-') {
702	706	if (name[1] != '*') {
703		char *dash;
	707	const char *dash;
704	708
705	709	dash = strchr(name + 1, '-');
706	710	if ((dash == NULL) \|\| (isspace(UCHAR(dash[-1])))) {

715	719	}
716	720	fontStructPtr = CreateClosestFont(tkwin, &fa.fa, &fa.xa);
717	721	}
718		fontPtr = ckalloc(sizeof(UnixFont));
	722	fontPtr = (UnixFont *)ckalloc(sizeof(UnixFont));
719	723	InitFont(tkwin, fontStructPtr, fontPtr);
720	724
721	725	return (TkFont *) fontPtr;

771	775
772	776	fontPtr = (UnixFont *) tkFontPtr;
773	777	if (fontPtr == NULL) {
774		fontPtr = ckalloc(sizeof(UnixFont));
	778	fontPtr = (UnixFont *)ckalloc(sizeof(UnixFont));
775	779	} else {
776	780	ReleaseFont(fontPtr);
777	781	}

834	838	Tcl_Interp interp, / Interp to hold result. */
835	839	Tk_Window tkwin) /* For display to query. */
836	840	{
837		int i, new, numNames;
	841	int i, isNew, numNames;
838	842	char family, *nameList;
839	843	Tcl_HashTable familyTable;
840	844	Tcl_HashEntry *hPtr;

863	867	continue; /* See comment above. */
864	868	}
865	869	*familyEnd = '\0';
866		Tcl_CreateHashEntry(&familyTable, family, &new);
	870	Tcl_CreateHashEntry(&familyTable, family, &isNew);
867	871	}
868	872	XFreeFontNames(nameList);
869	873
870	874	hPtr = Tcl_FirstHashEntry(&familyTable, &search);
871	875	resultPtr = Tcl_NewObj();
872	876	while (hPtr != NULL) {
873		strPtr = Tcl_NewStringObj(Tcl_GetHashKey(&familyTable, hPtr), -1);
	877	strPtr = Tcl_NewStringObj((const char *)Tcl_GetHashKey(&familyTable, hPtr), -1);
874	878	Tcl_ListObjAppendElement(NULL, resultPtr, strPtr);
875	879	hPtr = Tcl_NextHashEntry(&search);
876	880	}

1198	1202	Tk_Font tkfont, /* Font in which characters will be drawn. */
1199	1203	const char source, / UTF-8 string to be displayed. Need not be
1200	1204	* '\0' terminated. */
1201		int numBytes, /* Maximum number of bytes to consider from
	1205	TCL_UNUSED(int), /* Maximum number of bytes to consider from
1202	1206	* source string in all. */
1203	1207	int rangeStart, /* Index of first byte to measure. */
1204	1208	int rangeLength, /* Length of range to measure in bytes. */

1220	1224	int lengthPtr) / Filled with x-location just after the
1221	1225	* terminating character. */
1222	1226	{
1223		(void) numBytes; /unused/
1224	1227	return Tk_MeasureChars(tkfont, source + rangeStart, rangeLength,
1225	1228	maxLength, flags, lengthPtr);
1226	1229	}

1369	1372	* with access to all the characters on the line for context. On X11 this
1370	1373	* context isn't consulted, so we just call Tk_DrawChars().
1371	1374	*
	1375	* Note: TK_DRAW_IN_CONTEXT being currently defined only on macOS, this
	1376	* function is unused (and possibly unfinished). See [7655f65ae7].
	1377	*
1372	1378	* Results:
1373	1379	* None.
1374	1380	*

1392	1398	* is passed to this function. If they are not
1393	1399	* stripped out, they will be displayed as
1394	1400	* regular printing characters. */
1395		int numBytes, /* Number of bytes in string. */
	1401	TCL_UNUSED(int), /* Number of bytes in string. */
1396	1402	int rangeStart, /* Index of first byte to draw. */
1397	1403	int rangeLength, /* Length of range to draw in bytes. */
1398	1404	int x, int y) /* Coordinates at which to place origin of the

1401	1407	{
1402	1408	int widthUntilStart;
1403	1409
1404		(void) numBytes; /unused/
1405
1406	1410	Tk_MeasureChars(tkfont, source, rangeStart, -1, 0, &widthUntilStart);
1407	1411	Tk_DrawChars(display, drawable, gc, tkfont, source + rangeStart,
1408	1412	rangeLength, x+widthUntilStart, y);
	1413	}
	1414
	1415	void
	1416	TkpDrawAngledCharsInContext(
	1417	Display display, / Display on which to draw. */
	1418	Drawable drawable, /* Window or pixmap in which to draw. */
	1419	GC gc, /* Graphics context for drawing characters. */
	1420	Tk_Font tkfont, /* Font in which characters will be drawn; must
	1421	* be the same as font used in GC. */
	1422	const char * source, /* UTF-8 string to be displayed. Need not be
	1423	* '\0' terminated. All Tk meta-characters
	1424	* (tabs, control characters, and newlines)
	1425	* should be stripped out of the string that is
	1426	* passed to this function. If they are not
	1427	* stripped out, they will be displayed as
	1428	* regular printing characters. */
	1429	int numBytes, /* Number of bytes in string. */
	1430	int rangeStart, /* Index of first byte to draw. */
	1431	int rangeLength, /* Length of range to draw in bytes. */
	1432	double x, double y, /* Coordinates at which to place origin of the
	1433	* whole (not just the range) string when
	1434	* drawing. */
	1435	double angle) /* What angle to put text at, in degrees. */
	1436	{
	1437	int widthUntilStart;
	1438	double sinA = sin(angle * PI/180.0), cosA = cos(angle * PI/180.0);
	1439
	1440	(void) numBytes; /unused/
	1441
	1442	Tk_MeasureChars(tkfont, source, rangeStart, -1, 0, &widthUntilStart);
	1443	TkDrawAngledChars(display, drawable, gc, tkfont, source + rangeStart,
	1444	rangeLength, x+cosAwidthUntilStart, y-sinAwidthUntilStart, angle);
1409	1445	}
1410	1446
1411	1447	/*

1570	1606	UnixFont fontPtr) / Filled with information constructed from
1571	1607	* the above arguments. */
1572	1608	{
1573		ThreadSpecificData *tsdPtr =
	1609	ThreadSpecificData tsdPtr = (ThreadSpecificData )
1574	1610	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
1575	1611	unsigned long value;
1576	1612	int minHi, maxHi, minLo, maxLo, fixed, width, limit, i, n;

1676	1712	* 1/3 the width of a capital I.
1677	1713	*/
1678	1714
1679		fontPtr->barHeight = fontPtr->widths['I'] / 3;
	1715	fontPtr->barHeight = fontPtr->widths[(unsigned char)'I'] / 3;
1680	1716	if (fontPtr->barHeight == 0) {
1681	1717	fontPtr->barHeight = 1;
1682	1718	}

1817	1853	Display display, / Display in which font will be used. */
1818	1854	XFontStruct fontStructPtr, / Screen font whose FontFamily is to be
1819	1855	* returned. */
1820		int base) /* Non-zero if this font family is to be used
	1856	TCL_UNUSED(int)) /* Non-zero if this font family is to be used
1821	1857	* in the base font of a font object. */
1822	1858	{
1823	1859	FontFamily *familyPtr;
1824	1860	FontAttributes fa;
1825	1861	Tcl_Encoding encoding;
1826		ThreadSpecificData *tsdPtr =
	1862	ThreadSpecificData tsdPtr = (ThreadSpecificData )
1827	1863	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
1828	1864
1829	1865	GetFontAttributes(display, fontStructPtr, &fa);

1842	1878	}
1843	1879	}
1844	1880
1845		familyPtr = ckalloc(sizeof(FontFamily));
	1881	familyPtr = (FontFamily *)ckalloc(sizeof(FontFamily));
1846	1882	memset(familyPtr, 0, sizeof(FontFamily));
1847	1883	familyPtr->nextPtr = tsdPtr->fontFamilyList;
1848	1884	tsdPtr->fontFamilyList = familyPtr;

1899	1935	FontFamily familyPtr) / The FontFamily to delete. */
1900	1936	{
1901	1937	FontFamily **familyPtrPtr;
1902		ThreadSpecificData *tsdPtr =
	1938	ThreadSpecificData tsdPtr = (ThreadSpecificData )
1903	1939	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
1904	1940	int i;
1905	1941
1906	1942	if (familyPtr == NULL) {
1907	1943	return;
1908	1944	}
1909		familyPtr->refCount--;
1910		if (familyPtr->refCount > 0) {
	1945	if (familyPtr->refCount-- > 1) {
1911	1946	return;
1912	1947	}
1913	1948	if (familyPtr->encoding) {

1975	2010	SubFont *subFontPtr;
1976	2011	Tcl_DString ds;
1977	2012
1978		if (ch < 0 \|\| ch > 0x30000) {
1979		ch = 0xfffd;
	2013	if (ch < 0 \|\| ch >= FONTMAP_NUMCHARS) {
	2014	ch = 0xFFFD;
1980	2015	}
1981	2016
1982	2017	for (i = 0; i < fontPtr->numSubFonts; i++) {

2129	2164	{
2130	2165	int row, bitOffset;
2131	2166
2132		if (ch < 0 \|\| ch >= 0x30000) {
	2167	if (ch < 0 \|\| ch >= FONTMAP_NUMCHARS) {
2133	2168	return 0;
2134	2169	}
2135	2170	row = ch >> FONTMAP_SHIFT;

2172	2207	{
2173	2208	int row, bitOffset;
2174	2209
2175		if (ch >= 0 && ch < 0x30000) {
	2210	if (ch >= 0 && ch < FONTMAP_NUMCHARS) {
2176	2211	row = ch >> FONTMAP_SHIFT;
2177	2212	if (subFontPtr->fontMap[row] == NULL) {
2178	2213	FontMapLoadPage(subFontPtr, row);

2213	2248	Tcl_Encoding encoding;
2214	2249	XFontStruct *fontStructPtr;
2215	2250	XCharStruct *widths;
2216		ThreadSpecificData *tsdPtr =
	2251	ThreadSpecificData tsdPtr = (ThreadSpecificData )
2217	2252	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
2218	2253
2219		subFontPtr->fontMap[row] = ckalloc(FONTMAP_BITSPERPAGE / 8);
	2254	subFontPtr->fontMap[row] = (char *)ckalloc(FONTMAP_BITSPERPAGE / 8);
2220	2255	memset(subFontPtr->fontMap[row], 0, FONTMAP_BITSPERPAGE / 8);
2221	2256
2222	2257	if (subFontPtr->familyPtr == &tsdPtr->controlFamily) {

2454	2489	numEncodings = 0;
2455	2490	Tcl_DStringInit(&dsEncodings);
2456	2491
2457		charset = NULL; /* lint, since numNames must be > 0 to get here. */
	2492	charset = NULL; /* numNames must be > 0 to get here. */
2458	2493
2459	2494	retry:
2460	2495	bestIdx[0] = -1;

2548	2583	* make a copy.
2549	2584	*/
2550	2585
2551		nameList = ckalloc(numNames * sizeof(char *));
	2586	nameList = (char *)ckalloc(numNames sizeof(char *));
2552	2587	memcpy(nameList, nameListOrig, numNames * sizeof(char *));
2553	2588	}
2554	2589	nameList[nameIdx] = NULL;

2593	2628	if (fontPtr->numSubFonts >= SUBFONT_SPACE) {
2594	2629	SubFont *newPtr;
2595	2630
2596		newPtr = ckalloc(sizeof(SubFont) * (fontPtr->numSubFonts + 1));
	2631	newPtr = (SubFont )ckalloc(sizeof(SubFont) (fontPtr->numSubFonts + 1));
2597	2632	memcpy(newPtr, fontPtr->subFontArray,
2598	2633	fontPtr->numSubFonts * sizeof(SubFont));
2599	2634	if (fixSubFontPtrPtr != NULL) {
2600		register SubFont fixSubFontPtr = fixSubFontPtrPtr;
	2635	SubFont fixSubFontPtr = fixSubFontPtrPtr;
2601	2636
2602	2637	if (fixSubFontPtr != &fontPtr->controlSubFont) {
2603	2638	*fixSubFontPtrPtr =

2683	2718	penalty += diff;
2684	2719	}
2685	2720	if (gotPtr->xa.charset != wantPtr->xa.charset) {
2686		int i;
	2721	size_t i;
2687	2722	const char gotAlias, wantAlias;
2688	2723
2689	2724	penalty += 65000;

2691	2726	wantAlias = GetEncodingAlias(wantPtr->xa.charset);
2692	2727	if (strcmp(gotAlias, wantAlias) != 0) {
2693	2728	penalty += 30000;
2694		for (i = 0; encodingList[i] != NULL; i++) {
	2729	for (i = 0; i < sizeof(encodingList)/sizeof(encodingList[0]); i++) {
2695	2730	if (strcmp(gotAlias, encodingList[i]) == 0) {
2696	2731	penalty -= 30000;
2697	2732	break;

3062	3097	Pixmap bitmap;
3063	3098	GC bitmapGC;
3064	3099	XGCValues values;
3065		XImage *image;
	3100	XImage *image = NULL;
3066	3101
3067	3102	(void) Tk_MeasureChars(tkfont, source, numBytes, -1, 0, &width);
3068	3103	height = fontPtr->fm.ascent + fontPtr->fm.descent;
3069	3104
3070		bitmap = Tk_GetPixmap(display, drawable, width, height, 1);
3071		values.graphics_exposures = False;
3072		values.foreground = BlackPixel(display, DefaultScreen(display));
3073		bitmapGC = XCreateGC(display, bitmap, GCGraphicsExposures\|GCForeground,
3074		&values);
3075		XFillRectangle(display, bitmap, bitmapGC, 0, 0, width, height);
3076
3077		values.font = Tk_FontId(tkfont);
3078		values.foreground = WhitePixel(display, DefaultScreen(display));
3079		values.background = BlackPixel(display, DefaultScreen(display));
3080		XChangeGC(display, bitmapGC, GCFont\|GCForeground\|GCBackground, &values);
3081		Tk_DrawChars(display, bitmap, bitmapGC, tkfont, source, numBytes, 0,
3082		fontPtr->fm.ascent);
3083		XFreeGC(display, bitmapGC);
3084
3085		image = XGetImage(display, bitmap, 0, 0, width, height, AllPlanes,
3086		ZPixmap);
3087		Tk_FreePixmap(display, bitmap);
	3105	if ((width > 0) && (height > 0)) {
	3106	bitmap = Tk_GetPixmap(display, drawable, width, height, 1);
	3107	values.graphics_exposures = False;
	3108	values.foreground = BlackPixel(display, DefaultScreen(display));
	3109	bitmapGC = XCreateGC(display, bitmap, GCGraphicsExposures\|GCForeground,
	3110	&values);
	3111	XFillRectangle(display, bitmap, bitmapGC, 0, 0, width, height);
	3112
	3113	values.font = Tk_FontId(tkfont);
	3114	values.foreground = WhitePixel(display, DefaultScreen(display));
	3115	values.background = BlackPixel(display, DefaultScreen(display));
	3116	XChangeGC(display, bitmapGC, GCFont\|GCForeground\|GCBackground, &values);
	3117	Tk_DrawChars(display, bitmap, bitmapGC, tkfont, source, numBytes, 0,
	3118	fontPtr->fm.ascent);
	3119	XFreeGC(display, bitmapGC);
	3120
	3121	image = XGetImage(display, bitmap, 0, 0, width, height, AllPlanes,
	3122	ZPixmap);
	3123	Tk_FreePixmap(display, bitmap);
	3124	}
3088	3125
3089	3126	*realWidthPtr = width;
3090	3127	*realHeightPtr = height;

3099	3136	int height,
3100	3137	Pixmap *bitmapPtr)
3101	3138	{
3102		Pixmap bitmap;
3103		XImage *image;
	3139	Pixmap bitmap = None;
	3140	XImage *image = NULL;
3104	3141	GC bitmapGC;
3105	3142	XGCValues values;
3106	3143
3107		bitmap = Tk_GetPixmap(display, drawable, width, height, 1);
3108		values.graphics_exposures = False;
3109		values.foreground = BlackPixel(display, DefaultScreen(display));
3110		bitmapGC = XCreateGC(display, bitmap, GCGraphicsExposures\|GCForeground,
3111		&values);
3112		XFillRectangle(display, bitmap, bitmapGC, 0, 0, width, height);
3113		XFreeGC(display, bitmapGC);
3114
3115		image = XGetImage(display, bitmap, 0, 0, width, height, AllPlanes,
3116		ZPixmap);
	3144	if ((width > 0) && (height > 0)) {
	3145	bitmap = Tk_GetPixmap(display, drawable, width, height, 1);
	3146	values.graphics_exposures = False;
	3147	values.foreground = BlackPixel(display, DefaultScreen(display));
	3148	bitmapGC = XCreateGC(display, bitmap, GCGraphicsExposures\|GCForeground,
	3149	&values);
	3150	XFillRectangle(display, bitmap, bitmapGC, 0, 0, width, height);
	3151	XFreeGC(display, bitmapGC);
	3152
	3153	image = XGetImage(display, bitmap, 0, 0, width, height, AllPlanes,
	3154	ZPixmap);
	3155	}
3117	3156	*bitmapPtr = bitmap;
3118	3157	return image;
3119	3158	}

+31

-7

unix/tkUnixKey.c less more

10	10	*/
11	11
12	12	#include "tkInt.h"
	13
	14	#ifdef __GNUC__
	15	/*
	16	* We know that XKeycodeToKeysym is deprecated, nothing we can do about it.
	17	*/
	18	#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
	19	#endif
13	20
14	21	/*
15	22	** Bug [3607830]: Before using Xkb, it must be initialized. TkpOpenDisplay
16	23	** does this and sets the USE_XKB flag if xkb is supported.
17	24	** (should this be function ptr?)
18	25	*/
	26
19	27	#ifdef HAVE_XKBKEYCODETOKEYSYM
20	28	# include <X11/XKBlib.h>
21	29	#else

137	145
138	146	#ifdef TK_USE_INPUT_METHODS
139	147	if ((winPtr->dispPtr->flags & TK_DISPLAY_USE_IM)
140		&& (winPtr->inputContext != NULL)
141		&& (eventPtr->type == KeyPress)) {
	148	&& (winPtr->inputContext != NULL)) {
142	149	Status status;
143	150
144	151	#if X_HAVE_UTF8_STRING

193	200	{
194	201	/*
195	202	* Fall back to convert a keyboard event to a UTF-8 string using
196		* XLookupString. This is used when input methods are turned off and
197		* for KeyRelease events.
	203	* XLookupString. This is used when input methods are turned off.
198	204	*
199	205	* Note: XLookupString() normally returns a single ISO Latin 1 or
200	206	* ASCII control character.

278	284	mincode = 0;
279	285	maxcode = -1;
280	286	XDisplayKeycodes(dispPtr->display, &mincode, &maxcode);
281		if (keycode < mincode) {
	287	if (keycode < (KeyCode)mincode) {
282	288	keycode = mincode;
283		} else if (keycode > maxcode) {
	289	} else if (keycode > (KeyCode)maxcode) {
284	290	keycode = maxcode;
285	291	}
286	292

305	311	*
306	312	*----------------------------------------------------------------------
307	313	*/
	314
	315	#ifdef __GNUC__
	316	# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
	317	#endif
308	318
309	319	KeySym
310	320	TkpGetKeySym(

316	326	TkKeyEvent* kePtr = (TkKeyEvent*) eventPtr;
317	327
318	328	/*
	329	* X11 keycodes always lie in the inclusive range [8,255].
	330	*/
	331
	332	if (eventPtr->xkey.keycode > 0xff) {
	333	return NoSymbol;
	334	}
	335
	336	/*
319	337	* Refresh the mapping information if it's stale. This must happen before
320	338	* we do any input method processing. [Bug 3599312]
321	339	*/

362	380	&& (eventPtr->xkey.state & LockMask))) {
363	381	index += 1;
364	382	}
	383
365	384	sym = TkKeycodeToKeysym(dispPtr, eventPtr->xkey.keycode, 0,
366	385	index);
367	386

371	390	* alphabetic, then switch back to the unshifted keysym.
372	391	*/
373	392
	393	#ifndef XK_Oslash
	394	/* XK_Oslash is the official name, but might not be present in older X11 headers */
	395	# define XK_Oslash XK_Ooblique
	396	#endif
374	397	if ((index & 1) && !(eventPtr->xkey.state & ShiftMask)
375	398	&& (dispPtr->lockUsage == LU_CAPS)) {
376	399	if (!(((sym >= XK_A) && (sym <= XK_Z))
377	400	\|\| ((sym >= XK_Agrave) && (sym <= XK_Odiaeresis))
378		\|\| ((sym >= XK_Ooblique) && (sym <= XK_Thorn)))) {
	401	\|\| ((sym >= XK_Oslash) && (sym <= XK_Thorn)))) {
379	402	index &= ~1;
380	403	sym = TkKeycodeToKeysym(dispPtr, eventPtr->xkey.keycode,
381	404	0, index);

465	488	continue;
466	489	}
467	490	keysym = TkKeycodeToKeysym(dispPtr, *codePtr, 0, 0);
	491
468	492	if (keysym == XK_Mode_switch) {
469	493	dispPtr->modeModMask \|= ShiftMask << (i/modMapPtr->max_keypermod);
470	494	}

+42

-45

unix/tkUnixMenu.c less more

144	144
145	145	void
146	146	TkpDestroyMenu(
147		TkMenu *menuPtr)
	147	TCL_UNUSED(TkMenu *))
148	148	{
149	149	/*
150	150	* Nothing to do.

170	170
171	171	void
172	172	TkpDestroyMenuEntry(
173		TkMenuEntry *mEntryPtr)
	173	TCL_UNUSED(TkMenuEntry *))
174	174	{
175	175	/*
176	176	* Nothing to do.

198	198
199	199	int
200	200	TkpConfigureMenuEntry(
201		register TkMenuEntry mePtr)/ Information about menu entry; may or may
	201	TkMenuEntry mePtr)/ Information about menu entry; may or may
202	202	* not already have values for some fields. */
203	203	{
204	204	/*

238	238
239	239	int
240	240	TkpMenuNewEntry(
241		TkMenuEntry *mePtr)
	241	TCL_UNUSED(TkMenuEntry *))
242	242	{
243	243	return TCL_OK;
244	244	}

291	291
292	292	void
293	293	TkpSetMainMenubar(
294		Tcl_Interp *interp,
295		Tk_Window tkwin,
296		const char *menuName)
	294	TCL_UNUSED(Tcl_Interp *),
	295	TCL_UNUSED(Tk_Window),
	296	TCL_UNUSED(const char *))
297	297	{
298	298	/*
299	299	* Nothing to do.

322	322	GetMenuIndicatorGeometry(
323	323	TkMenu menuPtr, / The menu we are drawing. */
324	324	TkMenuEntry mePtr, / The entry we are interested in. */
325		Tk_Font tkfont, /* The precalculated font */
326		const Tk_FontMetrics fmPtr,/ The precalculated metrics */
	325	TCL_UNUSED(Tk_Font), /* The precalculated font */
	326	TCL_UNUSED(const Tk_FontMetrics ),/ The precalculated metrics */
327	327	int widthPtr, / The resulting width */
328	328	int heightPtr) / The resulting height */
329	329	{

444	444	} else {
445	445	relief = TK_RELIEF_RAISED;
446	446	}
447
448	447	Tk_GetPixelsFromObj(NULL, menuPtr->tkwin,
449	448	menuPtr->activeBorderWidthPtr, &activeBorderWidth);
450	449	Tk_Fill3DRectangle(menuPtr->tkwin, d, bgBorder, x, y, width, height,

523	522	if (menuPtr->menuType == MENUBAR) {
524	523	left += 5;
525	524	}
526		Tk_DrawChars(menuPtr->display, d, gc, tkfont, accel,
	525	Tk_DrawChars(menuPtr->display, d, gc, tkfont, accel,
527	526	mePtr->accelLength, left,
528	527	(y + (height + fmPtr->ascent - fmPtr->descent) / 2));
529	528	}

553	552	Tk_3DBorder border, /* The background color */
554	553	XColor indicatorColor, / The color to draw indicators with */
555	554	XColor disableColor, / The color use use when disabled */
556		Tk_Font tkfont, /* The font to draw with */
557		const Tk_FontMetrics fmPtr,/ The font metrics of the font */
	555	TCL_UNUSED(Tk_Font), /* The font to draw with */
	556	TCL_UNUSED(const Tk_FontMetrics ),/ The font metrics of the font */
558	557	int x, /* The left of the entry rect */
559	558	int y, /* The top of the entry rect */
560		int width, /* Width of menu entry */
	559	TCL_UNUSED(int), /* Width of menu entry */
561	560	int height) /* Height of menu entry */
562	561	{
563	562	/*

622	621	static void
623	622	DrawMenuSeparator(
624	623	TkMenu menuPtr, / The menu we are drawing */
625		TkMenuEntry mePtr, / The entry we are drawing */
	624	TCL_UNUSED(TkMenuEntry ), / The entry we are drawing */
626	625	Drawable d, /* The drawable we are using */
627		GC gc, /* The gc to draw into */
628		Tk_Font tkfont, /* The font to draw with */
629		const Tk_FontMetrics fmPtr,/ The font metrics from the font */
	626	TCL_UNUSED(GC), /* The gc to draw into */
	627	TCL_UNUSED(Tk_Font), /* The font to draw with */
	628	TCL_UNUSED(const Tk_FontMetrics ),/ The font metrics from the font */
630	629	int x, int y,
631	630	int width, int height)
632	631	{

789	788	imageHeight, d, leftEdge + imageXOffset,
790	789	(int) (y + (mePtr->height-imageHeight)/2 + imageYOffset));
791	790	}
792		} else if (mePtr->bitmapPtr != None) {
	791	} else if (mePtr->bitmapPtr != NULL) {
793	792	Pixmap bitmap = Tk_GetBitmapFromObj(menuPtr->tkwin, mePtr->bitmapPtr);
794	793
795	794	XCopyPlane(menuPtr->display, bitmap, d, gc, 0, 0,

817	816	XFillRectangle(menuPtr->display, d, menuPtr->disabledGC, x, y,
818	817	(unsigned) width, (unsigned) height);
819	818	} else if ((mePtr->image != NULL)
820		&& (menuPtr->disabledImageGC != None)) {
	819	&& (menuPtr->disabledImageGC != NULL)) {
821	820	XFillRectangle(menuPtr->display, d, menuPtr->disabledImageGC,
822	821	leftEdge + imageXOffset,
823	822	(int) (y + (mePtr->height - imageHeight)/2 + imageYOffset),

851	850	Tk_Font tkfont, /* The precalculated font */
852	851	const Tk_FontMetrics fmPtr,/ The precalculated font metrics */
853	852	int x, int y,
854		int width, int height)
	853	TCL_UNUSED(int), int height)
855	854	{
856	855	if ((mePtr->underline >= 0) && (mePtr->labelPtr != NULL)) {
857	856	int len;
858	857
859	858	len = Tcl_GetCharLength(mePtr->labelPtr);
860	859	if (mePtr->underline < len) {
861		int activeBorderWidth, leftEdge;
	860	int activeBorderWidth, leftEdge, ch;
862	861	const char label, start, *end;
863	862
864	863	label = Tcl_GetString(mePtr->labelPtr);
865		start = Tcl_UtfAtIndex(label, mePtr->underline);
866		end = Tcl_UtfNext(start);
	864	start = TkUtfAtIndex(label, mePtr->underline);
	865	end = start + TkUtfToUniChar(start, &ch);
867	866
868	867	Tk_GetPixelsFromObj(NULL, menuPtr->tkwin,
869	868	menuPtr->activeBorderWidthPtr, &activeBorderWidth);

930	929
931	930	int
932	931	TkpPostTearoffMenu(
933		Tcl_Interp interp, / The interpreter of the menu */
	932	TCL_UNUSED(Tcl_Interp ), / The interpreter of the menu */
934	933	TkMenu menuPtr, / The menu we are posting */
935	934	int x, int y, int index) /* The root X,Y coordinates where the
936	935	* specified entry will be posted */

1020	1019
1021	1020	static void
1022	1021	GetMenuSeparatorGeometry(
1023		TkMenu menuPtr, / The menu we are measuring */
1024		TkMenuEntry mePtr, / The entry we are measuring */
1025		Tk_Font tkfont, /* The precalculated font */
	1022	TCL_UNUSED(TkMenu ), / The menu we are measuring */
	1023	TCL_UNUSED(TkMenuEntry ), / The entry we are measuring */
	1024	TCL_UNUSED(Tk_Font), /* The precalculated font */
1026	1025	const Tk_FontMetrics fmPtr,/ The precalcualted font metrics */
1027	1026	int widthPtr, / The resulting width */
1028	1027	int heightPtr) / The resulting height */

1050	1049	static void
1051	1050	GetTearoffEntryGeometry(
1052	1051	TkMenu menuPtr, / The menu we are drawing */
1053		TkMenuEntry mePtr, / The entry we are measuring */
	1052	TCL_UNUSED(TkMenuEntry ), / The entry we are measuring */
1054	1053	Tk_Font tkfont, /* The precalculated font */
1055	1054	const Tk_FontMetrics fmPtr,/ The precalculated font metrics */
1056	1055	int widthPtr, / The resulting width */
1057	1056	int heightPtr) / The resulting height */
1058	1057	{
1059		if (menuPtr->menuType != MASTER_MENU) {
	1058	if (menuPtr->menuType != MAIN_MENU) {
1060	1059	*heightPtr = 0;
1061	1060	*widthPtr = 0;
1062	1061	} else {

1091	1090	Tk_FontMetrics menuMetrics, entryMetrics, *fmPtr;
1092	1091	int width, height, i, j, x, y, currentRowHeight, maxWidth;
1093	1092	int maxWindowWidth, lastRowBreak, lastEntry;
1094		int borderWidth, activeBorderWidth, helpMenuIndex = -1;
	1093	int activeBorderWidth, helpMenuIndex = -1;
1095	1094	TkMenuEntry *mePtr;
1096	1095
1097	1096	if (menuPtr->tkwin == NULL) {
1098	1097	return;
1099	1098	}
1100	1099
1101		Tk_GetPixelsFromObj(NULL, menuPtr->tkwin, menuPtr->borderWidthPtr,
1102		&borderWidth);
1103	1100	Tk_GetPixelsFromObj(NULL, menuPtr->tkwin, menuPtr->activeBorderWidthPtr,
1104	1101	&activeBorderWidth);
1105	1102	maxWidth = 0;

1110	1107
1111	1108	maxWindowWidth = Tk_Width(menuPtr->tkwin);
1112	1109	if (maxWindowWidth == 1) {
1113		maxWindowWidth = 0x7ffffff;
	1110	maxWindowWidth = 0x7FFFFFF;
1114	1111	}
1115	1112	currentRowHeight = 0;
1116	1113	Tk_GetPixelsFromObj(NULL, menuPtr->tkwin, menuPtr->borderWidthPtr,

1121	1118	/*
1122	1119	* On the Mac especially, getting font metrics can be quite slow, so
1123	1120	* we want to do it intelligently. We are going to precalculate them
1124		* and pass them down to all of the measureing and drawing routines.
	1121	* and pass them down to all of the measuring and drawing routines.
1125	1122	* We will measure the font metrics of the menu once, and if an entry
1126	1123	* has a font set, we will measure it as we come to it, and then we
1127	1124	* decide which set to give the geometry routines.

1268	1265	static void
1269	1266	DrawTearoffEntry(
1270	1267	TkMenu menuPtr, / The menu we are drawing */
1271		TkMenuEntry mePtr, / The entry we are drawing */
	1268	TCL_UNUSED(TkMenuEntry ), / The entry we are drawing */
1272	1269	Drawable d, /* The drawable we are drawing into */
1273		GC gc, /* The gc we are drawing with */
1274		Tk_Font tkfont, /* The font we are drawing with */
1275		const Tk_FontMetrics fmPtr,/ The metrics we are drawing with */
	1270	TCL_UNUSED(GC), /* The gc we are drawing with */
	1271	TCL_UNUSED(Tk_Font), /* The font we are drawing with */
	1272	TCL_UNUSED(const Tk_FontMetrics ),/ The metrics we are drawing with */
1276	1273	int x, int y,
1277	1274	int width, int height)
1278	1275	{

1280	1277	int segmentWidth, maxX;
1281	1278	Tk_3DBorder border;
1282	1279
1283		if (menuPtr->menuType != MASTER_MENU) {
	1280	if (menuPtr->menuType != MAIN_MENU) {
1284	1281	return;
1285	1282	}
1286	1283

1323	1320
1324	1321	void
1325	1322	TkpInitializeMenuBindings(
1326		Tcl_Interp interp, / The interpreter to set. */
1327		Tk_BindingTable bindingTable)
	1323	TCL_UNUSED(Tcl_Interp ), / The interpreter to set. */
	1324	TCL_UNUSED(Tk_BindingTable))
1328	1325	/* The table to add to. */
1329	1326	{
1330	1327	/*

1375	1372	&& (cascadeEntryPtr->menuPtr->masterMenuPtr->tkwin != NULL)
1376	1373	&& (menuPtr->masterMenuPtr->tkwin != NULL)) {
1377	1374	TkMenu *masterMenuPtr = cascadeEntryPtr->menuPtr->masterMenuPtr;
1378		char *helpMenuName = ckalloc(strlen(Tk_PathName(
	1375	char helpMenuName = (char )ckalloc(strlen(Tk_PathName(
1379	1376	masterMenuPtr->tkwin)) + strlen(".help") + 1);
1380	1377
1381	1378	strcpy(helpMenuName, Tk_PathName(masterMenuPtr->tkwin));

1851	1848
1852	1849	void
1853	1850	TkpMenuNotifyToplevelCreate(
1854		Tcl_Interp interp, / The interp the menu lives in. */
1855		const char menuName) / The name of the menu to reconfigure. */
	1851	TCL_UNUSED(Tcl_Interp ), / The interp the menu lives in. */
	1852	TCL_UNUSED(const char )) / The name of the menu to reconfigure. */
1856	1853	{
1857	1854	/*
1858	1855	* Nothing to do.

+5

-7

unix/tkUnixMenubu.c less more

24	24	* Returns a newly allocated TkMenuButton structure.
25	25	*
26	26	* Side effects:
27		* Registers an event handler for the widget.
	27	* None
28	28	*
29	29	*----------------------------------------------------------------------
30	30	*/
31	31
32	32	TkMenuButton *
33	33	TkpCreateMenuButton(
34		Tk_Window tkwin)
	34	TCL_UNUSED(Tk_Window))
35	35	{
36		return ckalloc(sizeof(TkMenuButton));
	36	return (TkMenuButton *)ckalloc(sizeof(TkMenuButton));
37	37	}
38	38
39	39	/*

57	57	TkpDisplayMenuButton(
58	58	ClientData clientData) /* Information about widget. */
59	59	{
60		register TkMenuButton mbPtr = (TkMenuButton ) clientData;
	60	TkMenuButton mbPtr = (TkMenuButton )clientData;
61	61	GC gc;
62	62	Tk_3DBorder border;
63	63	Pixmap pixmap;
64	64	int x = 0; /* Initialization needed only to stop compiler
65	65	* warning. */
66	66	int y = 0;
67		register Tk_Window tkwin = mbPtr->tkwin;
	67	Tk_Window tkwin = mbPtr->tkwin;
68	68	int fullWidth, fullHeight;
69	69	int textXOffset, textYOffset;
70	70	int imageWidth, imageHeight;

279	279	mbPtr->borderWidth, mbPtr->relief);
280	280	}
281	281	if (mbPtr->highlightWidth != 0) {
282		GC gc;
283
284	282	if (mbPtr->flags & GOT_FOCUS) {
285	283	gc = Tk_GCForColor(mbPtr->highlightColorPtr, pixmap);
286	284	} else {

+14

-7

unix/tkUnixPort.h less more

17	17	#define __UNIX__ 1
18	18
19	19	#include <stdio.h>
	20	#include <pwd.h>
	21	#include <assert.h>
	22	#include <errno.h>
	23	#include <fcntl.h>
20	24	#include <ctype.h>
21		#include <fcntl.h>
	25	#include <math.h>
	26	#include <string.h>
22	27	#include <limits.h>
23		#include <math.h>
24		#include <pwd.h>
25	28	#ifdef NO_STDLIB_H
26	29	# include "../compat/stdlib.h"
27	30	#else
28	31	# include <stdlib.h>
29	32	#endif
30		#include <assert.h>
31		#include <string.h>
32	33	#include <sys/types.h>
33	34	#include <sys/file.h>
34	35	#ifdef HAVE_SYS_SELECT_H

43	44	# include <time.h>
44	45	#else
45	46	# if HAVE_SYS_TIME_H
46		# include <sys/time.h>
	47	# include <sys/time.h>
47	48	# else
48		# include <time.h>
	49	# include <time.h>
49	50	# endif
50	51	#endif
51	52	#if HAVE_INTTYPES_H

189	190	sprintf((buf), "%#08lx", (unsigned long) (w))
190	191	#endif
191	192
	193	/*
	194	* Used by tkWindow.c
	195	*/
	196
	197	#define TkpHandleMapOrUnmap(tkwin, event) Tk_HandleEvent(event)
	198
192	199	#endif /* _UNIXPORT */

+158

-21

unix/tkUnixRFont.c less more

11	11	#include "tkUnixInt.h"
12	12	#include "tkFont.h"
13	13	#include <X11/Xft/Xft.h>
14		#include <ctype.h>
15	14
16	15	#define MAX_CACHED_COLORS 16
17	16

60	59	* the TIP 59 configuration database.
61	60	*/
62	61
63		#ifndef TCL_CFGVAL_ENCODING
64		#define TCL_CFGVAL_ENCODING "ascii"
65		#endif
	62	static int utf8ToUcs4(const char source, FcChar32 c, int numBytes)
	63	{
	64	if (numBytes >= 6) {
	65	return TkUtfToUniChar(source, (int *)c);
	66	}
	67	return FcUtf8ToUcs4((const FcChar8 *)source, c, numBytes);
	68	}
66	69
67	70	void
68	71	TkpFontPkgInit(

73	76	{ 0,0 }
74	77	};
75	78
76		Tcl_RegisterConfig(mainPtr->interp, "tk", cfg, TCL_CFGVAL_ENCODING);
	79	Tcl_RegisterConfig(mainPtr->interp, "tk", cfg, "utf-8");
77	80	}
78	81
79	82	static XftFont *

246	249	*---------------------------------------------------------------------------
247	250	*/
248	251
	252	static void
	253	FinishedWithFont(
	254	UnixFtFont *fontPtr);
	255
	256	static int
	257	InitFontErrorProc(
	258	ClientData clientData,
	259	TCL_UNUSED(XErrorEvent *))
	260	{
	261	int errorFlagPtr = (int )clientData;
	262
	263	if (errorFlagPtr != NULL) {
	264	*errorFlagPtr = 1;
	265	}
	266	return 0;
	267	}
	268
249	269	static UnixFtFont *
250	270	InitFont(
251	271	Tk_Window tkwin,

256	276	FcCharSet *charset;
257	277	FcResult result;
258	278	XftFont *ftFont;
259		int i, iWidth;
	279	int i, iWidth, errorFlag;
	280	Tk_ErrorHandler handler;
260	281
261	282	if (!fontPtr) {
262		fontPtr = ckalloc(sizeof(UnixFtFont));
	283	fontPtr = (UnixFtFont *)ckalloc(sizeof(UnixFtFont));
263	284	}
264	285
265	286	FcConfigSubstitute(0, pattern, FcMatchPattern);

270	291	*/
271	292
272	293	set = FcFontSort(0, pattern, FcTrue, NULL, &result);
273		if (!set) {
	294	if (!set \|\| set->nfont == 0) {
274	295	ckfree(fontPtr);
275	296	return NULL;
276	297	}
277	298
278	299	fontPtr->fontset = set;
279	300	fontPtr->pattern = pattern;
280		fontPtr->faces = ckalloc(set->nfont * sizeof(UnixFtFace));
	301	fontPtr->faces = (UnixFtFace )ckalloc(set->nfont sizeof(UnixFtFace));
281	302	fontPtr->nfaces = set->nfont;
282	303
283	304	/*

307	328	* Fill in platform-specific fields of TkFont.
308	329	*/
309	330
	331	errorFlag = 0;
	332	handler = Tk_CreateErrorHandler(Tk_Display(tkwin),
	333	-1, -1, -1, InitFontErrorProc, (ClientData) &errorFlag);
310	334	ftFont = GetFont(fontPtr, 0, 0.0);
	335	if ((ftFont == NULL) \|\| errorFlag) {
	336	Tk_DeleteErrorHandler(handler);
	337	FinishedWithFont(fontPtr);
	338	ckfree(fontPtr);
	339	return NULL;
	340	}
311	341	fontPtr->font.fid = XLoadFont(Tk_Display(tkwin), "fixed");
312	342	GetTkFontAttributes(ftFont, &fontPtr->font.fa);
313	343	GetTkFontMetrics(ftFont, &fontPtr->font.fm);
	344	Tk_DeleteErrorHandler(handler);
	345	if (errorFlag) {
	346	FinishedWithFont(fontPtr);
	347	ckfree(fontPtr);
	348	return NULL;
	349	}
314	350
315	351	/*
316	352	* Fontconfig can't report any information about the position or thickness

335	371	TkFont *fPtr = &fontPtr->font;
336	372
337	373	fPtr->underlinePos = fPtr->fm.descent / 2;
	374	handler = Tk_CreateErrorHandler(Tk_Display(tkwin),
	375	-1, -1, -1, InitFontErrorProc, (ClientData) &errorFlag);
	376	errorFlag = 0;
338	377	Tk_MeasureChars((Tk_Font) fPtr, "I", 1, -1, 0, &iWidth);
	378	Tk_DeleteErrorHandler(handler);
	379	if (errorFlag) {
	380	FinishedWithFont(fontPtr);
	381	ckfree(fontPtr);
	382	return NULL;
	383	}
339	384	fPtr->underlineHeight = iWidth / 3;
340	385	if (fPtr->underlineHeight == 0) {
341	386	fPtr->underlineHeight = 1;

615	660
616	661	void
617	662	TkpGetFontAttrsForChar(
618		Tk_Window tkwin, /* Window on the font's display */
	663	TCL_UNUSED(Tk_Window), /* Window on the font's display */
619	664	Tk_Font tkfont, /* Font to query */
620	665	int c, /* Character of interest */
621	666	TkFontAttributes faPtr) / Output: Font attributes */

660	705	FcChar32 c;
661	706	XGlyphInfo extents;
662	707	int clen, curX, newX, curByte, newByte, sawNonSpace;
663		int termByte = 0, termX = 0;
	708	int termByte = 0, termX = 0, errorFlag = 0;
	709	Tk_ErrorHandler handler;
664	710	#if DEBUG_FONTSEL
665	711	char string[256];
666	712	int len = 0;
667	713	#endif /* DEBUG_FONTSEL */
668	714
	715	handler = Tk_CreateErrorHandler(fontPtr->display,
	716	-1, -1, -1, InitFontErrorProc, &errorFlag);
669	717	curX = 0;
670	718	curByte = 0;
671	719	sawNonSpace = 0;

701	749	#endif /* DEBUG_FONTSEL */
702	750	ftFont = GetFont(fontPtr, c, 0.0);
703	751
704		XftTextExtents32(fontPtr->display, ftFont, &c, 1, &extents);
	752	if (!errorFlag) {
	753	XftTextExtents32(fontPtr->display, ftFont, &c, 1, &extents);
	754	} else {
	755	extents.xOff = 0;
	756	errorFlag = 0;
	757	}
705	758
706	759	newX = curX + extents.xOff;
707	760	newByte = curByte + clen;

730	783	curX = newX;
731	784	curByte = newByte;
732	785	}
	786	Tk_DeleteErrorHandler(handler);
733	787	#if DEBUG_FONTSEL
734	788	string[len] = '\0';
735	789	printf("MeasureChars %s length %d bytes %d\n", string, curX, curByte);

823	877	fontPtr->colors[last].color.color.red = xcolor.red;
824	878	fontPtr->colors[last].color.color.green = xcolor.green;
825	879	fontPtr->colors[last].color.color.blue = xcolor.blue;
826		fontPtr->colors[last].color.color.alpha = 0xffff;
	880	fontPtr->colors[last].color.color.alpha = 0xFFFF;
827	881	fontPtr->colors[last].color.pixel = pixel;
828	882
829	883	/*

885	939	}
886	940	XGetGCValues(display, gc, GCForeground, &values);
887	941	xftcolor = LookUpColor(display, fontPtr, values.foreground);
888		if (tsdPtr->clipRegion != None) {
	942	if (tsdPtr->clipRegion != NULL) {
889	943	XftDrawSetClip(fontPtr->ftDraw, tsdPtr->clipRegion);
890	944	}
891	945	nspec = 0;

893	947	XftFont *ftFont;
894	948	FcChar32 c;
895	949
896		clen = FcUtf8ToUcs4((FcChar8 *) source, &c, numBytes);
	950	clen = utf8ToUcs4(source, &c, numBytes);
897	951	if (clen <= 0) {
898	952	/*
899	953	* This should not happen, but it can.

935	989	}
936	990
937	991	doUnderlineStrikeout:
938		if (tsdPtr->clipRegion != None) {
	992	if (tsdPtr->clipRegion != NULL) {
939	993	XftDrawSetClip(fontPtr->ftDraw, NULL);
940	994	}
941	995	if (fontPtr->font.fa.underline != 0) {

1027	1081
1028	1082	nglyph = 0;
1029	1083	currentFtFont = NULL;
1030		originX = originY = 0; /* lint */
	1084	originX = originY = 0;
1031	1085
1032	1086	while (numBytes > 0) {
1033	1087	XftFont *ftFont;
1034	1088	FcChar32 c;
1035	1089
1036		clen = FcUtf8ToUcs4((FcChar8 *) source, &c, numBytes);
	1090	clen = utf8ToUcs4(source, &c, numBytes);
1037	1091	if (clen <= 0) {
1038	1092	/*
1039	1093	* This should not happen, but it can.

1129	1183	}
1130	1184	XGetGCValues(display, gc, GCForeground, &values);
1131	1185	xftcolor = LookUpColor(display, fontPtr, values.foreground);
1132		if (tsdPtr->clipRegion != None) {
	1186	if (tsdPtr->clipRegion != NULL) {
1133	1187	XftDrawSetClip(fontPtr->ftDraw, tsdPtr->clipRegion);
1134	1188	}
1135	1189	nspec = 0;

1137	1191	XftFont ftFont, ft0Font;
1138	1192	FcChar32 c;
1139	1193
1140		clen = FcUtf8ToUcs4((FcChar8 *) source, &c, numBytes);
	1194	clen = utf8ToUcs4(source, &c, numBytes);
1141	1195	if (clen <= 0) {
1142	1196	/*
1143	1197	* This should not happen, but it can.

1181	1235	#endif /* XFT_HAS_FIXED_ROTATED_PLACEMENT */
1182	1236
1183	1237	doUnderlineStrikeout:
1184		if (tsdPtr->clipRegion != None) {
	1238	if (tsdPtr->clipRegion != NULL) {
1185	1239	XftDrawSetClip(fontPtr->ftDraw, NULL);
1186	1240	}
1187	1241	if (fontPtr->font.fa.underline \|\| fontPtr->font.fa.overstrike) {

1240	1294	}
1241	1295	}
1242	1296
	1297	/*
	1298	*---------------------------------------------------------------------------
	1299	*
	1300	* TkpDrawCharsInContext --
	1301	*
	1302	* Draw a string of characters on the screen like Tk_DrawChars(), but
	1303	* with access to all the characters on the line for context. On X11 this
	1304	* context isn't consulted, so we just call Tk_DrawChars().
	1305	*
	1306	* Note: TK_DRAW_IN_CONTEXT being currently defined only on macOS, this
	1307	* function is unused (and possibly unfinished). See [7655f65ae7].
	1308	*
	1309	* Results:
	1310	* None.
	1311	*
	1312	* Side effects:
	1313	* Information gets drawn on the screen.
	1314	*
	1315	*---------------------------------------------------------------------------
	1316	*/
	1317
	1318	void
	1319	TkpDrawCharsInContext(
	1320	Display display, / Display on which to draw. */
	1321	Drawable drawable, /* Window or pixmap in which to draw. */
	1322	GC gc, /* Graphics context for drawing characters. */
	1323	Tk_Font tkfont, /* Font in which characters will be drawn;
	1324	* must be the same as font used in GC. */
	1325	const char source, / UTF-8 string to be displayed. Need not be
	1326	* '\0' terminated. All Tk meta-characters
	1327	* (tabs, control characters, and newlines)
	1328	* should be stripped out of the string that
	1329	* is passed to this function. If they are not
	1330	* stripped out, they will be displayed as
	1331	* regular printing characters. */
	1332	int numBytes, /* Number of bytes in string. */
	1333	int rangeStart, /* Index of first byte to draw. */
	1334	int rangeLength, /* Length of range to draw in bytes. */
	1335	int x, int y) /* Coordinates at which to place origin of the
	1336	* whole (not just the range) string when
	1337	* drawing. */
	1338	{
	1339	int widthUntilStart;
	1340
	1341	(void) numBytes; /unused/
	1342
	1343	Tk_MeasureChars(tkfont, source, rangeStart, -1, 0, &widthUntilStart);
	1344	Tk_DrawChars(display, drawable, gc, tkfont, source + rangeStart,
	1345	rangeLength, x+widthUntilStart, y);
	1346	}
	1347
	1348	void
	1349	TkpDrawAngledCharsInContext(
	1350	Display display, / Display on which to draw. */
	1351	Drawable drawable, /* Window or pixmap in which to draw. */
	1352	GC gc, /* Graphics context for drawing characters. */
	1353	Tk_Font tkfont, /* Font in which characters will be drawn; must
	1354	* be the same as font used in GC. */
	1355	const char * source, /* UTF-8 string to be displayed. Need not be
	1356	* '\0' terminated. All Tk meta-characters
	1357	* (tabs, control characters, and newlines)
	1358	* should be stripped out of the string that is
	1359	* passed to this function. If they are not
	1360	* stripped out, they will be displayed as
	1361	* regular printing characters. */
	1362	int numBytes, /* Number of bytes in string. */
	1363	int rangeStart, /* Index of first byte to draw. */
	1364	int rangeLength, /* Length of range to draw in bytes. */
	1365	double x, double y, /* Coordinates at which to place origin of the
	1366	* whole (not just the range) string when
	1367	* drawing. */
	1368	double angle) /* What angle to put text at, in degrees. */
	1369	{
	1370	int widthUntilStart;
	1371	double sinA = sin(angle * PI/180.0), cosA = cos(angle * PI/180.0);
	1372
	1373	(void) numBytes; /unused/
	1374
	1375	Tk_MeasureChars(tkfont, source, rangeStart, -1, 0, &widthUntilStart);
	1376	TkDrawAngledChars(display, drawable, gc, tkfont, source + rangeStart,
	1377	rangeLength, x+cosAwidthUntilStart, y-sinAwidthUntilStart, angle);
	1378	}
	1379
1243	1380	void
1244	1381	TkUnixSetXftClipRegion(
1245	1382	TkRegion clipRegion) /* The clipping region to install. */

+9

-9

unix/tkUnixScale.c less more

49	49
50	50	TkScale *
51	51	TkpCreateScale(
52		Tk_Window tkwin)
	52	TCL_UNUSED(Tk_Window))
53	53	{
54		return ckalloc(sizeof(TkScale));
	54	return (TkScale *)ckalloc(sizeof(TkScale));
55	55	}
56	56
57	57	/*

255	255
256	256	static void
257	257	DisplayVerticalValue(
258		register TkScale scalePtr, / Information about widget in which to
	258	TkScale scalePtr, / Information about widget in which to
259	259	* display value. */
260	260	Drawable drawable, /* Pixmap or window in which to draw the
261	261	* value. */

266	266	* specified in pixels. */
267	267	const char format) / Format string to use for the value */
268	268	{
269		register Tk_Window tkwin = scalePtr->tkwin;
	269	Tk_Window tkwin = scalePtr->tkwin;
270	270	int y, width, length;
271	271	char valueString[TCL_DOUBLE_SPACE];
272	272	Tk_FontMetrics fm;

324	324	* to reflect the part of the window that was
325	325	* redrawn. */
326	326	{
327		register Tk_Window tkwin = scalePtr->tkwin;
	327	Tk_Window tkwin = scalePtr->tkwin;
328	328	int x, y, width, height, shadowWidth;
329	329	double tickInterval = scalePtr->tickInterval;
330	330	Tk_3DBorder sliderBorder;

478	478
479	479	static void
480	480	DisplayHorizontalValue(
481		register TkScale scalePtr, / Information about widget in which to
	481	TkScale scalePtr, / Information about widget in which to
482	482	* display value. */
483	483	Drawable drawable, /* Pixmap or window in which to draw the
484	484	* value. */

489	489	* in pixels. */
490	490	const char format) / Format string to use for the value */
491	491	{
492		register Tk_Window tkwin = scalePtr->tkwin;
	492	Tk_Window tkwin = scalePtr->tkwin;
493	493	int x, y, length, width;
494	494	char valueString[TCL_DOUBLE_SPACE];
495	495	Tk_FontMetrics fm;

545	545	TkpDisplayScale(
546	546	ClientData clientData) /* Widget record for scale. */
547	547	{
548		TkScale scalePtr = (TkScale ) clientData;
	548	TkScale scalePtr = (TkScale )clientData;
549	549	Tk_Window tkwin = scalePtr->tkwin;
550	550	Tcl_Interp *interp = scalePtr->interp;
551	551	Pixmap pixmap;

574	574	Tcl_DStringAppend(&buf, scalePtr->command, -1);
575	575	Tcl_DStringAppend(&buf, " ", -1);
576	576	Tcl_DStringAppend(&buf, string, -1);
577		result = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), -1, 0);
	577	result = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), -1, TCL_EVAL_GLOBAL);
578	578	Tcl_DStringFree(&buf);
579	579	if (result != TCL_OK) {
580	580	Tcl_AddErrorInfo(interp, "\n (command executed by scale)");

+10

-10

unix/tkUnixScrlbr.c less more

62	62	TkpCreateScrollbar(
63	63	Tk_Window tkwin)
64	64	{
65		UnixScrollbar *scrollPtr = ckalloc(sizeof(UnixScrollbar));
	65	UnixScrollbar scrollPtr = (UnixScrollbar )ckalloc(sizeof(UnixScrollbar));
66	66
67	67	scrollPtr->troughGC = NULL;
68	68	scrollPtr->copyGC = NULL;

96	96	TkpDisplayScrollbar(
97	97	ClientData clientData) /* Information about window. */
98	98	{
99		register TkScrollbar scrollPtr = (TkScrollbar ) clientData;
100		register Tk_Window tkwin = scrollPtr->tkwin;
	99	TkScrollbar scrollPtr = (TkScrollbar )clientData;
	100	Tk_Window tkwin = scrollPtr->tkwin;
101	101	XPoint points[7];
102	102	Tk_3DBorder border;
103	103	int relief, width, elementBorderWidth;

276	276
277	277	extern void
278	278	TkpComputeScrollbarGeometry(
279		register TkScrollbar *scrollPtr)
	279	TkScrollbar *scrollPtr)
280	280	/* Scrollbar whose geometry may have
281	281	* changed. */
282	282	{

393	393
394	394	void
395	395	TkpConfigureScrollbar(
396		register TkScrollbar *scrollPtr)
	396	TkScrollbar *scrollPtr)
397	397	/* Information about widget; may or may not
398	398	* already have values for some fields. */
399	399	{
400	400	XGCValues gcValues;
401		GC new;
	401	GC newGC;
402	402	UnixScrollbar unixScrollPtr = (UnixScrollbar ) scrollPtr;
403	403
404	404	Tk_SetBackgroundFromBorder(scrollPtr->tkwin, scrollPtr->bgBorder);
405	405
406	406	gcValues.foreground = scrollPtr->troughColorPtr->pixel;
407		new = Tk_GetGC(scrollPtr->tkwin, GCForeground, &gcValues);
	407	newGC = Tk_GetGC(scrollPtr->tkwin, GCForeground, &gcValues);
408	408	if (unixScrollPtr->troughGC != NULL) {
409	409	Tk_FreeGC(scrollPtr->display, unixScrollPtr->troughGC);
410	410	}
411		unixScrollPtr->troughGC = new;
	411	unixScrollPtr->troughGC = newGC;
412	412	if (unixScrollPtr->copyGC == NULL) {
413	413	gcValues.graphics_exposures = False;
414	414	unixScrollPtr->copyGC = Tk_GetGC(scrollPtr->tkwin,

436	436
437	437	int
438	438	TkpScrollbarPosition(
439		register TkScrollbar *scrollPtr,
	439	TkScrollbar *scrollPtr,
440	440	/* Scrollbar widget record. */
441	441	int x, int y) /* Coordinates within scrollPtr's window. */
442	442	{
443	443	int length, width, tmp;
444		register const int inset = scrollPtr->inset;
	444	const int inset = scrollPtr->inset;
445	445
446	446	if (scrollPtr->vertical) {
447	447	length = Tk_Height(scrollPtr->tkwin);

+29

-29

unix/tkUnixSelect.c less more

239	239
240	240	void
241	241	TkSelPropProc(
242		register XEvent eventPtr) / X PropertyChange event. */
	242	XEvent eventPtr) / X PropertyChange event. */
243	243	{
244		register IncrInfo *incrPtr;
245		register TkSelHandler *selPtr;
	244	IncrInfo *incrPtr;
	245	TkSelHandler *selPtr;
246	246	int length, numItems;
247	247	unsigned long i;
248	248	Atom target, formatType;
249	249	long buffer[TK_SEL_WORDS_AT_ONCE];
250	250	TkDisplay *dispPtr = TkGetDisplay(eventPtr->xany.display);
251	251	Tk_ErrorHandler errorHandler;
252		ThreadSpecificData *tsdPtr =
	252	ThreadSpecificData tsdPtr = (ThreadSpecificData )
253	253	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
254	254
255	255	/*

355	355	((char *) buffer)[numItems] = 0;
356	356
357	357	errorHandler = Tk_CreateErrorHandler(eventPtr->xproperty.display,
358		-1, -1, -1, (int (*)()) NULL, NULL);
	358	-1, -1, -1, NULL, NULL);
359	359
360	360	/*
361	361	* Encode the data using the proper format for each type.

448	448	if (srcLen > 3) {
449	449	Tcl_Panic("selection conversion left too many bytes unconverted");
450	450	}
451		memcpy(incrPtr->converts[i].buffer, src, (size_t) srcLen+1);
	451	memcpy(incrPtr->converts[i].buffer, src, srcLen + 1);
452	452	Tcl_DStringFree(&ds);
453	453	} else {
454	454	/*

518	518	void
519	519	TkSelEventProc(
520	520	Tk_Window tkwin, /* Window for which event was targeted. */
521		register XEvent eventPtr) / X event: either SelectionClear,
	521	XEvent eventPtr) / X event: either SelectionClear,
522	522	* SelectionRequest, or SelectionNotify. */
523	523	{
524		register TkWindow winPtr = (TkWindow ) tkwin;
	524	TkWindow winPtr = (TkWindow ) tkwin;
525	525	TkDisplay *dispPtr = winPtr->dispPtr;
526	526	Tcl_Interp *interp;
527	527

539	539	*/
540	540
541	541	if (eventPtr->type == SelectionNotify) {
542		register TkSelRetrievalInfo *retrPtr;
	542	TkSelRetrievalInfo *retrPtr;
543	543	char propInfo, *propInfoPtr = &propInfo;
544	544	Atom type;
545	545	int format, result;
546	546	unsigned long numItems, bytesAfter;
547		Tcl_DString ds;
548	547
549	548	for (retrPtr = pendingRetrievals; ; retrPtr = retrPtr->nextPtr) {
550	549	if (retrPtr == NULL) {

590	589	if ((type == XA_STRING) \|\| (type == dispPtr->textAtom)
591	590	\|\| (type == dispPtr->compoundTextAtom)) {
592	591	Tcl_Encoding encoding;
	592	Tcl_DString ds;
593	593
594	594	if (format != 8) {
595	595	Tcl_SetObjResult(retrPtr->interp, Tcl_ObjPrintf(

648	648	}
649	649
650	650	if (propInfo[numItems] != '\0') {
651		propData = ckalloc(numItems + 1);
	651	propData = (char *)ckalloc(numItems + 1);
652	652	strcpy(propData, propInfo);
653	653	propData[numItems] = '\0';
654	654	}

741	741	SelTimeoutProc(
742	742	ClientData clientData) /* Information about retrieval in progress. */
743	743	{
744		register TkSelRetrievalInfo *retrPtr = clientData;
	744	TkSelRetrievalInfo retrPtr = (TkSelRetrievalInfo )clientData;
745	745
746	746	/*
747	747	* Make sure that the retrieval is still in progress. Then see how long

765	765	retrPtr->result = TCL_ERROR;
766	766	} else {
767	767	retrPtr->timeout = Tcl_CreateTimerHandler(1000, SelTimeoutProc,
768		(ClientData) retrPtr);
	768	retrPtr);
769	769	}
770	770	}
771	771

795	795	* request; may not be selection's current
796	796	* owner, be we set it to the current
797	797	* owner. */
798		register XSelectionRequestEvent *eventPtr)
	798	XSelectionRequestEvent *eventPtr)
799	799	/* Event describing request. */
800	800	{
801	801	union {

812	812	Tk_ErrorHandler errorHandler;
813	813	TkSelectionInfo *infoPtr;
814	814	TkSelInProgress ip;
815		ThreadSpecificData *tsdPtr =
	815	ThreadSpecificData tsdPtr = (ThreadSpecificData )
816	816	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
817	817
818		errorHandler = Tk_CreateErrorHandler(eventPtr->display, -1, -1,-1,
819		(int (*)()) NULL, NULL);
	818	errorHandler = Tk_CreateErrorHandler(eventPtr->display, -1, -1,
	819	-1, NULL, NULL);
820	820
821	821	/*
822	822	* Initialize the reply event.

892	892	* below).
893	893	*/
894	894
895		incr.converts = ckalloc(incr.numConversions * sizeof(ConvertInfo));
	895	incr.converts = (ConvertInfo )ckalloc(incr.numConversions sizeof(ConvertInfo));
896	896	incr.numIncrs = 0;
897	897	for (i = 0; i < incr.numConversions; i++) {
898	898	Atom target, property, type;
899	899	long buffer[TK_SEL_WORDS_AT_ONCE];
900		register TkSelHandler *selPtr;
	900	TkSelHandler *selPtr;
901	901	int numItems, format;
902	902	char *propPtr;
903	903

918	918	/*
919	919	* Nobody seems to know about this kind of request. If it's of a
920	920	* sort that we can handle without any help, do it. Otherwise mark
921		* the request as an errror.
	921	* the request as an error.
922	922	*/
923	923
924	924	numItems = TkSelDefaultSelection(infoPtr, target, (char *) buffer,

1063	1063	}
1064	1064	Tcl_DeleteTimerHandler(incr.timeout);
1065	1065	errorHandler = Tk_CreateErrorHandler(winPtr->display,
1066		-1, -1, -1, (int (*)()) NULL, NULL);
	1066	-1, -1, -1, NULL, NULL);
1067	1067	XSelectInput(reply.xsel.display, reply.xsel.requestor, 0L);
1068	1068	Tk_DeleteErrorHandler(errorHandler);
1069	1069	if (tsdPtr->pendingIncrs == &incr) {

1123	1123	static void
1124	1124	SelRcvIncrProc(
1125	1125	ClientData clientData, /* Information about retrieval. */
1126		register XEvent eventPtr) / X PropertyChange event. */
	1126	XEvent eventPtr) / X PropertyChange event. */
1127	1127	{
1128		register TkSelRetrievalInfo *retrPtr = clientData;
	1128	TkSelRetrievalInfo retrPtr = (TkSelRetrievalInfo )clientData;
1129	1129	char propInfo, *propInfoPtr = &propInfo;
1130	1130	Atom type;
1131	1131	int format, result;

1373	1373	* retrieval for which we are selection
1374	1374	* owner. */
1375	1375	{
1376		register IncrInfo *incrPtr = clientData;
	1376	IncrInfo incrPtr = (IncrInfo )clientData;
1377	1377
1378	1378	incrPtr->idleTime++;
1379	1379	if (incrPtr->idleTime >= 5) {

1434	1434	if (Tcl_SplitList(NULL, string, &numFields, &field) != TCL_OK) {
1435	1435	return NULL;
1436	1436	}
1437		propPtr = ckalloc(numFields * sizeof(long));
	1437	propPtr = (long )ckalloc(numFields sizeof(long));
1438	1438
1439	1439	/*
1440	1440	* Convert the fields one-by-one.

1486	1486
1487	1487	static void
1488	1488	SelCvtFromX32(
1489		register long propPtr, / Property value from X. */
	1489	long propPtr, / Property value from X. */
1490	1490	int numValues, /* Number of 32-bit values in property. */
1491	1491	Atom type, /* Type of property Should not be XA_STRING
1492	1492	* (if so, don't bother calling this function

1519	1519
1520	1520	static void
1521	1521	SelCvtFromX8(
1522		register char propPtr, / Property value from X. */
	1522	char propPtr, / Property value from X. */
1523	1523	int numValues, /* Number of 8-bit values in property. */
1524		Atom type, /* Type of property Should not be XA_STRING
	1524	TCL_UNUSED(Atom), /* Type of property Should not be XA_STRING
1525	1525	* (if so, don't bother calling this function
1526	1526	* at all). */
1527		Tk_Window tkwin, /* Window to use for atom conversion. */
	1527	TCL_UNUSED(Tk_Window), /* Window to use for atom conversion. */
1528	1528	Tcl_DString dsPtr) / Where to store the converted string. */
1529	1529	{
1530	1530	/*

+27

-30

unix/tkUnixSend.c less more

268	268
269	269	handler = Tk_CreateErrorHandler(dispPtr->display, -1, -1, -1, NULL, NULL);
270	270
271		regPtr = ckalloc(sizeof(NameRegistry));
	271	regPtr = (NameRegistry *)ckalloc(sizeof(NameRegistry));
272	272	regPtr->dispPtr = dispPtr;
273	273	regPtr->locked = 0;
274	274	regPtr->modified = 0;

478	478	sprintf(id, "%x ", (unsigned) commWindow);
479	479	idLength = strlen(id);
480	480	newBytes = idLength + strlen(name) + 1;
481		newProp = ckalloc(regPtr->propLength + newBytes);
	481	newProp = (char *)ckalloc(regPtr->propLength + newBytes);
482	482	strcpy(newProp, id);
483	483	strcpy(newProp+idLength, name);
484	484	if (regPtr->property != NULL) {

807	807	const char *actualName;
808	808	Tcl_DString dString;
809	809	int offset, i;
810		ThreadSpecificData *tsdPtr =
	810	ThreadSpecificData tsdPtr = (ThreadSpecificData )
811	811	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
812	812
813	813	interp = winPtr->mainPtr->interp;

829	829	* the "send" command to the interpreter.
830	830	*/
831	831
832		riPtr = ckalloc(sizeof(RegisteredInterp));
	832	riPtr = (RegisteredInterp *)ckalloc(sizeof(RegisteredInterp));
833	833	riPtr->interp = interp;
834	834	riPtr->dispPtr = winPtr->dispPtr;
835	835	riPtr->nextPtr = tsdPtr->interpListPtr;

913	913
914	914	RegAddName(regPtr, actualName, Tk_WindowId(dispPtr->commTkwin));
915	915	RegClose(regPtr);
916		riPtr->name = ckalloc(strlen(actualName) + 1);
	916	riPtr->name = (char *)ckalloc(strlen(actualName) + 1);
917	917	strcpy(riPtr->name, actualName);
918	918	if (actualName != name) {
919	919	Tcl_DStringFree(&dString);

942	942
943	943	int
944	944	Tk_SendObjCmd(
945		ClientData clientData, /* Information about sender (only dispPtr
	945	TCL_UNUSED(void ), / Information about sender (only dispPtr
946	946	* field is used). */
947	947	Tcl_Interp interp, / Current interpreter. */
948	948	int objc, /* Number of arguments. */

957	957	TkWindow *winPtr;
958	958	Window commWindow;
959	959	PendingCommand pending;
960		register RegisteredInterp *riPtr;
	960	RegisteredInterp *riPtr;
961	961	const char *destName;
962	962	int result, index, async, i, firstArg;
963	963	Tk_RestrictProc *prevProc;

966	966	Tcl_Time timeout;
967	967	NameRegistry *regPtr;
968	968	Tcl_DString request;
969		ThreadSpecificData *tsdPtr =
	969	ThreadSpecificData tsdPtr = (ThreadSpecificData )
970	970	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
971	971	Tcl_Interp localInterp; / Used when the interpreter to send the
972	972	* command to is within the same process. */

1174	1174	msg = "target application died";
1175	1175	}
1176	1176	pending.code = TCL_ERROR;
1177		pending.result = ckalloc(strlen(msg) + 1);
	1177	pending.result = (char *)ckalloc(strlen(msg) + 1);
1178	1178	strcpy(pending.result, msg);
1179	1179	pending.gotResponse = 1;
1180	1180	} else {

1355	1355
1356	1356	static int
1357	1357	SendInit(
1358		Tcl_Interp interp, / Interpreter to use for error reporting (no
	1358	TCL_UNUSED(Tcl_Interp ), / Interpreter to use for error reporting (no
1359	1359	* errors are ever returned, but the
1360	1360	* interpreter is needed anyway). */
1361	1361	TkDisplay dispPtr) / Display to initialize. */

1418	1418	ClientData clientData, /* Display information. */
1419	1419	XEvent eventPtr) / Information about event. */
1420	1420	{
1421		TkDisplay *dispPtr = clientData;
	1421	TkDisplay dispPtr = (TkDisplay )clientData;
1422	1422	char propInfo, *propInfoPtr = &propInfo;
1423	1423	const char *p;
1424	1424	int result, actualFormat;
1425	1425	unsigned long numItems, bytesAfter;
1426	1426	Atom actualType;
1427	1427	Tcl_Interp remoteInterp; / Interp in which to execute the command. */
1428		ThreadSpecificData *tsdPtr =
	1428	ThreadSpecificData tsdPtr = (ThreadSpecificData )
1429	1429	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
1430	1430
1431	1431	if ((eventPtr->xproperty.atom != dispPtr->commProperty)

1697	1697	}
1698	1698	pcPtr->code = code;
1699	1699	if (resultString != NULL) {
1700		pcPtr->result = ckalloc(strlen(resultString) + 1);
	1700	pcPtr->result = (char *)ckalloc(strlen(resultString) + 1);
1701	1701	strcpy(pcPtr->result, resultString);
1702	1702	}
1703	1703	if (code == TCL_ERROR) {
1704	1704	if (errorInfo != NULL) {
1705		pcPtr->errorInfo = ckalloc(strlen(errorInfo) + 1);
	1705	pcPtr->errorInfo = (char *)ckalloc(strlen(errorInfo) + 1);
1706	1706	strcpy(pcPtr->errorInfo, errorInfo);
1707	1707	}
1708	1708	if (errorCode != NULL) {
1709		pcPtr->errorCode = ckalloc(strlen(errorCode) + 1);
	1709	pcPtr->errorCode = (char *)ckalloc(strlen(errorCode) + 1);
1710	1710	strcpy(pcPtr->errorCode, errorCode);
1711	1711	}
1712	1712	}

1773	1773	* operation above.
1774	1774	*/
1775	1775
1776		/* ARGSUSED */
1777	1776	static int
1778	1777	AppendErrorProc(
1779	1778	ClientData clientData, /* Command to mark complete, or NULL. */
1780		XErrorEvent errorPtr) / Information about error. */
	1779	TCL_UNUSED(XErrorEvent )) / Information about error. */
1781	1780	{
1782		PendingCommand *pendingPtr = clientData;
1783		register PendingCommand *pcPtr;
1784		ThreadSpecificData *tsdPtr =
	1781	PendingCommand pendingPtr = (PendingCommand )clientData;
	1782	PendingCommand *pcPtr;
	1783	ThreadSpecificData tsdPtr = (ThreadSpecificData )
1785	1784	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
1786	1785
1787	1786	if (pendingPtr == NULL) {

1795	1794	for (pcPtr = tsdPtr->pendingCommands; pcPtr != NULL;
1796	1795	pcPtr = pcPtr->nextPtr) {
1797	1796	if ((pcPtr == pendingPtr) && (pcPtr->result == NULL)) {
1798		pcPtr->result = ckalloc(strlen(pcPtr->target) + 50);
	1797	pcPtr->result = (char *)ckalloc(strlen(pcPtr->target) + 50);
1799	1798	sprintf(pcPtr->result, "no application named \"%s\"",
1800	1799	pcPtr->target);
1801	1800	pcPtr->code = TCL_ERROR;

1828	1827	ClientData clientData) /* Info about registration, passed as
1829	1828	* ClientData. */
1830	1829	{
1831		RegisteredInterp *riPtr = clientData;
1832		register RegisteredInterp *riPtr2;
	1830	RegisteredInterp riPtr = (RegisteredInterp )clientData;
	1831	RegisteredInterp *riPtr2;
1833	1832	NameRegistry *regPtr;
1834		ThreadSpecificData *tsdPtr =
	1833	ThreadSpecificData tsdPtr = (ThreadSpecificData )
1835	1834	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
1836	1835
1837	1836	regPtr = RegOpen(riPtr->interp, riPtr->dispPtr, 1);

1873	1872	*----------------------------------------------------------------------
1874	1873	*/
1875	1874
1876		/* ARGSUSED */
1877	1875	static Tk_RestrictAction
1878	1876	SendRestrictProc(
1879		ClientData clientData, /* Not used. */
1880		register XEvent eventPtr) / Event that just arrived. */
	1877	TCL_UNUSED(void ), / Not used. */
	1878	XEvent eventPtr) / Event that just arrived. */
1881	1879	{
1882	1880	TkDisplay *dispPtr;
1883	1881

1920	1918	{
1921	1919	Tcl_DString names;
1922	1920	RegisteredInterp *riPtr;
1923		ThreadSpecificData *tsdPtr =
	1921	ThreadSpecificData tsdPtr = (ThreadSpecificData )
1924	1922	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
1925	1923
1926	1924	Tcl_DStringInit(&names);

1953	1951	*----------------------------------------------------------------------
1954	1952	*/
1955	1953
1956		/* ARGSUSED */
1957	1954	int
1958	1955	TkpTestsendCmd(
1959	1956	ClientData clientData, /* Main window for application. */

1967	1964	static const char *const testsendOptions[] = {
1968	1965	"bogus", "prop", "serial", NULL
1969	1966	};
1970		TkWindow *winPtr = clientData;
	1967	TkWindow winPtr = (TkWindow )clientData;
1971	1968	Tk_ErrorHandler handler;
1972	1969	int index;
1973	1970

+171

-174

unix/tkUnixWm.c less more

26	26	/* Next in list of protocol handlers for the
27	27	* same top-level window, or NULL for end of
28	28	* list. */
29		Tcl_Interp interp; / Interpreter in which to invoke command. */
30		char command[1]; /* Tcl command to invoke when a client message
	29	Tcl_Interp interp; / Interpreter in which to invoke command. */
	30	char command[TKFLEXARRAY]; /* Tcl command to invoke when a client message
31	31	* for this protocol arrives. The actual size
32	32	* of the structure varies to accommodate the
33	33	* needs of the actual command. THIS MUST BE

35	35	} ProtocolHandler;
36	36
37	37	#define HANDLER_SIZE(cmdLength) \
38		((unsigned) ((Tk_Offset(ProtocolHandler, command) + 1) + cmdLength))
	38	((unsigned)((Tk_Offset(ProtocolHandler, command) + 1) + cmdLength))
39	39
40	40	/*
41	41	* Data for [wm attributes] command:

81	81	* (corresponds to hints.window_group).
82	82	* Malloc-ed. Note: this field doesn't get
83	83	* updated if leader is destroyed. */
84		TkWindow masterPtr; / Master window for TRANSIENT_FOR property,
	84	TkWindow containerPtr; / Container window for TRANSIENT_FOR property,
85	85	* or NULL. */
86	86	Tk_Window icon; /* Window to use as icon for this window, or
87	87	* NULL. */

258	258	* window (controlled by "wm resizable" command).
259	259	* WM_WITHDRAWN - non-zero means that this window has explicitly
260	260	* been withdrawn. If it's a transient, it should
261		* not mirror state changes in the master.
	261	* not mirror state changes in the container.
262	262	*/
263	263
264	264	#define WM_NEVER_MAPPED 1

563	563	TkWmNewWindow(
564	564	TkWindow winPtr) / Newly-created top-level window. */
565	565	{
566		register WmInfo *wmPtr;
	566	WmInfo *wmPtr;
567	567	TkDisplay *dispPtr = winPtr->dispPtr;
568	568
569		wmPtr = ckalloc(sizeof(WmInfo));
	569	wmPtr = (WmInfo *)ckalloc(sizeof(WmInfo));
570	570	memset(wmPtr, 0, sizeof(WmInfo));
571	571	wmPtr->winPtr = winPtr;
572	572	wmPtr->reparent = None;
573		wmPtr->masterPtr = NULL;
	573	wmPtr->containerPtr = NULL;
574	574	wmPtr->numTransients = 0;
575	575	wmPtr->hints.flags = InputHint \| StateHint;
576	576	wmPtr->hints.input = True;

658	658	TkWindow winPtr) / Top-level window that's about to be
659	659	* mapped. */
660	660	{
661		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	661	WmInfo *wmPtr = winPtr->wmInfoPtr;
662	662	XTextProperty textProp;
663	663
664	664	if (wmPtr->flags & WM_NEVER_MAPPED) {

683	683	UpdateTitle(winPtr);
684	684	UpdatePhotoIcon(winPtr);
685	685
686		if (wmPtr->masterPtr != NULL) {
	686	if (wmPtr->containerPtr != NULL) {
687	687	/*
688		* Don't map a transient if the master is not mapped.
	688	* Don't map a transient if the container is not mapped.
689	689	*/
690	690
691		if (!Tk_IsMapped(wmPtr->masterPtr)) {
	691	if (!Tk_IsMapped(wmPtr->containerPtr)) {
692	692	wmPtr->withdrawn = 1;
693	693	wmPtr->hints.initial_state = WithdrawnState;
694	694	}

699	699	*/
700	700
701	701	XSetTransientForHint(winPtr->display, wmPtr->wrapperPtr->window,
702		wmPtr->masterPtr->wmInfoPtr->wrapperPtr->window);
	702	wmPtr->containerPtr->wmInfoPtr->wrapperPtr->window);
703	703	}
704	704
705	705	wmPtr->flags \|= WM_UPDATE_SIZE_HINTS;

826	826	TkWmDeadWindow(
827	827	TkWindow winPtr) / Top-level window that's being deleted. */
828	828	{
829		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	829	WmInfo *wmPtr = winPtr->wmInfoPtr;
830	830	WmInfo *wmPtr2;
831	831
832	832	if (wmPtr == NULL) {

835	835	if ((WmInfo *) winPtr->dispPtr->firstWmPtr == wmPtr) {
836	836	winPtr->dispPtr->firstWmPtr = wmPtr->nextPtr;
837	837	} else {
838		register WmInfo *prevPtr;
	838	WmInfo *prevPtr;
839	839
840	840	for (prevPtr = (WmInfo *) winPtr->dispPtr->firstWmPtr; ;
841	841	prevPtr = prevPtr->nextPtr) {

908	908	}
909	909
910	910	/*
911		* Reset all transient windows whose master is the dead window.
	911	* Reset all transient windows whose container is the dead window.
912	912	*/
913	913
914	914	for (wmPtr2 = winPtr->dispPtr->firstWmPtr; wmPtr2 != NULL;
915	915	wmPtr2 = wmPtr2->nextPtr) {
916		if (wmPtr2->masterPtr == winPtr) {
	916	if (wmPtr2->containerPtr == winPtr) {
917	917	wmPtr->numTransients--;
918		Tk_DeleteEventHandler((Tk_Window) wmPtr2->masterPtr,
	918	Tk_DeleteEventHandler((Tk_Window) wmPtr2->containerPtr,
919	919	StructureNotifyMask, WmWaitMapProc, wmPtr2->winPtr);
920		wmPtr2->masterPtr = NULL;
	920	wmPtr2->containerPtr = NULL;
921	921	if (!(wmPtr2->flags & WM_NEVER_MAPPED)) {
922	922	XDeleteProperty(winPtr->display, wmPtr2->wrapperPtr->window,
923	923	Tk_InternAtom((Tk_Window) winPtr, "WM_TRANSIENT_FOR"));

932	932	}
933	933	/* ASSERT: numTransients == 0 [Bug 1789819] */
934	934
935		if (wmPtr->masterPtr != NULL) {
936		wmPtr2 = wmPtr->masterPtr->wmInfoPtr;
	935	if (wmPtr->containerPtr != NULL) {
	936	wmPtr2 = wmPtr->containerPtr->wmInfoPtr;
937	937
938	938	/*
939		* If we had a master, tell them that we aren't tied to them anymore
	939	* If we had a container, tell them that we aren't tied to them anymore
940	940	*/
941	941
942	942	if (wmPtr2 != NULL) {
943	943	wmPtr2->numTransients--;
944	944	}
945		Tk_DeleteEventHandler((Tk_Window) wmPtr->masterPtr,
	945	Tk_DeleteEventHandler((Tk_Window) wmPtr->containerPtr,
946	946	StructureNotifyMask, WmWaitMapProc, winPtr);
947		wmPtr->masterPtr = NULL;
	947	wmPtr->containerPtr = NULL;
948	948	}
949	949	ckfree(wmPtr);
950	950	winPtr->wmInfoPtr = NULL;

1004	1004	*----------------------------------------------------------------------
1005	1005	*/
1006	1006
1007		/* ARGSUSED */
1008	1007	int
1009	1008	Tk_WmObjCmd(
1010	1009	ClientData clientData, /* Main window associated with interpreter. */

1012	1011	int objc, /* Number of arguments. */
1013	1012	Tcl_Obj const objv[]) / Argument objects. */
1014	1013	{
1015		Tk_Window tkwin = clientData;
	1014	Tk_Window tkwin = (Tk_Window)clientData;
1016	1015	static const char *const optionStrings[] = {
1017	1016	"aspect", "attributes", "client", "colormapwindows",
1018	1017	"command", "deiconify", "focusmodel", "forget",

1181	1180
1182	1181	static int
1183	1182	WmAspectCmd(
1184		Tk_Window tkwin, /* Main window of the application. */
	1183	TCL_UNUSED(Tk_Window), /* Main window of the application. */
1185	1184	TkWindow winPtr, / Toplevel to work with */
1186	1185	Tcl_Interp interp, / Current interpreter. */
1187	1186	int objc, /* Number of arguments. */
1188	1187	Tcl_Obj const objv[]) / Argument objects. */
1189	1188	{
1190		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	1189	WmInfo *wmPtr = winPtr->wmInfoPtr;
1191	1190	int numer1, denom1, numer2, denom2;
1192	1191
1193	1192	if ((objc != 3) && (objc != 7)) {

1314	1313	SetNetWmState(winPtr, "_NET_WM_STATE_FULLSCREEN",
1315	1314	wmPtr->reqState.fullscreen);
1316	1315	break;
1317		case _WMATT_LAST_ATTRIBUTE: /* NOTREACHED */
	1316	case _WMATT_LAST_ATTRIBUTE:
1318	1317	return TCL_ERROR;
1319	1318	}
1320	1319	return TCL_OK;

1351	1350	return Tcl_NewBooleanObj(wmPtr->attributes.fullscreen);
1352	1351	case WMATT_TYPE:
1353	1352	return GetNetWmType(winPtr);
1354		case _WMATT_LAST_ATTRIBUTE: /NOTREACHED/
	1353	case _WMATT_LAST_ATTRIBUTE:
1355	1354	break;
1356	1355	}
1357		/NOTREACHED/
1358	1356	return NULL;
1359	1357	}
1360	1358

1384	1382
1385	1383	static int
1386	1384	WmAttributesCmd(
1387		Tk_Window tkwin, /* Main window of the application. */
	1385	TCL_UNUSED(Tk_Window), /* Main window of the application. */
1388	1386	TkWindow winPtr, / Toplevel to work with */
1389	1387	Tcl_Interp interp, / Current interpreter. */
1390	1388	int objc, /* Number of arguments. */

1448	1446
1449	1447	static int
1450	1448	WmClientCmd(
1451		Tk_Window tkwin, /* Main window of the application. */
	1449	TCL_UNUSED(Tk_Window), /* Main window of the application. */
1452	1450	TkWindow winPtr, / Toplevel to work with */
1453	1451	Tcl_Interp interp, / Current interpreter. */
1454	1452	int objc, /* Number of arguments. */
1455	1453	Tcl_Obj const objv[]) / Argument objects. */
1456	1454	{
1457		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	1455	WmInfo *wmPtr = winPtr->wmInfoPtr;
1458	1456	const char *argv3;
1459	1457	int length;
1460	1458

1485	1483	if (wmPtr->clientMachine != NULL) {
1486	1484	ckfree(wmPtr->clientMachine);
1487	1485	}
1488		wmPtr->clientMachine = ckalloc(length + 1);
	1486	wmPtr->clientMachine = (char *)ckalloc(length + 1);
1489	1487	strcpy(wmPtr->clientMachine, argv3);
1490	1488	if (!(wmPtr->flags & WM_NEVER_MAPPED)) {
1491	1489	XTextProperty textProp;

1540	1538	int objc, /* Number of arguments. */
1541	1539	Tcl_Obj const objv[]) / Argument objects. */
1542	1540	{
1543		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	1541	WmInfo *wmPtr = winPtr->wmInfoPtr;
1544	1542	Window *cmapList;
1545	1543	TkWindow *winPtr2;
1546	1544	int count, i, windowObjc, gotToplevel;

1583	1581	!= TCL_OK) {
1584	1582	return TCL_ERROR;
1585	1583	}
1586		cmapList = ckalloc((windowObjc+1) * sizeof(Window));
	1584	cmapList = (Window )ckalloc((windowObjc+1) sizeof(Window));
1587	1585	gotToplevel = 0;
1588	1586	for (i = 0; i < windowObjc; i++) {
1589	1587	Tk_Window mapWin;

1635	1633
1636	1634	static int
1637	1635	WmCommandCmd(
1638		Tk_Window tkwin, /* Main window of the application. */
	1636	TCL_UNUSED(Tk_Window), /* Main window of the application. */
1639	1637	TkWindow winPtr, / Toplevel to work with */
1640	1638	Tcl_Interp interp, / Current interpreter. */
1641	1639	int objc, /* Number of arguments. */
1642	1640	Tcl_Obj const objv[]) / Argument objects. */
1643	1641	{
1644		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	1642	WmInfo *wmPtr = winPtr->wmInfoPtr;
1645	1643	const char *argv3;
1646	1644	int cmdArgc;
1647	1645	const char **cmdArgv;

1704	1702
1705	1703	static int
1706	1704	WmDeiconifyCmd(
1707		Tk_Window tkwin, /* Main window of the application. */
	1705	TCL_UNUSED(Tk_Window), /* Main window of the application. */
1708	1706	TkWindow winPtr, / Toplevel to work with */
1709	1707	Tcl_Interp interp, / Current interpreter. */
1710	1708	int objc, /* Number of arguments. */
1711	1709	Tcl_Obj const objv[]) / Argument objects. */
1712	1710	{
1713		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	1711	WmInfo *wmPtr = winPtr->wmInfoPtr;
1714	1712
1715	1713	if (objc != 3) {
1716	1714	Tcl_WrongNumArgs(interp, 2, objv, "window");

1754	1752
1755	1753	static int
1756	1754	WmFocusmodelCmd(
1757		Tk_Window tkwin, /* Main window of the application. */
	1755	TCL_UNUSED(Tk_Window), /* Main window of the application. */
1758	1756	TkWindow winPtr, / Toplevel to work with */
1759	1757	Tcl_Interp interp, / Current interpreter. */
1760	1758	int objc, /* Number of arguments. */
1761	1759	Tcl_Obj const objv[]) / Argument objects. */
1762	1760	{
1763		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	1761	WmInfo *wmPtr = winPtr->wmInfoPtr;
1764	1762	static const char *const optionStrings[] = {
1765	1763	"active", "passive", NULL };
1766	1764	enum options {

1809	1807
1810	1808	static int
1811	1809	WmForgetCmd(
1812		Tk_Window tkwin, /* Main window of the application. */
	1810	TCL_UNUSED(Tk_Window), /* Main window of the application. */
1813	1811	TkWindow winPtr, / Toplevel or Frame to work with */
1814		Tcl_Interp interp, / Current interpreter. */
1815		int objc, /* Number of arguments. */
1816		Tcl_Obj const objv[]) / Argument objects. */
1817		{
1818		register Tk_Window frameWin = (Tk_Window) winPtr;
	1812	TCL_UNUSED(Tcl_Interp ), / Current interpreter. */
	1813	TCL_UNUSED(int), /* Number of arguments. */
	1814	TCL_UNUSED(Tcl_Obj const )) /* Argument objects. */
	1815	{
	1816	Tk_Window frameWin = (Tk_Window) winPtr;
1819	1817
1820	1818	if (Tk_IsTopLevel(frameWin)) {
1821	1819	TkFocusJoin(winPtr);

1862	1860
1863	1861	static int
1864	1862	WmFrameCmd(
1865		Tk_Window tkwin, /* Main window of the application. */
	1863	TCL_UNUSED(Tk_Window), /* Main window of the application. */
1866	1864	TkWindow winPtr, / Toplevel to work with */
1867	1865	Tcl_Interp interp, / Current interpreter. */
1868	1866	int objc, /* Number of arguments. */
1869	1867	Tcl_Obj const objv[]) / Argument objects. */
1870	1868	{
1871		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	1869	WmInfo *wmPtr = winPtr->wmInfoPtr;
1872	1870	Window window;
1873	1871	char buf[TCL_INTEGER_SPACE];
1874	1872

1904	1902
1905	1903	static int
1906	1904	WmGeometryCmd(
1907		Tk_Window tkwin, /* Main window of the application. */
	1905	TCL_UNUSED(Tk_Window), /* Main window of the application. */
1908	1906	TkWindow winPtr, / Toplevel to work with */
1909	1907	Tcl_Interp interp, / Current interpreter. */
1910	1908	int objc, /* Number of arguments. */
1911	1909	Tcl_Obj const objv[]) / Argument objects. */
1912	1910	{
1913		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	1911	WmInfo *wmPtr = winPtr->wmInfoPtr;
1914	1912	char xSign, ySign;
1915	1913	int width, height;
1916	1914	const char *argv3;

1964	1962
1965	1963	static int
1966	1964	WmGridCmd(
1967		Tk_Window tkwin, /* Main window of the application. */
	1965	TCL_UNUSED(Tk_Window), /* Main window of the application. */
1968	1966	TkWindow winPtr, / Toplevel to work with */
1969	1967	Tcl_Interp interp, / Current interpreter. */
1970	1968	int objc, /* Number of arguments. */
1971	1969	Tcl_Obj const objv[]) / Argument objects. */
1972	1970	{
1973		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	1971	WmInfo *wmPtr = winPtr->wmInfoPtr;
1974	1972	int reqWidth, reqHeight, widthInc, heightInc;
1975	1973
1976	1974	if ((objc != 3) && (objc != 7)) {

2069	2067	int objc, /* Number of arguments. */
2070	2068	Tcl_Obj const objv[]) / Argument objects. */
2071	2069	{
2072		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	2070	WmInfo *wmPtr = winPtr->wmInfoPtr;
2073	2071	Tk_Window tkwin2;
2074	2072	WmInfo *wmPtr2;
2075	2073	const char *argv3;

2113	2111	}
2114	2112	wmPtr->hints.window_group = Tk_WindowId(wmPtr2->wrapperPtr);
2115	2113	wmPtr->hints.flags \|= WindowGroupHint;
2116		wmPtr->leaderName = ckalloc(length + 1);
	2114	wmPtr->leaderName = (char *)ckalloc(length + 1);
2117	2115	strcpy(wmPtr->leaderName, argv3);
2118	2116	}
2119	2117	UpdateHints(winPtr);

2139	2137
2140	2138	static int
2141	2139	WmIconbitmapCmd(
2142		Tk_Window tkwin, /* Main window of the application. */
	2140	TCL_UNUSED(Tk_Window), /* Main window of the application. */
2143	2141	TkWindow winPtr, / Toplevel to work with */
2144	2142	Tcl_Interp interp, / Current interpreter. */
2145	2143	int objc, /* Number of arguments. */
2146	2144	Tcl_Obj const objv[]) / Argument objects. */
2147	2145	{
2148		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	2146	WmInfo *wmPtr = winPtr->wmInfoPtr;
2149	2147	Pixmap pixmap;
2150	2148	const char *argv3;
2151	2149

2199	2197
2200	2198	static int
2201	2199	WmIconifyCmd(
2202		Tk_Window tkwin, /* Main window of the application. */
	2200	TCL_UNUSED(Tk_Window), /* Main window of the application. */
2203	2201	TkWindow winPtr, / Toplevel to work with */
2204	2202	Tcl_Interp interp, / Current interpreter. */
2205	2203	int objc, /* Number of arguments. */
2206	2204	Tcl_Obj const objv[]) / Argument objects. */
2207	2205	{
2208		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	2206	WmInfo *wmPtr = winPtr->wmInfoPtr;
2209	2207
2210	2208	if (objc != 3) {
2211	2209	Tcl_WrongNumArgs(interp, 2, objv, "window");

2219	2217	NULL);
2220	2218	return TCL_ERROR;
2221	2219	}
2222		if (wmPtr->masterPtr != NULL) {
	2220	if (wmPtr->containerPtr != NULL) {
2223	2221	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
2224	2222	"can't iconify \"%s\": it is a transient",
2225	2223	winPtr->pathName));

2274	2272	int objc, /* Number of arguments. */
2275	2273	Tcl_Obj const objv[]) / Argument objects. */
2276	2274	{
2277		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	2275	WmInfo *wmPtr = winPtr->wmInfoPtr;
2278	2276	Pixmap pixmap;
2279	2277	const char *argv3;
2280	2278

2327	2325
2328	2326	static int
2329	2327	WmIconnameCmd(
2330		Tk_Window tkwin, /* Main window of the application. */
	2328	TCL_UNUSED(Tk_Window), /* Main window of the application. */
2331	2329	TkWindow winPtr, / Toplevel to work with */
2332	2330	Tcl_Interp interp, / Current interpreter. */
2333	2331	int objc, /* Number of arguments. */
2334	2332	Tcl_Obj const objv[]) / Argument objects. */
2335	2333	{
2336		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	2334	WmInfo *wmPtr = winPtr->wmInfoPtr;
2337	2335	const char *argv3;
2338	2336	int length;
2339	2337

2379	2377
2380	2378	static int
2381	2379	WmIconphotoCmd(
2382		Tk_Window tkwin, /* Main window of the application. */
	2380	TCL_UNUSED(Tk_Window), /* Main window of the application. */
2383	2381	TkWindow winPtr, / Toplevel to work with */
2384	2382	Tcl_Interp interp, / Current interpreter. */
2385	2383	int objc, /* Number of arguments. */
2386	2384	Tcl_Obj const objv[]) / Argument objects. */
2387	2385	{
2388		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	2386	WmInfo *wmPtr = winPtr->wmInfoPtr;
2389	2387	Tk_PhotoHandle photo;
2390	2388	Tk_PhotoImageBlock block;
2391	2389	int i, size = 0, width, height, index = 0, x, y, isDefault = 0;

2436	2434	* defines CARD32 arrays to use. [Bug 2902814]
2437	2435	*/
2438	2436
2439		iconPropertyData = attemptckalloc(sizeof(unsigned long) * size);
	2437	iconPropertyData = (unsigned long )attemptckalloc(sizeof(unsigned long) size);
2440	2438	if (iconPropertyData == NULL) {
2441	2439	return TCL_ERROR;
2442	2440	}

2478	2476	iconPropertyData[index++] = (unsigned long) height;
2479	2477	for (y = 0; y < height; y++) {
2480	2478	for (x = 0; x < width; x++) {
2481		register unsigned char *pixelPtr =
	2479	unsigned char *pixelPtr =
2482	2480	block.pixelPtr + xblock.pixelSize + yblock.pitch;
2483		register unsigned long R, G, B, A;
	2481	unsigned long R, G, B, A;
2484	2482
2485	2483	R = pixelPtr[block.offset[0]];
2486	2484	G = pixelPtr[block.offset[1]];

2529	2527
2530	2528	static int
2531	2529	WmIconpositionCmd(
2532		Tk_Window tkwin, /* Main window of the application. */
	2530	TCL_UNUSED(Tk_Window), /* Main window of the application. */
2533	2531	TkWindow winPtr, / Toplevel to work with */
2534	2532	Tcl_Interp interp, / Current interpreter. */
2535	2533	int objc, /* Number of arguments. */
2536	2534	Tcl_Obj const objv[]) / Argument objects. */
2537	2535	{
2538		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	2536	WmInfo *wmPtr = winPtr->wmInfoPtr;
2539	2537	int x, y;
2540	2538
2541	2539	if ((objc != 3) && (objc != 5)) {

2592	2590	int objc, /* Number of arguments. */
2593	2591	Tcl_Obj const objv[]) / Argument objects. */
2594	2592	{
2595		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	2593	WmInfo *wmPtr = winPtr->wmInfoPtr;
2596	2594	Tk_Window tkwin2;
2597	2595	WmInfo *wmPtr2;
2598	2596	XSetWindowAttributes atts;

2706	2704
2707	2705	static int
2708	2706	WmManageCmd(
2709		Tk_Window tkwin, /* Main window of the application. */
	2707	TCL_UNUSED(Tk_Window), /* Main window of the application. */
2710	2708	TkWindow winPtr, / Toplevel or Frame to work with */
2711	2709	Tcl_Interp interp, / Current interpreter. */
2712		int objc, /* Number of arguments. */
2713		Tcl_Obj const objv[]) / Argument objects. */
2714		{
2715		register Tk_Window frameWin = (Tk_Window) winPtr;
2716		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	2710	TCL_UNUSED(int), /* Number of arguments. */
	2711	TCL_UNUSED(Tcl_Obj const )) /* Argument objects. */
	2712	{
	2713	Tk_Window frameWin = (Tk_Window) winPtr;
	2714	WmInfo *wmPtr = winPtr->wmInfoPtr;
2717	2715
2718	2716	if (!Tk_IsTopLevel(frameWin)) {
2719	2717	if (!Tk_IsManageable(frameWin)) {

2768	2766
2769	2767	static int
2770	2768	WmMaxsizeCmd(
2771		Tk_Window tkwin, /* Main window of the application. */
	2769	TCL_UNUSED(Tk_Window), /* Main window of the application. */
2772	2770	TkWindow winPtr, / Toplevel to work with */
2773	2771	Tcl_Interp interp, / Current interpreter. */
2774	2772	int objc, /* Number of arguments. */
2775	2773	Tcl_Obj const objv[]) / Argument objects. */
2776	2774	{
2777		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	2775	WmInfo *wmPtr = winPtr->wmInfoPtr;
2778	2776	int width, height;
2779	2777
2780	2778	if ((objc != 3) && (objc != 5)) {

2827	2825
2828	2826	static int
2829	2827	WmMinsizeCmd(
2830		Tk_Window tkwin, /* Main window of the application. */
	2828	TCL_UNUSED(Tk_Window), /* Main window of the application. */
2831	2829	TkWindow winPtr, / Toplevel to work with */
2832	2830	Tcl_Interp interp, / Current interpreter. */
2833	2831	int objc, /* Number of arguments. */
2834	2832	Tcl_Obj const objv[]) / Argument objects. */
2835	2833	{
2836		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	2834	WmInfo *wmPtr = winPtr->wmInfoPtr;
2837	2835	int width, height;
2838	2836
2839	2837	if ((objc != 3) && (objc != 5)) {

2878	2876
2879	2877	static int
2880	2878	WmOverrideredirectCmd(
2881		Tk_Window tkwin, /* Main window of the application. */
	2879	TCL_UNUSED(Tk_Window), /* Main window of the application. */
2882	2880	TkWindow winPtr, / Toplevel to work with */
2883	2881	Tcl_Interp interp, / Current interpreter. */
2884	2882	int objc, /* Number of arguments. */

2936	2934
2937	2935	static int
2938	2936	WmPositionfromCmd(
2939		Tk_Window tkwin, /* Main window of the application. */
	2937	TCL_UNUSED(Tk_Window), /* Main window of the application. */
2940	2938	TkWindow winPtr, / Toplevel to work with */
2941	2939	Tcl_Interp interp, / Current interpreter. */
2942	2940	int objc, /* Number of arguments. */
2943	2941	Tcl_Obj const objv[]) / Argument objects. */
2944	2942	{
2945		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	2943	WmInfo *wmPtr = winPtr->wmInfoPtr;
2946	2944	static const char *const optionStrings[] = {
2947	2945	"program", "user", NULL };
2948	2946	enum options {

3003	3001
3004	3002	static int
3005	3003	WmProtocolCmd(
3006		Tk_Window tkwin, /* Main window of the application. */
	3004	TCL_UNUSED(Tk_Window), /* Main window of the application. */
3007	3005	TkWindow winPtr, / Toplevel to work with */
3008	3006	Tcl_Interp interp, / Current interpreter. */
3009	3007	int objc, /* Number of arguments. */
3010	3008	Tcl_Obj const objv[]) / Argument objects. */
3011	3009	{
3012		register WmInfo *wmPtr = winPtr->wmInfoPtr;
3013		register ProtocolHandler protPtr, prevPtr;
	3010	WmInfo *wmPtr = winPtr->wmInfoPtr;
	3011	ProtocolHandler protPtr, prevPtr;
3014	3012	Atom protocol;
3015	3013	const char *cmd;
3016	3014	int cmdLength;

3081	3079	}
3082	3080	cmd = Tcl_GetStringFromObj(objv[4], &cmdLength);
3083	3081	if (cmdLength > 0) {
3084		protPtr = ckalloc(HANDLER_SIZE(cmdLength));
	3082	protPtr = (ProtocolHandler *)ckalloc(HANDLER_SIZE(cmdLength));
3085	3083	protPtr->protocol = protocol;
3086	3084	protPtr->nextPtr = wmPtr->protPtr;
3087	3085	wmPtr->protPtr = protPtr;

3113	3111
3114	3112	static int
3115	3113	WmResizableCmd(
3116		Tk_Window tkwin, /* Main window of the application. */
	3114	TCL_UNUSED(Tk_Window), /* Main window of the application. */
3117	3115	TkWindow winPtr, / Toplevel to work with */
3118	3116	Tcl_Interp interp, / Current interpreter. */
3119	3117	int objc, /* Number of arguments. */
3120	3118	Tcl_Obj const objv[]) / Argument objects. */
3121	3119	{
3122		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	3120	WmInfo *wmPtr = winPtr->wmInfoPtr;
3123	3121	int width, height;
3124	3122
3125	3123	if ((objc != 3) && (objc != 5)) {

3172	3170
3173	3171	static int
3174	3172	WmSizefromCmd(
3175		Tk_Window tkwin, /* Main window of the application. */
	3173	TCL_UNUSED(Tk_Window), /* Main window of the application. */
3176	3174	TkWindow winPtr, / Toplevel to work with */
3177	3175	Tcl_Interp interp, / Current interpreter. */
3178	3176	int objc, /* Number of arguments. */
3179	3177	Tcl_Obj const objv[]) / Argument objects. */
3180	3178	{
3181		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	3179	WmInfo *wmPtr = winPtr->wmInfoPtr;
3182	3180	static const char *const optionStrings[] = {
3183	3181	"program", "user", NULL };
3184	3182	enum options {

3364	3362
3365	3363	static int
3366	3364	WmStateCmd(
3367		Tk_Window tkwin, /* Main window of the application. */
	3365	TCL_UNUSED(Tk_Window), /* Main window of the application. */
3368	3366	TkWindow winPtr, / Toplevel to work with */
3369	3367	Tcl_Interp interp, / Current interpreter. */
3370	3368	int objc, /* Number of arguments. */
3371	3369	Tcl_Obj const objv[]) / Argument objects. */
3372	3370	{
3373		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	3371	WmInfo *wmPtr = winPtr->wmInfoPtr;
3374	3372	static const char *const optionStrings[] = {
3375	3373	"normal", "iconic", "withdrawn", NULL };
3376	3374	enum options {

3407	3405	"OVERRIDE_REDIRECT", NULL);
3408	3406	return TCL_ERROR;
3409	3407	}
3410		if (wmPtr->masterPtr != NULL) {
	3408	if (wmPtr->containerPtr != NULL) {
3411	3409	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
3412	3410	"can't iconify \"%s\": it is a transient",
3413	3411	winPtr->pathName));

3470	3468
3471	3469	static int
3472	3470	WmTitleCmd(
3473		Tk_Window tkwin, /* Main window of the application. */
	3471	TCL_UNUSED(Tk_Window), /* Main window of the application. */
3474	3472	TkWindow winPtr, / Toplevel to work with */
3475	3473	Tcl_Interp interp, / Current interpreter. */
3476	3474	int objc, /* Number of arguments. */
3477	3475	Tcl_Obj const objv[]) / Argument objects. */
3478	3476	{
3479		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	3477	WmInfo *wmPtr = winPtr->wmInfoPtr;
3480	3478	const char *argv3;
3481	3479	int length;
3482	3480

3495	3493	ckfree(wmPtr->title);
3496	3494	}
3497	3495	argv3 = Tcl_GetStringFromObj(objv[3], &length);
3498		wmPtr->title = ckalloc(length + 1);
	3496	wmPtr->title = (char *)ckalloc(length + 1);
3499	3497	strcpy(wmPtr->title, argv3);
3500	3498
3501	3499	if (!(wmPtr->flags & WM_NEVER_MAPPED)) {

3530	3528	int objc, /* Number of arguments. */
3531	3529	Tcl_Obj const objv[]) / Argument objects. */
3532	3530	{
3533		register WmInfo *wmPtr = winPtr->wmInfoPtr;
3534		TkWindow masterPtr = wmPtr->masterPtr, w;
	3531	WmInfo *wmPtr = winPtr->wmInfoPtr;
	3532	TkWindow containerPtr = wmPtr->containerPtr, w;
3535	3533	WmInfo *wmPtr2;
3536	3534
3537	3535	if ((objc != 3) && (objc != 4)) {

3539	3537	return TCL_ERROR;
3540	3538	}
3541	3539	if (objc == 3) {
3542		if (masterPtr != NULL) {
3543		Tcl_SetObjResult(interp, TkNewWindowObj((Tk_Window) masterPtr));
	3540	if (containerPtr != NULL) {
	3541	Tcl_SetObjResult(interp, TkNewWindowObj((Tk_Window) containerPtr));
3544	3542	}
3545	3543	return TCL_OK;
3546	3544	}
3547	3545	if (Tcl_GetString(objv[3])[0] == '\0') {
3548		if (masterPtr != NULL) {
	3546	if (containerPtr != NULL) {
3549	3547	/*
3550		* If we had a master, tell them that we aren't tied to them
	3548	* If we had a container, tell them that we aren't tied to them
3551	3549	* anymore
3552	3550	*/
3553	3551
3554		masterPtr->wmInfoPtr->numTransients--;
3555		Tk_DeleteEventHandler((Tk_Window) masterPtr, StructureNotifyMask,
	3552	containerPtr->wmInfoPtr->numTransients--;
	3553	Tk_DeleteEventHandler((Tk_Window) containerPtr, StructureNotifyMask,
3556	3554	WmWaitMapProc, winPtr);
3557	3555
3558	3556	/*

3562	3560	*/
3563	3561	}
3564	3562
3565		wmPtr->masterPtr = NULL;
	3563	wmPtr->containerPtr = NULL;
3566	3564	} else {
3567		Tk_Window masterWin;
3568
3569		if (TkGetWindowFromObj(interp, tkwin, objv[3], &masterWin)!=TCL_OK) {
	3565	Tk_Window container;
	3566
	3567	if (TkGetWindowFromObj(interp, tkwin, objv[3], &container)!=TCL_OK) {
3570	3568	return TCL_ERROR;
3571	3569	}
3572		masterPtr = (TkWindow *) masterWin;
3573		while (!Tk_TopWinHierarchy(masterPtr)) {
	3570	containerPtr = (TkWindow *) container;
	3571	while (!Tk_TopWinHierarchy(containerPtr)) {
3574	3572	/*
3575		* Ensure that the master window is actually a Tk toplevel.
	3573	* Ensure that the container window is actually a Tk toplevel.
3576	3574	*/
3577	3575
3578		masterPtr = masterPtr->parentPtr;
3579		}
3580		Tk_MakeWindowExist((Tk_Window) masterPtr);
	3576	containerPtr = containerPtr->parentPtr;
	3577	}
	3578	Tk_MakeWindowExist((Tk_Window) containerPtr);
3581	3579
3582	3580	if (wmPtr->iconFor != NULL) {
3583	3581	Tcl_SetObjResult(interp, Tcl_ObjPrintf(

3587	3585	return TCL_ERROR;
3588	3586	}
3589	3587
3590		wmPtr2 = masterPtr->wmInfoPtr;
	3588	wmPtr2 = containerPtr->wmInfoPtr;
3591	3589	if (wmPtr2->wrapperPtr == NULL) {
3592	3590	CreateWrapper(wmPtr2);
3593	3591	}

3600	3598	return TCL_ERROR;
3601	3599	}
3602	3600
3603		for (w = masterPtr; w != NULL && w->wmInfoPtr != NULL;
3604		w = (TkWindow *)w->wmInfoPtr->masterPtr) {
	3601	for (w = containerPtr; w != NULL && w->wmInfoPtr != NULL;
	3602	w = (TkWindow *)w->wmInfoPtr->containerPtr) {
3605	3603	if (w == winPtr) {
3606	3604	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
3607	3605	"setting \"%s\" as master creates a transient/master cycle",
3608		Tk_PathName(masterPtr)));
	3606	Tk_PathName(containerPtr)));
3609	3607	Tcl_SetErrorCode(interp, "TK", "WM", "TRANSIENT", "SELF", NULL);
3610	3608	return TCL_ERROR;
3611	3609	}
3612	3610	}
3613	3611
3614		if (masterPtr != wmPtr->masterPtr) {
	3612	if (containerPtr != wmPtr->containerPtr) {
3615	3613	/*
3616		* Remove old master map/unmap binding before setting the new
3617		* master. The event handler will ensure that transient states
3618		* reflect the state of the master.
	3614	* Remove old container map/unmap binding before setting the new
	3615	* container. The event handler will ensure that transient states
	3616	* reflect the state of the container.
3619	3617	*/
3620	3618
3621		if (wmPtr->masterPtr != NULL) {
3622		wmPtr->masterPtr->wmInfoPtr->numTransients--;
3623		Tk_DeleteEventHandler((Tk_Window) wmPtr->masterPtr,
	3619	if (wmPtr->containerPtr != NULL) {
	3620	wmPtr->containerPtr->wmInfoPtr->numTransients--;
	3621	Tk_DeleteEventHandler((Tk_Window) wmPtr->containerPtr,
3624	3622	StructureNotifyMask, WmWaitMapProc, winPtr);
3625	3623	}
3626	3624
3627		masterPtr->wmInfoPtr->numTransients++;
3628		Tk_CreateEventHandler((Tk_Window) masterPtr,
	3625	containerPtr->wmInfoPtr->numTransients++;
	3626	Tk_CreateEventHandler((Tk_Window) containerPtr,
3629	3627	StructureNotifyMask, WmWaitMapProc, winPtr);
3630	3628
3631		wmPtr->masterPtr = masterPtr;
	3629	wmPtr->containerPtr = containerPtr;
3632	3630	}
3633	3631	}
3634	3632	if (!(wmPtr->flags & WM_NEVER_MAPPED)) {
3635		if (wmPtr->masterPtr != NULL && !Tk_IsMapped(wmPtr->masterPtr)) {
	3633	if (wmPtr->containerPtr != NULL && !Tk_IsMapped(wmPtr->containerPtr)) {
3636	3634	if (TkpWmSetState(winPtr, WithdrawnState) == 0) {
3637	3635	Tcl_SetObjResult(interp, Tcl_NewStringObj(
3638	3636	"couldn't send withdraw message to window manager",

3641	3639	return TCL_ERROR;
3642	3640	}
3643	3641	} else {
3644		if (wmPtr->masterPtr != NULL) {
	3642	if (wmPtr->containerPtr != NULL) {
3645	3643	XSetTransientForHint(winPtr->display,
3646	3644	wmPtr->wrapperPtr->window,
3647		wmPtr->masterPtr->wmInfoPtr->wrapperPtr->window);
	3645	wmPtr->containerPtr->wmInfoPtr->wrapperPtr->window);
3648	3646	} else {
3649	3647	XDeleteProperty(winPtr->display, wmPtr->wrapperPtr->window,
3650	3648	Tk_InternAtom((Tk_Window) winPtr,"WM_TRANSIENT_FOR"));

3673	3671
3674	3672	static int
3675	3673	WmWithdrawCmd(
3676		Tk_Window tkwin, /* Main window of the application. */
	3674	TCL_UNUSED(Tk_Window), /* Main window of the application. */
3677	3675	TkWindow winPtr, / Toplevel to work with */
3678	3676	Tcl_Interp interp, / Current interpreter. */
3679	3677	int objc, /* Number of arguments. */
3680	3678	Tcl_Obj const objv[]) / Argument objects. */
3681	3679	{
3682		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	3680	WmInfo *wmPtr = winPtr->wmInfoPtr;
3683	3681
3684	3682	if (objc != 3) {
3685	3683	Tcl_WrongNumArgs(interp, 2, objv, "window");

3720	3718
3721	3719	/*
3722	3720	* Invoked when a MapNotify or UnmapNotify event is delivered for a toplevel
3723		* that is the master of a transient toplevel.
	3721	* that is the container of a transient toplevel.
3724	3722	*/
3725	3723
3726	3724	static void

3728	3726	ClientData clientData, /* Pointer to window. */
3729	3727	XEvent eventPtr) / Information about event. */
3730	3728	{
3731		TkWindow *winPtr = clientData;
3732		TkWindow *masterPtr = winPtr->wmInfoPtr->masterPtr;
3733
3734		if (masterPtr == NULL) {
	3729	TkWindow winPtr = (TkWindow )clientData;
	3730	TkWindow *containerPtr = winPtr->wmInfoPtr->containerPtr;
	3731
	3732	if (containerPtr == NULL) {
3735	3733	return;
3736	3734	}
3737	3735

3779	3777	* of one grid unit. */
3780	3778	{
3781	3779	TkWindow winPtr = (TkWindow ) tkwin;
3782		register WmInfo *wmPtr;
	3780	WmInfo *wmPtr;
3783	3781
3784	3782	/*
3785	3783	* Ensure widthInc and heightInc are greater than 0

3884	3882	* controlling gridding. */
3885	3883	{
3886	3884	TkWindow winPtr = (TkWindow ) tkwin;
3887		register WmInfo *wmPtr;
	3885	WmInfo *wmPtr;
3888	3886
3889	3887	/*
3890	3888	* Find the top-level window for tkwin, plus the window manager

4417	4415	ClientData clientData, /* Information about toplevel window. */
4418	4416	XEvent eventPtr) / Event that just happened. */
4419	4417	{
4420		WmInfo *wmPtr = clientData;
	4418	WmInfo wmPtr = (WmInfo )clientData;
4421	4419	XEvent mapEvent;
4422	4420	TkDisplay *dispPtr = wmPtr->winPtr->dispPtr;
4423	4421

4497	4495	*----------------------------------------------------------------------
4498	4496	*/
4499	4497
4500		/* ARGSUSED */
4501	4498	static void
4502	4499	TopLevelReqProc(
4503		ClientData dummy, /* Not used. */
	4500	TCL_UNUSED(void ), / Not used. */
4504	4501	Tk_Window tkwin) /* Information about window. */
4505	4502	{
4506	4503	TkWindow winPtr = (TkWindow ) tkwin;

4567	4564	UpdateGeometryInfo(
4568	4565	ClientData clientData) /* Pointer to the window's record. */
4569	4566	{
4570		register TkWindow *winPtr = clientData;
4571		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	4567	TkWindow winPtr = (TkWindow )clientData;
	4568	WmInfo *wmPtr = winPtr->wmInfoPtr;
4572	4569	int x, y, width, height, min, max;
4573	4570	unsigned long serial;
4574	4571

4829	4826	int newWidth,
4830	4827	int newHeight)
4831	4828	{
4832		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	4829	WmInfo *wmPtr = winPtr->wmInfoPtr;
4833	4830	XSizeHints *hintsPtr;
4834	4831	int maxWidth, maxHeight;
4835	4832

5306	5303	ClientData clientData, /* Pointer to WaitRestrictInfo structure. */
5307	5304	XEvent eventPtr) / Event that is about to be handled. */
5308	5305	{
5309		WaitRestrictInfo *infoPtr = clientData;
	5306	WaitRestrictInfo infoPtr = (WaitRestrictInfo )clientData;
5310	5307
5311	5308	if (eventPtr->type == ReparentNotify) {
5312	5309	return TK_PROCESS_EVENT;

5462	5459	}
5463	5460
5464	5461	if (objc > 0) {
5465		atoms = ckalloc(sizeof(Atom) * objc);
	5462	atoms = (Atom )ckalloc(sizeof(Atom) objc);
5466	5463	}
5467	5464
5468	5465	for (n = 0; n < objc; ++n) {

5575	5572	TkWindow winPtr) / Pointer to top-level window whose geometry
5576	5573	* is to be changed. */
5577	5574	{
5578		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	5575	WmInfo *wmPtr = winPtr->wmInfoPtr;
5579	5576	int x, y, width, height, flags;
5580	5577	char *end;
5581		register const char *p = string;
	5578	const char *p = string;
5582	5579
5583	5580	/*
5584	5581	* The leading "=" is optional.

5711	5708	int yPtr) / Where to store y-displacement of (0,0). */
5712	5709	{
5713	5710	int x, y;
5714		register TkWindow winPtr = (TkWindow ) tkwin;
	5711	TkWindow winPtr = (TkWindow ) tkwin;
5715	5712
5716	5713	/*
5717	5714	* Search back through this window's parents all the way to a top-level

6178	6175	int x, int y) /* New location for window (within parent). */
6179	6176	{
6180	6177	TkWindow winPtr = (TkWindow ) tkwin;
6181		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	6178	WmInfo *wmPtr = winPtr->wmInfoPtr;
6182	6179
6183	6180	if (!(winPtr->flags & TK_TOP_LEVEL)) {
6184	6181	Tcl_Panic("Tk_MoveToplevelWindow called with non-toplevel window");

6226	6223
6227	6224	static void
6228	6225	UpdateWmProtocols(
6229		register WmInfo wmPtr) / Information about top-level window. */
6230		{
6231		register ProtocolHandler *protPtr;
	6226	WmInfo wmPtr) / Information about top-level window. */
	6227	{
	6228	ProtocolHandler *protPtr;
6232	6229	Atom deleteWindowAtom, pingAtom;
6233	6230	int count;
6234	6231	Atom arrayPtr, atomPtr;

6245	6242	protPtr = protPtr->nextPtr, count++) {
6246	6243	/* Empty loop body; we're just counting the handlers. */
6247	6244	}
6248		arrayPtr = ckalloc(count * sizeof(Atom));
	6245	arrayPtr = (Atom )ckalloc(count sizeof(Atom));
6249	6246	deleteWindowAtom = Tk_InternAtom((Tk_Window) wmPtr->winPtr,
6250	6247	"WM_DELETE_WINDOW");
6251	6248	pingAtom = Tk_InternAtom((Tk_Window) wmPtr->winPtr, "_NET_WM_PING");

6287	6284	XEvent eventPtr) / X event. */
6288	6285	{
6289	6286	WmInfo *wmPtr;
6290		register ProtocolHandler *protPtr;
	6287	ProtocolHandler *protPtr;
6291	6288	Atom protocol;
6292	6289	int result;
6293	6290	const char *protocolName;

6436	6433	Tcl_InitHashTable(&table, TCL_ONE_WORD_KEYS);
6437	6434	TkWmStackorderToplevelWrapperMap(parentPtr, parentPtr->display, &table);
6438	6435
6439		window_ptr = windows = ckalloc((table.numEntries+1) * sizeof(TkWindow *));
	6436	window_ptr = windows = (TkWindow *)ckalloc((table.numEntries+1) sizeof(TkWindow *));
6440	6437	if (windows == NULL) {
6441	6438	return NULL;
6442	6439	}

6452	6449	goto done;
6453	6450	case 1:
6454	6451	hPtr = Tcl_FirstHashEntry(&table, &search);
6455		windows[0] = Tcl_GetHashValue(hPtr);
	6452	windows[0] = (TkWindow *)Tcl_GetHashValue(hPtr);
6456	6453	windows[1] = NULL;
6457	6454	goto done;
6458	6455	}

6468	6465	windows = NULL;
6469	6466	} else {
6470	6467	for (i = 0; i < numChildren; i++) {
6471		hPtr = Tcl_FindHashEntry(&table, (char *) children[i]);
	6468	hPtr = Tcl_FindHashEntry(&table, (char *)children[i]);
6472	6469	if (hPtr != NULL) {
6473		childWinPtr = Tcl_GetHashValue(hPtr);
	6470	childWinPtr = (TkWindow *)Tcl_GetHashValue(hPtr);
6474	6471	*window_ptr++ = childWinPtr;
6475	6472	}
6476	6473	}

6643	6640	* add the toplevel itself as the last element of the list.
6644	6641	*/
6645	6642
6646		newPtr = ckalloc((count+2) * sizeof(Window));
	6643	newPtr = (Window )ckalloc((count+2) sizeof(Window));
6647	6644	for (i = 0; i < count; i++) {
6648	6645	newPtr[i] = oldPtr[i];
6649	6646	}

6878	6875	static void
6879	6876	TkSetTransientFor(Tk_Window tkwin, Tk_Window parent)
6880	6877	{
6881		if (parent == None) {
	6878	if (parent == NULL) {
6882	6879	parent = Tk_Parent(tkwin);
6883	6880	while (!Tk_IsTopLevel(parent))
6884	6881	parent = Tk_Parent(parent);

6996	6993	TkWindow winPtr, wrapperPtr;
6997	6994	Window parent;
6998	6995	Tcl_HashEntry *hPtr;
6999		int new;
	6996	int isNew;
7000	6997
7001	6998	winPtr = wmPtr->winPtr;
7002	6999	if (winPtr->window == None) {

7040	7037	InputOutput, wrapperPtr->visual,
7041	7038	wrapperPtr->dirtyAtts\|CWOverrideRedirect, &wrapperPtr->atts);
7042	7039	hPtr = Tcl_CreateHashEntry(&wrapperPtr->dispPtr->winTable,
7043		(char *) wrapperPtr->window, &new);
	7040	(char *) wrapperPtr->window, &isNew);
7044	7041	Tcl_SetHashValue(hPtr, wrapperPtr);
7045	7042	wrapperPtr->mainPtr = winPtr->mainPtr;
7046	7043	wrapperPtr->mainPtr->refCount++;

7259	7256	* for tkwin's toplevel. */
7260	7257	Tk_Window tkwin) /* Handle for menubar window. */
7261	7258	{
7262		WmInfo *wmPtr = clientData;
	7259	WmInfo wmPtr = (WmInfo )clientData;
7263	7260
7264	7261	wmPtr->menuHeight = Tk_ReqHeight(tkwin);
7265	7262	if (wmPtr->menuHeight <= 0) {

7294	7291	TkpGetWrapperWindow(
7295	7292	TkWindow winPtr) / A toplevel window pointer. */
7296	7293	{
7297		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	7294	WmInfo *wmPtr = winPtr->wmInfoPtr;
7298	7295
7299	7296	if ((winPtr == NULL) \|\| (wmPtr == NULL)) {
7300	7297	return NULL;

7324	7321	UpdateCommand(
7325	7322	TkWindow *winPtr)
7326	7323	{
7327		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	7324	WmInfo *wmPtr = winPtr->wmInfoPtr;
7328	7325	Tcl_DString cmds, ds;
7329	7326	int i, *offsets;
7330	7327	char **cmdArgv;

7341	7338	* entire DString is done.
7342	7339	*/
7343	7340
7344		cmdArgv = ckalloc(sizeof(char ) wmPtr->cmdArgc);
7345		offsets = ckalloc(sizeof(int) * wmPtr->cmdArgc);
	7341	cmdArgv = (char *)ckalloc(sizeof(char ) * wmPtr->cmdArgc);
	7342	offsets = (int )ckalloc(sizeof(int) wmPtr->cmdArgc);
7346	7343	Tcl_DStringInit(&cmds);
7347	7344	for (i = 0; i < wmPtr->cmdArgc; i++) {
7348	7345	Tcl_UtfToExternalDString(NULL, wmPtr->cmdArgv[i], -1, &ds);

+20

-14

win/Makefile.in less more

128	128	DLLSUFFIX = @DLLSUFFIX@
129	129	LIBSUFFIX = @LIBSUFFIX@
130	130	EXESUFFIX = @EXESUFFIX@
	131	VER = @TK_MAJOR_VERSION@@TK_MINOR_VERSION@
	132	DOTVER = @TK_MAJOR_VERSION@.@TK_MINOR_VERSION@
131	133
132	134	TK_STUB_LIB_FILE = @TK_STUB_LIB_FILE@
133	135	TK_LIB_FILE = @TK_LIB_FILE@
134	136	TK_DLL_FILE = @TK_DLL_FILE@
135	137	TEST_DLL_FILE = tktest$(VER)${DLLSUFFIX}
136		TEST_LIB_FILE = @LIBPREFIX@tktest$(VER)${LIBSUFFIX}
	138	TEST_LIB_FILE = @LIBPREFIX@tktest$(VER)${DLLSUFFIX}.a
137	139
138	140	SHARED_LIBRARIES = $(TK_DLL_FILE) $(TK_STUB_LIB_FILE)
139	141	STATIC_LIBRARIES = $(TK_LIB_FILE)
140	142
141	143	WISH = wish$(VER)${EXESUFFIX}
142		TKTEST = tktest${EXEEXT}
143		CAT32 = cat32$(EXEEXT)
144		MAN2TCL = man2tcl$(EXEEXT)
	144	TKTEST = tktest${EXESUFFIX}
	145	CAT32 = cat32${EXESUFFIX}
	146	MAN2TCL = man2tcl${EXESUFFIX}
145	147
146	148	@SET_MAKE@
147	149

149	151	# makefile to look into these paths when resolving .c to .obj
150	152	# dependencies.
151	153
152		VPATH = $(GENERIC_DIR):$(TTK_DIR):$(WIN_DIR):$(UNIX_DIR):$(XLIB_DIR):$(RC_DIR)
	154	VPATH = $(GENERIC_DIR):$(TTK_DIR):$(WIN_DIR):$(XLIB_DIR):$(RC_DIR)
153	155
154	156	# warning flags
155	157	CFLAGS_WARNING = @CFLAGS_WARNING@

167	169	#CFLAGS = $(CFLAGS_DEBUG)
168	170	#CFLAGS = $(CFLAGS_OPTIMIZE)
169	171	#CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
170		CFLAGS = @CFLAGS@ @CFLAGS_DEFAULT@ -DUNICODE -D_UNICODE -D_ATL_XP_TARGETING
	172	CFLAGS = @CFLAGS@ @CFLAGS_DEFAULT@ -D_ATL_XP_TARGETING=1 -D__USE_MINGW_ANSI_STDIO=0
171	173
172	174	# Special compiler flags to use when building man2tcl on Windows.
173	175	MAN2TCLFLAGS = @MAN2TCLFLAGS@

183	185	LDFLAGS = @LDFLAGS@ @LDFLAGS_DEFAULT@
184	186	LDFLAGS_CONSOLE = @LDFLAGS_CONSOLE@
185	187	LDFLAGS_WINDOW = @LDFLAGS_WINDOW@
186		EXEEXT = @EXEEXT@
187	188	OBJEXT = @OBJEXT@
188	189	STLIB_LD = @STLIB_LD@
189	190	SHLIB_LD = @SHLIB_LD@
190	191	SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
191	192	SHLIB_CFLAGS = @SHLIB_CFLAGS@
192	193	SHLIB_SUFFIX = @SHLIB_SUFFIX@
193		VER = @TK_MAJOR_VERSION@@TK_MINOR_VERSION@
194		DOTVER = @TK_MAJOR_VERSION@.@TK_MINOR_VERSION@
195	194	LIBS = $(TCL_STUB_LIB_FILE) @LIBS@ @LIBS_GUI@
196	195	RMDIR = rm -rf
197	196	MKDIR = mkdir -p

629	628	$(TCL_SRC_DIR)/win/cat.c:
630	629
631	630	cat32.${OBJEXT}: $(TCL_SRC_DIR)/win/cat.c
632		$(CC) -c $(CC_SWITCHES) "$(TCL_SRC_DIR)/win/cat.c" $(CC_OBJNAME)
	631	$(CC) -c $(CC_SWITCHES) -DUNICODE -D_UNICODE "$(TCL_SRC_DIR)/win/cat.c" $(CC_OBJNAME)
633	632
634	633	$(CAT32): cat32.${OBJEXT}
635	634	$(CC) $(CFLAGS) cat32.$(OBJEXT) $(CC_EXENAME) $(LIBS) $(LDFLAGS_CONSOLE)

655	654	# Special case object file targets
656	655
657	656	winMain.$(OBJEXT): winMain.c
658		$(CC) -c $(CC_SWITCHES) @DEPARG@ $(CC_OBJNAME)
	657	$(CC) -c $(CC_SWITCHES) -DUNICODE=1 -D_UNICODE=1 @DEPARG@ $(CC_OBJNAME)
659	658
660	659	testMain.$(OBJEXT): winMain.c
661		$(CC) -c $(CC_SWITCHES) @DEPARG@ -DTK_TEST $(CC_OBJNAME)
	660	$(CC) -c $(CC_SWITCHES) -DTK_TEST -DUNICODE=1 -D_UNICODE=1 @DEPARG@ $(CC_OBJNAME)
662	661
663	662	tkTest.$(OBJEXT): tkTest.c
664	663	$(CC) -c $(CC_SWITCHES) @DEPARG@ $(CC_OBJNAME)

673	672	$(CC) -c $(CC_SWITCHES) @DEPARG@ $(CC_OBJNAME)
674	673
675	674	tkMain2.$(OBJEXT): tkMain.c
676		$(CC) -c $(CC_SWITCHES) -DBUILD_tk -DTK_ASCII_MAIN @DEPARG@ $(CC_OBJNAME)
	675	$(CC) -c $(CC_SWITCHES) -DBUILD_tk -DUNICODE=1 -D_UNICODE=1 @DEPARG@ $(CC_OBJNAME)
	676
	677	tkUnixMenubu.$(OBJEXT): ${UNIX_DIR}/tkUnixMenubu.c
	678	$(CC) -c $(CC_SWITCHES) -DBUILD_tk -DBUILD_ttk @DEPARG@ $(CC_OBJNAME)
	679
	680	tkUnixScale.$(OBJEXT): ${UNIX_DIR}/tkUnixScale.c
	681	$(CC) -c $(CC_SWITCHES) -DBUILD_tk -DBUILD_ttk @DEPARG@ $(CC_OBJNAME)
677	682
678	683	# Extra dependency info
679	684	tkConsole.$(OBJEXT): configure Makefile
680	685	tkMain.$(OBJEXT): configure Makefile
	686	tkMain2.$(OBJEXT): configure Makefile
681	687	tkWindow.$(OBJEXT): configure Makefile
682	688
683	689	# Add the object extension to the implicit rules. By default .obj is not

698	704	depend:
699	705
700	706	cleanhelp:
701		$(RM) .hlp .cnt .hpj .GID *.rtf man2tcl${EXEEXT}
	707	$(RM) .hlp .cnt .hpj .GID *.rtf man2tcl.exe
702	708
703	709	clean: cleanhelp
704	710	$(RM) .lib .a .exp .dll .res .${OBJEXT} ~ \# TAGS a.out

+94

-172

win/configure less more

1311	1311	TK_VERSION=8.6
1312	1312	TK_MAJOR_VERSION=8
1313	1313	TK_MINOR_VERSION=6
1314		TK_PATCH_LEVEL=".10"
	1314	TK_PATCH_LEVEL=".11"
1315	1315	VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION
1316	1316
1317	1317	#------------------------------------------------------------------------

3089	3089	else
3090	3090	tcl_ok=yes
3091	3091	fi;
3092
3093		if test "${enable_shared+set}" = set; then
3094		enableval="$enable_shared"
3095		tcl_ok=$enableval
3096		else
3097		tcl_ok=yes
3098		fi
3099
3100	3092	if test "$tcl_ok" = "yes" ; then
3101	3093	echo "$as_me:$LINENO: result: shared" >&5
3102	3094	echo "${ECHO_T}shared" >&6

3310	3302	# after SC_ENABLE_SHARED checks the configure switches.
3311	3303	#--------------------------------------------------------------------
3312	3304
3313		# On IRIX 5.3, sys/types and inttypes.h are conflicting.
3314
3315
3316
3317
3318
3319
3320
3321
3322
3323		for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
3324		inttypes.h stdint.h unistd.h
3325		do
3326		as_ac_Header=`echo "ac_cv_header_$ac_header" \| $as_tr_sh`
3327		echo "$as_me:$LINENO: checking for $ac_header" >&5
3328		echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
3329		if eval "test \"\${$as_ac_Header+set}\" = set"; then
3330		echo $ECHO_N "(cached) $ECHO_C" >&6
3331		else
3332		cat >conftest.$ac_ext <<_ACEOF
3333		/* confdefs.h. */
3334		_ACEOF
3335		cat confdefs.h >>conftest.$ac_ext
3336		cat >>conftest.$ac_ext <<_ACEOF
3337		/* end confdefs.h. */
3338		$ac_includes_default
3339
3340		#include <$ac_header>
3341		_ACEOF
3342		rm -f conftest.$ac_objext
3343		if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3344		(eval $ac_compile) 2>conftest.er1
3345		ac_status=$?
3346		grep -v '^ *+' conftest.er1 >conftest.err
3347		rm -f conftest.er1
3348		cat conftest.err >&5
3349		echo "$as_me:$LINENO: \$? = $ac_status" >&5
3350		(exit $ac_status); } &&
3351		{ ac_try='test -z "$ac_c_werror_flag"
3352		\|\| test ! -s conftest.err'
3353		{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3354		(eval $ac_try) 2>&5
3355		ac_status=$?
3356		echo "$as_me:$LINENO: \$? = $ac_status" >&5
3357		(exit $ac_status); }; } &&
3358		{ ac_try='test -s conftest.$ac_objext'
3359		{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3360		(eval $ac_try) 2>&5
3361		ac_status=$?
3362		echo "$as_me:$LINENO: \$? = $ac_status" >&5
3363		(exit $ac_status); }; }; then
3364		eval "$as_ac_Header=yes"
3365		else
3366		echo "$as_me: failed program was:" >&5
3367		sed 's/^/\| /' conftest.$ac_ext >&5
3368
3369		eval "$as_ac_Header=no"
3370		fi
3371		rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
3372		fi
3373		echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
3374		echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
3375		if test `eval echo '${'$as_ac_Header'}'` = yes; then
3376		cat >>confdefs.h <<_ACEOF
3377		#define `echo "HAVE_$ac_header" \| $as_tr_cpp` 1
3378		_ACEOF
3379
3380		fi
3381
3382		done
3383
3384
3385	3305
3386	3306
3387	3307	# Step 0: Enable 64 bit support?

3540	3460	if test "$ac_cv_cross" = "yes"; then
3541	3461	case "$do64bit" in
3542	3462	amd64\|x64\|yes)
3543		CC="x86_64-w64-mingw32-gcc"
	3463	CC="x86_64-w64-mingw32-${CC}"
3544	3464	LD="x86_64-w64-mingw32-ld"
3545	3465	AR="x86_64-w64-mingw32-ar"
3546	3466	RANLIB="x86_64-w64-mingw32-ranlib"
3547	3467	RC="x86_64-w64-mingw32-windres"
3548	3468	;;
3549	3469	*)
3550		CC="i686-w64-mingw32-gcc"
	3470	CC="i686-w64-mingw32-${CC}"
3551	3471	LD="i686-w64-mingw32-ld"
3552	3472	AR="i686-w64-mingw32-ar"
3553	3473	RANLIB="i686-w64-mingw32-ranlib"

3784	3704	SHLIB_LD='${CC} -shared'
3785	3705	SHLIB_LD_LIBS='${LIBS}'
3786	3706	MAKE_DLL="\${SHLIB_LD} \$(LDFLAGS) -o \$@ ${extra_ldflags} \
3787		-Wl,--out-implib,\$(patsubst %.dll,lib%.a,\$@)"
	3707	-Wl,--out-implib,\$(patsubst %.dll,lib%.dll.a,\$@)"
3788	3708	# DLLSUFFIX is separate because it is the building block for
3789	3709	# users of tclConfig.sh that may build shared or static.
3790	3710	DLLSUFFIX="\${DBGX}.dll"

3796	3716
3797	3717	CFLAGS_DEBUG=-g
3798	3718	CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer"
3799		CFLAGS_WARNING="-Wall -Wdeclaration-after-statement"
	3719	CFLAGS_WARNING="-Wall -Wpointer-arith"
3800	3720	LDFLAGS_DEBUG=
3801	3721	LDFLAGS_OPTIMIZE=
	3722
	3723	case "${CC}" in
	3724	*++)
	3725	CFLAGS_WARNING="${CFLAGS_WARNING} -Wno-format"
	3726	;;
	3727	*)
	3728	CFLAGS_WARNING="${CFLAGS_WARNING} -Wdeclaration-after-statement"
	3729	;;
	3730	esac
3802	3731
3803	3732	# Specify the CC output file names based on the target name
3804	3733	CC_OBJNAME="-o \$@"

3922	3851	LIBSUFFIX="\${DBGX}.lib"
3923	3852	LIBFLAGSUFFIX="\${DBGX}"
3924	3853
3925		# This is a 2-stage check to make sure we have the 64-bit SDK
3926		# We have to know where the SDK is installed.
3927		# This magic is based on MS Platform SDK for Win2003 SP1 - hobbs
3928	3854	if test "$do64bit" != "no" ; then
3929		if test "x${MSSDK}x" = "xx" ; then
3930		MSSDK="C:/Progra~1/Microsoft Platform SDK"
3931		fi
3932		MSSDK=`echo "$MSSDK" \| sed -e 's!\\\!/!g'`
3933		PATH64=""
3934	3855	case "$do64bit" in
3935	3856	amd64\|x64\|yes)
3936	3857	MACHINE="AMD64" ; # assume AMD64 as default 64-bit build
3937		PATH64="${MSSDK}/Bin/Win64/x86/AMD64"
3938	3858	;;
3939	3859	ia64)
3940	3860	MACHINE="IA64"
3941		PATH64="${MSSDK}/Bin/Win64"
3942	3861	;;
3943	3862	esac
3944		if test ! -d "${PATH64}" ; then
3945		{ echo "$as_me:$LINENO: WARNING: Could not find 64-bit $MACHINE SDK" >&5
3946		echo "$as_me: WARNING: Could not find 64-bit $MACHINE SDK" >&2;}
3947		fi
3948	3863	echo "$as_me:$LINENO: result: Using 64-bit $MACHINE mode" >&5
3949	3864	echo "${ECHO_T} Using 64-bit $MACHINE mode" >&6
3950	3865	fi

3960	3875	esac
3961	3876
3962	3877	if test "$do64bit" != "no" ; then
3963		# The space-based-path will work for the Makefile, but will
3964		# not work if AC_TRY_COMPILE is called. TEA has the
3965		# TEA_PATH_NOSPACE to avoid this issue.
3966		# Check if _WIN64 is already recognized, and if so we don't
3967		# need to modify CC.
3968		echo "$as_me:$LINENO: checking whether _WIN64 is declared" >&5
3969		echo $ECHO_N "checking whether _WIN64 is declared... $ECHO_C" >&6
3970		if test "${ac_cv_have_decl__WIN64+set}" = set; then
3971		echo $ECHO_N "(cached) $ECHO_C" >&6
3972		else
3973		cat >conftest.$ac_ext <<_ACEOF
3974		/* confdefs.h. */
3975		_ACEOF
3976		cat confdefs.h >>conftest.$ac_ext
3977		cat >>conftest.$ac_ext <<_ACEOF
3978		/* end confdefs.h. */
3979		$ac_includes_default
3980		int
3981		main ()
3982		{
3983		#ifndef _WIN64
3984		char p = (char ) _WIN64;
3985		#endif
3986
3987		;
3988		return 0;
3989		}
3990		_ACEOF
3991		rm -f conftest.$ac_objext
3992		if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3993		(eval $ac_compile) 2>conftest.er1
3994		ac_status=$?
3995		grep -v '^ *+' conftest.er1 >conftest.err
3996		rm -f conftest.er1
3997		cat conftest.err >&5
3998		echo "$as_me:$LINENO: \$? = $ac_status" >&5
3999		(exit $ac_status); } &&
4000		{ ac_try='test -z "$ac_c_werror_flag"
4001		\|\| test ! -s conftest.err'
4002		{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4003		(eval $ac_try) 2>&5
4004		ac_status=$?
4005		echo "$as_me:$LINENO: \$? = $ac_status" >&5
4006		(exit $ac_status); }; } &&
4007		{ ac_try='test -s conftest.$ac_objext'
4008		{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4009		(eval $ac_try) 2>&5
4010		ac_status=$?
4011		echo "$as_me:$LINENO: \$? = $ac_status" >&5
4012		(exit $ac_status); }; }; then
4013		ac_cv_have_decl__WIN64=yes
4014		else
4015		echo "$as_me: failed program was:" >&5
4016		sed 's/^/\| /' conftest.$ac_ext >&5
4017
4018		ac_cv_have_decl__WIN64=no
4019		fi
4020		rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
4021		fi
4022		echo "$as_me:$LINENO: result: $ac_cv_have_decl__WIN64" >&5
4023		echo "${ECHO_T}$ac_cv_have_decl__WIN64" >&6
4024		if test $ac_cv_have_decl__WIN64 = yes; then
4025		:
4026		else
4027		CC="\"${PATH64}/cl.exe\" -I\"${MSSDK}/Include\" \
4028		-I\"${MSSDK}/Include/crt\" \
4029		-I\"${MSSDK}/Include/crt/sys\""
4030		fi
4031
4032		RC="\"${MSSDK}/bin/rc.exe\""
	3878	RC="rc"
4033	3879	CFLAGS_DEBUG="-nologo -Zi -Od ${runtime}d"
4034	3880	# Do not use -O2 for Win64 - this has proved buggy in code gen.
4035	3881	CFLAGS_OPTIMIZE="-nologo -O1 ${runtime}"
4036		lflags="${lflags} -nologo -MACHINE:${MACHINE} -LIBPATH:\"${MSSDK}/Lib/${MACHINE}\""
4037		LINKBIN="\"${PATH64}/link.exe\""
	3882	lflags="${lflags} -nologo -MACHINE:${MACHINE}"
	3883	LINKBIN="link"
4038	3884	# Avoid 'unresolved external symbol __security_cookie' errors.
4039	3885	# c.f. http://support.microsoft.com/?id=894573
4040	3886	LIBS="$LIBS bufferoverflowU.lib"

4496	4342	# man2tcl needs this so that it can use errno.h
4497	4343	#--------------------------------------------------------------------
4498	4344
	4345	# On IRIX 5.3, sys/types and inttypes.h are conflicting.
	4346
	4347
	4348
	4349
	4350
	4351
	4352
	4353
	4354
	4355	for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
	4356	inttypes.h stdint.h unistd.h
	4357	do
	4358	as_ac_Header=`echo "ac_cv_header_$ac_header" \| $as_tr_sh`
	4359	echo "$as_me:$LINENO: checking for $ac_header" >&5
	4360	echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
	4361	if eval "test \"\${$as_ac_Header+set}\" = set"; then
	4362	echo $ECHO_N "(cached) $ECHO_C" >&6
	4363	else
	4364	cat >conftest.$ac_ext <<_ACEOF
	4365	/* confdefs.h. */
	4366	_ACEOF
	4367	cat confdefs.h >>conftest.$ac_ext
	4368	cat >>conftest.$ac_ext <<_ACEOF
	4369	/* end confdefs.h. */
	4370	$ac_includes_default
	4371
	4372	#include <$ac_header>
	4373	_ACEOF
	4374	rm -f conftest.$ac_objext
	4375	if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
	4376	(eval $ac_compile) 2>conftest.er1
	4377	ac_status=$?
	4378	grep -v '^ *+' conftest.er1 >conftest.err
	4379	rm -f conftest.er1
	4380	cat conftest.err >&5
	4381	echo "$as_me:$LINENO: \$? = $ac_status" >&5
	4382	(exit $ac_status); } &&
	4383	{ ac_try='test -z "$ac_c_werror_flag"
	4384	\|\| test ! -s conftest.err'
	4385	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
	4386	(eval $ac_try) 2>&5
	4387	ac_status=$?
	4388	echo "$as_me:$LINENO: \$? = $ac_status" >&5
	4389	(exit $ac_status); }; } &&
	4390	{ ac_try='test -s conftest.$ac_objext'
	4391	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
	4392	(eval $ac_try) 2>&5
	4393	ac_status=$?
	4394	echo "$as_me:$LINENO: \$? = $ac_status" >&5
	4395	(exit $ac_status); }; }; then
	4396	eval "$as_ac_Header=yes"
	4397	else
	4398	echo "$as_me: failed program was:" >&5
	4399	sed 's/^/\| /' conftest.$ac_ext >&5
	4400
	4401	eval "$as_ac_Header=no"
	4402	fi
	4403	rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
	4404	fi
	4405	echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
	4406	echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
	4407	if test `eval echo '${'$as_ac_Header'}'` = yes; then
	4408	cat >>confdefs.h <<_ACEOF
	4409	#define `echo "HAVE_$ac_header" \| $as_tr_cpp` 1
	4410	_ACEOF
	4411
	4412	fi
	4413
	4414	done
	4415
	4416
4499	4417	if test "${ac_cv_header_errno_h+set}" = set; then
4500	4418	echo "$as_me:$LINENO: checking for errno.h" >&5
4501	4419	echo $ECHO_N "checking for errno.h... $ECHO_C" >&6

5030	4948	eval "TK_SRC_DIR=\"`cd $srcdir/..; pwd`\""
5031	4949
5032	4950	eval "TK_DLL_FILE=tk$VER${DLLSUFFIX}"
5033		eval "TK_LIB_FILE=${LIBPREFIX}tk$VER${LIBSUFFIX}"
	4951	if test ${SHARED_BUILD} = 0 ; then
	4952	eval "TK_LIB_FILE=${LIBPREFIX}tk${VER}${LIBSUFFIX}"
	4953	else
	4954	eval "TK_LIB_FILE=${LIBPREFIX}tk${VER}${DLLSUFFIX}.a"
	4955	fi
5034	4956
5035	4957	eval "TK_STUB_LIB_FILE=${LIBPREFIX}tkstub${VER}${LIBSUFFIX}"
5036	4958	# FIXME: All of this var junk needs to be done in tcl.m4 !!!!

+6

-2

win/configure.in less more

13	13	TK_VERSION=8.6
14	14	TK_MAJOR_VERSION=8
15	15	TK_MINOR_VERSION=6
16		TK_PATCH_LEVEL=".10"
	16	TK_PATCH_LEVEL=".11"
17	17	VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION
18	18
19	19	#------------------------------------------------------------------------

165	165	eval "TK_SRC_DIR=\"`cd $srcdir/..; pwd`\""
166	166
167	167	eval "TK_DLL_FILE=tk$VER${DLLSUFFIX}"
168		eval "TK_LIB_FILE=${LIBPREFIX}tk$VER${LIBSUFFIX}"
	168	if test ${SHARED_BUILD} = 0 ; then
	169	eval "TK_LIB_FILE=${LIBPREFIX}tk${VER}${LIBSUFFIX}"
	170	else
	171	eval "TK_LIB_FILE=${LIBPREFIX}tk${VER}${DLLSUFFIX}.a"
	172	fi
169	173
170	174	eval "TK_STUB_LIB_FILE=${LIBPREFIX}tkstub${VER}${LIBSUFFIX}"
171	175	# FIXME: All of this var junk needs to be done in tcl.m4 !!!!

+7

-8

win/makefile.vc less more

57	57	# 64-bit compiler, if your SDK has it.
58	58	#
59	59	# Examples:
60		# Assumign Tcl sources lie in ../../tcl
	60	# Assuming Tcl sources lie in ../../tcl
61	61	# c:\tcl_src\win\>nmake -f makefile.vc release
62	62	# If Tcl sources are not in ../../tcl, use the TCLDIR macro to specify dir
63	63	# c:\tcl_src\win\>nmake -f makefile.vc release TCLDIR=c:\src\tcl

65	65	# c:\tcl_src\win\>nmake -f makefile.vc test
66	66	# Install Tk in location specified by INSTALLDIR macro
67	67	# c:\tcl_src\win\>nmake -f makefile.vc install INSTALLDIR=c:\progra~1\tcl
68		# Build release with PDF files
	68	# Build release with PDB files
69	69	# c:\tcl_src\win\>nmake -f makefile.vc release OPTS=pdbs
70	70	# Build debug version
71	71	# c:\tcl_src\win\>nmake -f makefile.vc release OPTS=symbols

305	305
306	306	CONFIG_DEFS =/DSTDC_HEADERS=1 /DHAVE_SYS_TYPES_H=1 /DHAVE_SYS_STAT_H=1 \
307	307	/DHAVE_STDLIB_H=1 /DHAVE_STRING_H=1 /DHAVE_MEMORY_H=1 \
308		/DHAVE_STRINGS_H=1 /DHAVE_INTTYPES_H=1 \
309		/DSUPPORT_CONFIG_EMBEDDED /DUNICODE /D_UNICODE \
	308	/DHAVE_STRINGS_H=1 \
310	309	!if $(HAVE_UXTHEME_H)
311	310	/DHAVE_UXTHEME_H=1 \
312	311	!endif

454	453
455	454
456	455	$(CAT32): $(_TCLDIR)\win\cat.c
457		$(cc32) $(cflags) $(crt) /D_CRT_NONSTDC_NO_DEPRECATE /DCONSOLE -Fo$(TMP_DIR)\ $?
	456	$(cc32) $(cflags) $(crt) /D_CRT_NONSTDC_NO_DEPRECATE /DCONSOLE /DUNICODE /D_UNICODE -Fo$(TMP_DIR)\ $?
458	457	$(CONEXECMD) /DCONSOLE -stack:16384 $(TMP_DIR)\cat.obj
459	458	$(_VC_MANIFEST_EMBED_EXE)
460	459

530	529	#---------------------------------------------------------------------
531	530
532	531	$(TMP_DIR)\testMain.obj: $(WIN_DIR)\winMain.c
533		$(cc32) $(appcflags_nostubs) /DTK_TEST \
	532	$(cc32) $(appcflags_nostubs) /DTK_TEST /DUNICODE /D_UNICODE \
534	533	/DTCL_USE_STATIC_PACKAGES=$(TCL_USE_STATIC_PACKAGES) \
535	534	-Fo$@ $?
536	535

547	546	$(cc32) $(appcflags_nostubs) -Fo$@ $?
548	547
549	548	$(TMP_DIR)\winMain.obj: $(WIN_DIR)\winMain.c
550		$(cc32) $(appcflags_nostubs) \
	549	$(cc32) $(appcflags_nostubs) /DUNICODE /D_UNICODE \
551	550	/DTCL_USE_STATIC_PACKAGES=$(TCL_USE_STATIC_PACKAGES) \
552	551	-Fo$@ $?
553	552
554	553	$(TMP_DIR)\tkMain2.obj: $(GENERICDIR)\tkMain.c
555		$(cc32) $(pkgcflags) /DTK_ASCII_MAIN -Fo$@ $?
	554	$(cc32) $(pkgcflags) /DUNICODE /D_UNICODE -Fo$@ $?
556	555
557	556	# The following objects are part of the stub library and should not
558	557	# be built as DLL objects but none of the symbols should be exported

+2

-2

win/rules-ext.vc less more

30	30	# We extract version numbers using the nmakehlp program. For now use
31	31	# the local copy of nmakehlp. Once we locate Tcl, we will use that
32	32	# one if it is newer.
33		!if [$(CC) -nologo "nmakehlp.c" -link -subsystem:console > nul]
	33	!if [$(CC) -nologo -DNDEBUG "nmakehlp.c" -link -subsystem:console > nul]
34	34	!endif
35	35
36	36	# First locate the Tcl directory that we are working with.
37		!ifdef TCLDIR
	37	!if "$(TCLDIR)" != ""
38	38
39	39	_RULESDIR = $(TCLDIR:/=\)
40	40

+213

-143

win/rules.vc less more

5	5	# compiler switches, defining common targets and macros. The Tcl makefile
6	6	# directly includes this. Extensions include it via "rules-ext.vc".
7	7	#
8		# See TIP 477 (https://core.tcl-lang.org/tips/doc/trunk/tip/477.md) for
	8	# See TIP 477 (https://core.tcl-lang.org/tips/doc/main/tip/477.md) for
9	9	# detailed documentation.
10	10	#
11	11	# See the file "license.terms" for information on usage and redistribution

23	23	# For modifications that are not backward-compatible, you must change
24	24	# the major version.
25	25	RULES_VERSION_MAJOR = 1
26		RULES_VERSION_MINOR = 4
	26	RULES_VERSION_MINOR = 8
27	27
28	28	# The PROJECT macro must be defined by parent makefile.
29	29	!if "$(PROJECT)" == ""

301	301	_TCLDIR = $(_INSTALLDIR)\..
302	302	_TCL_H = $(_TCLDIR)\include\tcl.h
303	303
304		!else # exist(...) && ! $(NEED_TCL_SOURCE)
	304	!else # exist(...) && !$(NEED_TCL_SOURCE)
305	305
306	306	!if [echo _TCLDIR = \> nmakehlp.out] \
307	307	\|\| [nmakehlp -L generic\tcl.h >> nmakehlp.out]

312	312	TCLDIR = $(_TCLDIR)
313	313	_TCL_H = $(_TCLDIR)\generic\tcl.h
314	314
315		!endif # exist(...) && ! $(NEED_TCL_SOURCE)
	315	!endif # exist(...) && !$(NEED_TCL_SOURCE)
316	316
317	317	!endif # TCLDIR
318	318

414	414	# NATIVE_ARCH - set to IX86 or AMD64 for the host machine
415	415	# MACHINE - same as $(ARCH) - legacy
416	416	# _VC_MANIFEST_EMBED_{DLL,EXE} - commands for embedding a manifest if needed
417		# CFG_ENCODING - set to an character encoding.
418		# TBD - this is passed to compiler as TCL_CFGVAL_ENCODING but can't
419		# see where it is used
420	417
421	418	cc32 = $(CC) # built-in default.
422	419	link32 = link

502	499	_VC_MANIFEST_EMBED_DLL=if exist $@.manifest mt -nologo -manifest $@.manifest -outputresource:$@;2
503	500	!endif
504	501
505		!ifndef CFG_ENCODING
506		CFG_ENCODING = \"cp1252\"
507		!endif
508
509	502	################################################################
510	503	# 4. Build the nmakehlp program
511	504	# This is a helper app we need to overcome nmake's limiting

513	506	# information about supported compiler options etc.
514	507	#
515	508	# Tcl itself will always use the nmakehlp.c program which is
516		# in its own source. This is the "master" copy and kept updated.
	509	# in its own source. It will be kept updated there.
517	510	#
518	511	# Extensions built against an installed Tcl will use the installed
519	512	# copy of Tcl's nmakehlp.c if there is one and their own version

536	529	!if exist("$(_TCLDIR)\lib\nmake\nmakehlp.c")
537	530	NMAKEHLPC = $(_TCLDIR)\lib\nmake\nmakehlp.c
538	531	!endif
539		!else # ! $(TCLINSTALL)
	532	!else # !$(TCLINSTALL)
540	533	!if exist("$(_TCLDIR)\win\nmakehlp.c")
541	534	NMAKEHLPC = $(_TCLDIR)\win\nmakehlp.c
542	535	!endif

658	651	!endif
659	652	!endif
660	653
	654
	655	################################################################
	656	# 6. Extract various version numbers from headers
	657	# For Tcl and Tk, version numbers are extracted from tcl.h and tk.h
	658	# respectively. For extensions, versions are extracted from the
	659	# configure.in or configure.ac from the TEA configuration if it
	660	# exists, and unset otherwise.
	661	# Sets the following macros:
	662	# TCL_MAJOR_VERSION
	663	# TCL_MINOR_VERSION
	664	# TCL_RELEASE_SERIAL
	665	# TCL_PATCH_LEVEL
	666	# TCL_PATCH_LETTER
	667	# TCL_VERSION
	668	# TK_MAJOR_VERSION
	669	# TK_MINOR_VERSION
	670	# TK_RELEASE_SERIAL
	671	# TK_PATCH_LEVEL
	672	# TK_PATCH_LETTER
	673	# TK_VERSION
	674	# DOTVERSION - set as (for example) 2.5
	675	# VERSION - set as (for example 25)
	676	#--------------------------------------------------------------
	677
	678	!if [echo REM = This file is generated from rules.vc > versions.vc]
	679	!endif
	680	!if [echo TCL_MAJOR_VERSION = \>> versions.vc] \
	681	&& [nmakehlp -V "$(_TCL_H)" TCL_MAJOR_VERSION >> versions.vc]
	682	!endif
	683	!if [echo TCL_MINOR_VERSION = \>> versions.vc] \
	684	&& [nmakehlp -V "$(_TCL_H)" TCL_MINOR_VERSION >> versions.vc]
	685	!endif
	686	!if [echo TCL_RELEASE_SERIAL = \>> versions.vc] \
	687	&& [nmakehlp -V "$(_TCL_H)" TCL_RELEASE_SERIAL >> versions.vc]
	688	!endif
	689	!if [echo TCL_PATCH_LEVEL = \>> versions.vc] \
	690	&& [nmakehlp -V "$(_TCL_H)" TCL_PATCH_LEVEL >> versions.vc]
	691	!endif
	692
	693	!if defined(_TK_H)
	694	!if [echo TK_MAJOR_VERSION = \>> versions.vc] \
	695	&& [nmakehlp -V $(_TK_H) TK_MAJOR_VERSION >> versions.vc]
	696	!endif
	697	!if [echo TK_MINOR_VERSION = \>> versions.vc] \
	698	&& [nmakehlp -V $(_TK_H) TK_MINOR_VERSION >> versions.vc]
	699	!endif
	700	!if [echo TK_RELEASE_SERIAL = \>> versions.vc] \
	701	&& [nmakehlp -V "$(_TK_H)" TK_RELEASE_SERIAL >> versions.vc]
	702	!endif
	703	!if [echo TK_PATCH_LEVEL = \>> versions.vc] \
	704	&& [nmakehlp -V $(_TK_H) TK_PATCH_LEVEL >> versions.vc]
	705	!endif
	706	!endif # _TK_H
	707
	708	!include versions.vc
	709
	710	TCL_VERSION = $(TCL_MAJOR_VERSION)$(TCL_MINOR_VERSION)
	711	TCL_DOTVERSION = $(TCL_MAJOR_VERSION).$(TCL_MINOR_VERSION)
	712	!if [nmakehlp -f $(TCL_PATCH_LEVEL) "a"]
	713	TCL_PATCH_LETTER = a
	714	!elseif [nmakehlp -f $(TCL_PATCH_LEVEL) "b"]
	715	TCL_PATCH_LETTER = b
	716	!else
	717	TCL_PATCH_LETTER = .
	718	!endif
	719
	720	!if defined(_TK_H)
	721
	722	TK_VERSION = $(TK_MAJOR_VERSION)$(TK_MINOR_VERSION)
	723	TK_DOTVERSION = $(TK_MAJOR_VERSION).$(TK_MINOR_VERSION)
	724	!if [nmakehlp -f $(TK_PATCH_LEVEL) "a"]
	725	TK_PATCH_LETTER = a
	726	!elseif [nmakehlp -f $(TK_PATCH_LEVEL) "b"]
	727	TK_PATCH_LETTER = b
	728	!else
	729	TK_PATCH_LETTER = .
	730	!endif
	731
	732	!endif
	733
	734	# Set DOTVERSION and VERSION
	735	!if $(DOING_TCL)
	736
	737	DOTVERSION = $(TCL_MAJOR_VERSION).$(TCL_MINOR_VERSION)
	738	VERSION = $(TCL_VERSION)
	739
	740	!elseif $(DOING_TK)
	741
	742	DOTVERSION = $(TK_DOTVERSION)
	743	VERSION = $(TK_VERSION)
	744
	745	!else # Doing a non-Tk extension
	746
	747	# If parent makefile has not defined DOTVERSION, try to get it from TEA
	748	# first from a configure.in file, and then from configure.ac
	749	!ifndef DOTVERSION
	750	!if [echo DOTVERSION = \> versions.vc] \
	751	\|\| [nmakehlp -V $(ROOT)\configure.in ^[$(PROJECT)^] >> versions.vc]
	752	!if [echo DOTVERSION = \> versions.vc] \
	753	\|\| [nmakehlp -V $(ROOT)\configure.ac ^[$(PROJECT)^] >> versions.vc]
	754	!error *** Could not figure out extension version. Please define DOTVERSION in parent makefile before including rules.vc.
	755	!endif
	756	!endif
	757	!include versions.vc
	758	!endif # DOTVERSION
	759	VERSION = $(DOTVERSION:.=)
	760
	761	!endif # $(DOING_TCL) ... etc.
	762
	763	# Windows RC files have 3 version components. Ensure this irrespective
	764	# of how many components the package has specified. Basically, ensure
	765	# minimum 4 components by appending 4 0's and then pick out the first 4.
	766	# Also take care of the fact that DOTVERSION may have "a" or "b" instead
	767	# of "." separating the version components.
	768	DOTSEPARATED=$(DOTVERSION:a=.)
	769	DOTSEPARATED=$(DOTSEPARATED:b=.)
	770	!if [echo RCCOMMAVERSION = \> versions.vc] \
	771	\|\| [for /f "tokens=1,2,3,4,5* delims=." %a in ("$(DOTSEPARATED).0.0.0.0") do echo %a,%b,%c,%d >> versions.vc]
	772	!error * Could not generate RCCOMMAVERSION *
	773	!endif
	774	!include versions.vc
	775
661	776	########################################################################
662		# 6. Parse the OPTS macro to work out the requested build configuration.
	777	# 7. Parse the OPTS macro to work out the requested build configuration.
663	778	# Based on this, we will construct the actual switches to be passed to the
664	779	# compiler and linker using the macros defined in the previous section.
665	780	# The following macros are defined by this section based on OPTS

673	788	# MSVCRT - 1 -> link to dynamic C runtime even when building static Tcl build
674	789	# 0 -> link to static C runtime for static Tcl build.
675	790	# Does not impact shared Tcl builds (STATIC_BUILD == 0)
	791	# Default: 1 for Tcl 8.7 and up, 0 otherwise.
676	792	# TCL_USE_STATIC_PACKAGES - 1 -> statically link the registry and dde extensions
677		# in the Tcl shell. 0 -> keep them as shared libraries
678		# Does not impact shared Tcl builds.
	793	# in the Tcl and Wish shell. 0 -> keep them as shared libraries. Does
	794	# not impact shared Tcl builds. Implied by STATIC_BUILD since Tcl 8.7.
679	795	# USE_THREAD_ALLOC - 1 -> Use a shared global free pool for allocation.
680	796	# 0 -> Use the non-thread allocator.
681	797	# UNCHECKED - 1 -> when doing a debug build with symbols, use the release

684	800	# CONFIG_CHECK - 1 -> check current build configuration against Tcl
685	801	# configuration (ignored for Tcl itself)
686	802	# _USE_64BIT_TIME_T - forces a build using 64-bit time_t for 32-bit build
687		# (CRT library should support this)
	803	# (CRT library should support this, not needed for Tcl 9.x)
	804	# TCL_UTF_MAX=4 - forces a build allowing 4-byte UTF-8 sequences internally.
	805	# (Not needed for Tcl 9.x)
688	806	# Further, LINKERFLAGS are modified based on above.
689	807
690	808	# Default values for all the above

727	845	!else
728	846	!if [nmakehlp -f $(OPTS) "msvcrt"]
729	847	!message *** Doing msvcrt
730		MSVCRT = 1
731		!else
732		!if !$(STATIC_BUILD)
733		MSVCRT = 1
734		!else
	848	!else
	849	!if $(TCL_MAJOR_VERSION) == 8 && $(TCL_MINOR_VERSION) < 7 && $(STATIC_BUILD)
735	850	MSVCRT = 0
736	851	!endif
737	852	!endif

740	855	!if [nmakehlp -f $(OPTS) "staticpkg"] && $(STATIC_BUILD)
741	856	!message *** Doing staticpkg
742	857	TCL_USE_STATIC_PACKAGES = 1
743		!else
744		TCL_USE_STATIC_PACKAGES = 0
745	858	!endif
746	859
747	860	!if [nmakehlp -f $(OPTS) "nothreads"]
748	861	!message *** Compile explicitly for non-threaded tcl
749	862	TCL_THREADS = 0
750	863	USE_THREAD_ALLOC= 0
751		!else
752		TCL_THREADS = 1
753		USE_THREAD_ALLOC= 1
754		!endif
755
	864	!endif
	865
	866	!if $(TCL_MAJOR_VERSION) == 8
756	867	!if [nmakehlp -f $(OPTS) "time64bit"]
757	868	!message *** Force 64-bit time_t
758	869	_USE_64BIT_TIME_T = 1
	870	!endif
	871
	872	!if [nmakehlp -f $(OPTS) "utfmax"]
	873	!message *** Force allowing 4-byte UTF-8 sequences internally
	874	TCL_UTF_MAX = 4
	875	!endif
759	876	!endif
760	877
761	878	# Yes, it's weird that the "symbols" option controls DEBUG and

841	958	!endif
842	959
843	960	################################################################
844		# 7. Parse the STATS macro to configure code instrumentation
	961	# 8. Parse the STATS macro to configure code instrumentation
845	962	# The following macros are set by this section:
846	963	# TCL_MEM_DEBUG - 1 -> enables memory allocation instrumentation
847	964	# 0 -> disables

871	988	!endif
872	989
873	990	####################################################################
874		# 8. Parse the CHECKS macro to configure additional compiler checks
	991	# 9. Parse the CHECKS macro to configure additional compiler checks
875	992	# The following macros are set by this section:
876	993	# WARNINGS - compiler switches that control the warnings level
877	994	# TCL_NO_DEPRECATED - 1 -> disable support for deprecated functions

903	1020
904	1021	!endif
905	1022
906		################################################################
907		# 9. Extract various version numbers
908		# For Tcl and Tk, version numbers are extracted from tcl.h and tk.h
909		# respectively. For extensions, versions are extracted from the
910		# configure.in or configure.ac from the TEA configuration if it
911		# exists, and unset otherwise.
912		# Sets the following macros:
913		# TCL_MAJOR_VERSION
914		# TCL_MINOR_VERSION
915		# TCL_PATCH_LEVEL
916		# TCL_VERSION
917		# TK_MAJOR_VERSION
918		# TK_MINOR_VERSION
919		# TK_PATCH_LEVEL
920		# TK_VERSION
921		# DOTVERSION - set as (for example) 2.5
922		# VERSION - set as (for example 25)
923		#--------------------------------------------------------------
924
925		!if [echo REM = This file is generated from rules.vc > versions.vc]
926		!endif
927		!if [echo TCL_MAJOR_VERSION = \>> versions.vc] \
928		&& [nmakehlp -V "$(_TCL_H)" TCL_MAJOR_VERSION >> versions.vc]
929		!endif
930		!if [echo TCL_MINOR_VERSION = \>> versions.vc] \
931		&& [nmakehlp -V "$(_TCL_H)" TCL_MINOR_VERSION >> versions.vc]
932		!endif
933		!if [echo TCL_PATCH_LEVEL = \>> versions.vc] \
934		&& [nmakehlp -V "$(_TCL_H)" TCL_PATCH_LEVEL >> versions.vc]
935		!endif
936
937		!if defined(_TK_H)
938		!if [echo TK_MAJOR_VERSION = \>> versions.vc] \
939		&& [nmakehlp -V $(_TK_H) TK_MAJOR_VERSION >> versions.vc]
940		!endif
941		!if [echo TK_MINOR_VERSION = \>> versions.vc] \
942		&& [nmakehlp -V $(_TK_H) TK_MINOR_VERSION >> versions.vc]
943		!endif
944		!if [echo TK_PATCH_LEVEL = \>> versions.vc] \
945		&& [nmakehlp -V $(_TK_H) TK_PATCH_LEVEL >> versions.vc]
946		!endif
947		!endif # _TK_H
948
949		!include versions.vc
950
951		TCL_VERSION = $(TCL_MAJOR_VERSION)$(TCL_MINOR_VERSION)
952		TCL_DOTVERSION = $(TCL_MAJOR_VERSION).$(TCL_MINOR_VERSION)
953		!if defined(_TK_H)
954		TK_VERSION = $(TK_MAJOR_VERSION)$(TK_MINOR_VERSION)
955		TK_DOTVERSION = $(TK_MAJOR_VERSION).$(TK_MINOR_VERSION)
956		!endif
957
958		# Set DOTVERSION and VERSION
959		!if $(DOING_TCL)
960
961		DOTVERSION = $(TCL_MAJOR_VERSION).$(TCL_MINOR_VERSION)
962		VERSION = $(TCL_VERSION)
963
964		!elseif $(DOING_TK)
965
966		DOTVERSION = $(TK_DOTVERSION)
967		VERSION = $(TK_VERSION)
968
969		!else # Doing a non-Tk extension
970
971		# If parent makefile has not defined DOTVERSION, try to get it from TEA
972		# first from a configure.in file, and then from configure.ac
973		!ifndef DOTVERSION
974		!if [echo DOTVERSION = \> versions.vc] \
975		\|\| [nmakehlp -V $(ROOT)\configure.in ^[$(PROJECT)^] >> versions.vc]
976		!if [echo DOTVERSION = \> versions.vc] \
977		\|\| [nmakehlp -V $(ROOT)\configure.ac ^[$(PROJECT)^] >> versions.vc]
978		!error *** Could not figure out extension version. Please define DOTVERSION in parent makefile before including rules.vc.
979		!endif
980		!endif
981		!include versions.vc
982		!endif # DOTVERSION
983		VERSION = $(DOTVERSION:.=)
984
985		!endif # $(DOING_TCL) ... etc.
986	1023
987	1024	################################################################
988	1025	# 10. Construct output directory and file paths

1028	1065	BUILDDIRTOP =$(BUILDDIRTOP)_VC$(VCVER)
1029	1066	!endif
1030	1067
1031		!if !$(DEBUG) \|\| $(DEBUG) && $(UNCHECKED)
	1068	!if !$(DEBUG) \|\| $(TCL_VERSION) > 86 \|\| $(DEBUG) && $(UNCHECKED)
1032	1069	SUFX = $(SUFX:g=)
1033	1070	!endif
1034	1071

1079	1116	# The name of the stubs library for the project being built
1080	1117	STUBPREFIX = $(PROJECT)stub
1081	1118
	1119	#
1082	1120	# Set up paths to various Tcl executables and libraries needed by extensions
	1121	#
	1122
	1123	# TIP 430. Unused for 8.6 but no harm defining it to allow a common rules.vc
	1124	!if "$(TCL_PATCH_LETTER)" == "."
	1125	TCLSCRIPTZIPNAME = libtcl_$(TCL_MAJOR_VERSION)_$(TCL_MINOR_VERSION)_$(TCL_RELEASE_SERIAL).zip
	1126	!else
	1127	TCLSCRIPTZIPNAME = libtcl_$(TCL_MAJOR_VERSION)_$(TCL_MINOR_VERSION)_$(TCL_PATCH_LETTER)$(TCL_RELEASE_SERIAL).zip
	1128	!endif
	1129	!if "$(TK_PATCH_LETTER)" == "."
	1130	TKSCRIPTZIPNAME = libtk_$(TK_MAJOR_VERSION)_$(TK_MINOR_VERSION)_$(TK_RELEASE_SERIAL).zip
	1131	!else
	1132	TKSCRIPTZIPNAME = libtk_$(TK_MAJOR_VERSION)_$(TK_MINOR_VERSION)_$(TK_PATCH_LETTER)$(TK_RELEASE_SERIAL).zip
	1133	!endif
	1134
1083	1135	!if $(DOING_TCL)
1084
1085	1136	TCLSHNAME = $(PROJECT)sh$(VERSION)$(SUFX).exe
1086	1137	TCLSH = $(OUT_DIR)\$(TCLSHNAME)
1087	1138	TCLIMPLIB = $(OUT_DIR)\$(PROJECT)$(VERSION)$(SUFX).lib
1088	1139	TCLLIBNAME = $(PROJECT)$(VERSION)$(SUFX).$(EXT)
1089	1140	TCLLIB = $(OUT_DIR)\$(TCLLIBNAME)
	1141	TCLSCRIPTZIP = $(OUT_DIR)\$(TCLSCRIPTZIPNAME)
1090	1142
1091	1143	TCLSTUBLIBNAME = $(STUBPREFIX)$(VERSION).lib
1092	1144	TCLSTUBLIB = $(OUT_DIR)\$(TCLSTUBLIBNAME)
1093	1145	TCL_INCLUDES = -I"$(WIN_DIR)" -I"$(GENERICDIR)"
1094	1146
1095		!else # ! $(DOING_TCL)
	1147	!else # !$(DOING_TCL)
1096	1148
1097	1149	!if $(TCLINSTALL) # Building against an installed Tcl
1098	1150

1114	1166	TCL_LIBRARY = $(_TCLDIR)\lib
1115	1167	TCLREGLIB = $(_TCLDIR)\lib\tclreg13$(SUFX:t=).lib
1116	1168	TCLDDELIB = $(_TCLDIR)\lib\tcldde14$(SUFX:t=).lib
	1169	TCLSCRIPTZIP = $(_TCLDIR)\lib\$(TCLSCRIPTZIPNAME)
1117	1170	TCLTOOLSDIR = \must\have\tcl\sources\to\build\this\target
1118	1171	TCL_INCLUDES = -I"$(_TCLDIR)\include"
1119	1172

1133	1186	TCL_LIBRARY = $(_TCLDIR)\library
1134	1187	TCLREGLIB = $(_TCLDIR)\win\$(BUILDDIRTOP)\tclreg13$(SUFX:t=).lib
1135	1188	TCLDDELIB = $(_TCLDIR)\win\$(BUILDDIRTOP)\tcldde14$(SUFX:t=).lib
	1189	TCLSCRIPTZIP = $(_TCLDIR)\win\$(BUILDDIRTOP)\$(TCLSCRIPTZIPNAME)
1136	1190	TCLTOOLSDIR = $(_TCLDIR)\tools
1137	1191	TCL_INCLUDES = -I"$(_TCLDIR)\generic" -I"$(_TCLDIR)\win"
1138	1192

1165	1219	TKSTUBLIB = $(OUT_DIR)\$(TKSTUBLIBNAME)
1166	1220	TKIMPLIB = $(OUT_DIR)\$(TKIMPLIBNAME)
1167	1221	TKLIB = $(OUT_DIR)\$(TKLIBNAME)
1168		TK_INCLUDES = -I"$(WIN_DIR)" -I"$(GENERICDIR)"
	1222	TK_INCLUDES = -I"$(WIN_DIR)" -I"$(GENERICDIR)"
	1223	TKSCRIPTZIP = $(OUT_DIR)\$(TKSCRIPTZIPNAME)
1169	1224
1170	1225	!else # effectively NEED_TK
1171	1226

1180	1235	TKIMPLIB = $(_TKDIR)\lib\$(TKIMPLIBNAME)
1181	1236	!endif
1182	1237	TK_INCLUDES = -I"$(_TKDIR)\include"
	1238	TKSCRIPTZIP = $(_TKDIR)\lib\$(TKSCRIPTZIPNAME)
	1239
1183	1240	!else # Building against Tk sources
	1241
1184	1242	WISH = $(_TKDIR)\win\$(BUILDDIRTOP)\$(WISHNAME)
1185	1243	TKSTUBLIB = $(_TKDIR)\win\$(BUILDDIRTOP)\$(TKSTUBLIBNAME)
1186	1244	TKIMPLIB = $(_TKDIR)\win\$(BUILDDIRTOP)\$(TKIMPLIBNAME)

1191	1249	TKIMPLIB = $(_TKDIR)\win\$(BUILDDIRTOP)\$(TKIMPLIBNAME)
1192	1250	!endif
1193	1251	TK_INCLUDES = -I"$(_TKDIR)\generic" -I"$(_TKDIR)\win" -I"$(_TKDIR)\xlib"
	1252	TKSCRIPTZIP = $(_TKDIR)\win\$(BUILDDIRTOP)\$(TKSCRIPTZIPNAME)
	1253
1194	1254	!endif # TKINSTALL
	1255
1195	1256	tklibs = "$(TKSTUBLIB)" "$(TKIMPLIB)"
1196	1257
1197	1258	!endif # $(DOING_TK)

1232	1293	DOC_INSTALL_DIR = $(_INSTALLDIR)\doc
1233	1294	!if $(DOING_TCL)
1234	1295	SCRIPT_INSTALL_DIR = $(_INSTALLDIR)\lib\$(PROJECT)$(TCL_MAJOR_VERSION).$(TCL_MINOR_VERSION)
	1296	MODULE_INSTALL_DIR = $(_INSTALLDIR)\lib\tcl$(TCL_MAJOR_VERSION)
1235	1297	!else # DOING_TK
1236	1298	SCRIPT_INSTALL_DIR = $(_INSTALLDIR)\lib\$(PROJECT)$(TK_MAJOR_VERSION).$(TK_MINOR_VERSION)
1237	1299	!endif

1276	1338	# baselibs - minimum Windows libraries required. Parent makefile can
1277	1339	# define PRJ_LIBS before including rules.rc if additional libs are needed
1278	1340
1279		OPTDEFINES = /DTCL_CFGVAL_ENCODING=$(CFG_ENCODING) /DSTDC_HEADERS
	1341	OPTDEFINES = /DSTDC_HEADERS
	1342	!if $(VCVERSION) > 1600
	1343	OPTDEFINES = $(OPTDEFINES) /DHAVE_STDINT_H=1
	1344	!else
	1345	OPTDEFINES = $(OPTDEFINES) /DMP_NO_STDINT=1
	1346	!endif
	1347	!if $(VCVERSION) >= 1800
	1348	OPTDEFINES = $(OPTDEFINES) /DHAVE_INTTYPES_H=1 /DHAVE_STDBOOL_H=1
	1349	!endif
1280	1350
1281	1351	!if $(TCL_MEM_DEBUG)
1282	1352	OPTDEFINES = $(OPTDEFINES) /DTCL_MEM_DEBUG

1292	1362	!endif
1293	1363	!if $(STATIC_BUILD)
1294	1364	OPTDEFINES = $(OPTDEFINES) /DSTATIC_BUILD
	1365	!elseif $(TCL_VERSION) > 86
	1366	OPTDEFINES = $(OPTDEFINES) /DTCL_WITH_EXTERNAL_TOMMATH
	1367	!if "$(MACHINE)" == "AMD64"
	1368	OPTDEFINES = $(OPTDEFINES) /DMP_64BIT
	1369	!endif
1295	1370	!endif
1296	1371	!if $(TCL_NO_DEPRECATED)
1297	1372	OPTDEFINES = $(OPTDEFINES) /DTCL_NO_DEPRECATED

1300	1375	!if $(USE_STUBS)
1301	1376	# Note we do not define USE_TCL_STUBS even when building tk since some
1302	1377	# test targets in tk do not use stubs
1303		!if ! $(DOING_TCL)
	1378	!if !$(DOING_TCL)
1304	1379	USE_STUBS_DEFS = /DUSE_TCL_STUBS /DUSE_TCLOO_STUBS
1305	1380	!if $(NEED_TK)
1306	1381	USE_STUBS_DEFS = $(USE_STUBS_DEFS) /DUSE_TK_STUBS

1321	1396	OPTDEFINES = $(OPTDEFINES) /DTCL_CFG_DO64BIT
1322	1397	!endif
1323	1398	!if $(VCVERSION) < 1300
1324		OPTDEFINES = $(OPTDEFINES) /DNO_STRTOI64
1325		!endif
1326
	1399	OPTDEFINES = $(OPTDEFINES) /DNO_STRTOI64=1
	1400	!endif
	1401
	1402	!if "$(TCL_MAJOR_VERSION)" == "8"
1327	1403	!if "$(_USE_64BIT_TIME_T)" == "1"
1328		OPTDEFINES = $(OPTDEFINES) /D_USE_64BIT_TIME_T
	1404	OPTDEFINES = $(OPTDEFINES) /D_USE_64BIT_TIME_T=1
	1405	!endif
	1406	!if "$(TCL_UTF_MAX)" == "4"
	1407	OPTDEFINES = $(OPTDEFINES) /DTCL_UTF_MAX=4
1329	1408	!endif
1330	1409
1331	1410	# _ATL_XP_TARGETING - Newer SDK's need this to build for XP
1332	1411	COMPILERFLAGS = /D_ATL_XP_TARGETING
	1412	!endif
1333	1413
1334	1414	# Like the TEA system only set this non empty for non-Tk extensions
1335	1415	# Note: some extensions use PACKAGE_NAME and others use PACKAGE_TCLNAME

1454	1534	lflags = $(lflags) -nodefaultlib:libucrt.lib
1455	1535	!endif
1456	1536
1457		# Old linkers (Visual C++ 6 in particular) will link for fast loading
1458		# on Win98. Since we do not support Win98 any more, we specify nowin98
1459		# as recommended for NT and later. However, this is only required by
1460		# IX86 on older compilers and only needed if we are not doing a static build.
1461
1462		!if "$(MACHINE)" == "IX86" && !$(STATIC_BUILD)
1463		!if [nmakehlp -l -opt:nowin98 $(LINKER_TESTFLAGS)]
1464		# Align sections for PE size savings.
1465		lflags = $(lflags) -opt:nowin98
1466		!endif
1467		!endif
1468
1469	1537	dlllflags = $(lflags) -dll
1470	1538	conlflags = $(lflags) -subsystem:console
1471	1539	guilflags = $(lflags) -subsystem:windows

1507	1575	RESCMD = $(rc32) -fo $@ -r -i "$(GENERICDIR)" -i "$(TMP_DIR)" \
1508	1576	$(TCL_INCLUDES) \
1509	1577	/DDEBUG=$(DEBUG) -d UNCHECKED=$(UNCHECKED) \
1510		/DCOMMAVERSION=$(DOTVERSION:.=,),0 \
	1578	/DCOMMAVERSION=$(RCCOMMAVERSION) \
1511	1579	/DDOTVERSION=\"$(DOTVERSION)\" \
1512	1580	/DVERSION=\"$(VERSION)\" \
1513	1581	/DSUFX=\"$(SUFX)\" \

1523	1591	!if $(MULTIPLATFORM_INSTALL)
1524	1592	default-pkgindex:
1525	1593	@echo package ifneeded $(PRJ_PACKAGE_TCLNAME) $(DOTVERSION) \
1526		[list load [file join $$dir $(PLATFORM_IDENTIFY) $(PRJLIBNAME)]] > $(OUT_DIR)\pkgIndex.tcl
	1594	[list load [file join $$dir $(PLATFORM_IDENTIFY) $(PRJLIBNAME)] [string totitle $(PRJ_PACKAGE_TCLNAME)]] > $(OUT_DIR)\pkgIndex.tcl
1527	1595	!else
1528	1596	default-pkgindex:
1529	1597	@echo package ifneeded $(PRJ_PACKAGE_TCLNAME) $(DOTVERSION) \
1530		[list load [file join $$dir $(PRJLIBNAME)]] > $(OUT_DIR)\pkgIndex.tcl
	1598	[list load [file join $$dir $(PRJLIBNAME)] [string totitle $(PRJ_PACKAGE_TCLNAME)]] > $(OUT_DIR)\pkgIndex.tcl
1531	1599	!endif
1532	1600
1533	1601	default-pkgindex-tea:

1572	1640	@echo Installing PDBs to '$(LIB_INSTALL_DIR)'
1573	1641	@if not exist "$(LIB_INSTALL_DIR)" mkdir "$(LIB_INSTALL_DIR)"
1574	1642	@$(CPY) "$(OUT_DIR)\*.pdb" "$(LIB_INSTALL_DIR)\"
	1643
	1644	# "emacs font-lock highlighting fix
1575	1645
1576	1646	default-install-docs-html:
1577	1647	@echo Installing documentation files to '$(DOC_INSTALL_DIR)'

1635	1705	!ifdef RCFILE
1636	1706
1637	1707	# Note: don't use $** in below rule because there may be other dependencies
1638		# and only the "master" rc must be passed to the resource compiler
	1708	# and only the "main" rc must be passed to the resource compiler
1639	1709	$(TMP_DIR)\$(PROJECT).res: $(RCDIR)\$(PROJECT).rc
1640	1710	$(RESCMD) $(RCDIR)\$(PROJECT).rc
1641	1711

1689	1759
1690	1760	!if !$(DISABLE_IMPLICIT_RULES)
1691	1761	# Implicit rule definitions - only for building library objects. For stubs and
1692		# main application, the master makefile should define explicit rules.
	1762	# main application, the makefile should define explicit rules.
1693	1763
1694	1764	{$(ROOT)}.c{$(TMP_DIR)}.obj::
1695	1765	$(CCPKGCMD) @<<

1730	1800	# When building an extension, certain configuration options should
1731	1801	# match the ones used when Tcl was built. Here we check and
1732	1802	# warn on a mismatch.
1733		!if ! $(DOING_TCL)
	1803	!if !$(DOING_TCL)
1734	1804
1735	1805	!if $(TCLINSTALL) # Building against an installed Tcl
1736	1806	!if exist("$(_TCLDIR)\lib\nmake\tcl.nmake")
1737	1807	TCLNMAKECONFIG = "$(_TCLDIR)\lib\nmake\tcl.nmake"
1738	1808	!endif
1739		!else # ! $(TCLINSTALL) - building against Tcl source
1740		!if exist("$(OUT_DIR)\tcl.nmake")
1741		TCLNMAKECONFIG = "$(OUT_DIR)\tcl.nmake"
	1809	!else # !$(TCLINSTALL) - building against Tcl source
	1810	!if exist("$(_TCLDIR)\win\$(BUILDDIRTOP)\tcl.nmake")
	1811	TCLNMAKECONFIG = "$(_TCLDIR)\win\$(BUILDDIRTOP)\tcl.nmake"
1742	1812	!endif
1743	1813	!endif # TCLINSTALL
1744	1814

1759	1829
1760	1830	!endif # TCLNMAKECONFIG
1761	1831
1762		!endif # ! $(DOING_TCL)
	1832	!endif # !$(DOING_TCL)
1763	1833
1764	1834
1765	1835	#----------------------------------------------------------

+190

-38

win/stubs.c less more

0		#include "tk.h"
	0	#include "tkInt.h"
1	1
2	2	/*
3	3	* Undocumented Xlib internal function

7	7	_XInitImageFuncPtrs(
8	8	XImage *image)
9	9	{
	10	(void)image;
	11
10	12	return Success;
11	13	}
12	14

20	22	Window w,
21	23	XTextProperty *text_prop)
22	24	{
	25	(void)display;
	26	(void)w;
	27	(void)text_prop;
23	28	}
24	29
25	30	Status

28	33	int count,
29	34	XTextProperty *text_prop_return)
30	35	{
31		return (Status) 0;
	36	(void)list;
	37	(void)count;
	38	(void)text_prop_return;
	39
	40	return Success;
32	41	}
33	42
34	43	/*

46	55	_Xconst unsigned char *data,
47	56	int nelements)
48	57	{
49		return Success;
50		}
51
52		Cursor
53		XCreateGlyphCursor(
54		Display *display,
55		Font source_font,
56		Font mask_font,
57		unsigned int source_char,
58		unsigned int mask_char,
59		XColor _Xconst *foreground_color,
60		XColor _Xconst *background_color)
61		{
62		return 1;
	58	(void)display;
	59	(void)w;
	60	(void)property;
	61	(void)type;
	62	(void)format;
	63	(void)mode;
	64	(void)data;
	65	(void)nelements;
	66
	67	return Success;
63	68	}
64	69
65	70	XIC
66	71	XCreateIC(XIM xim, ...)
67	72	{
	73	(void)xim;
68	74	return NULL;
69	75	}
70	76
71		Cursor
72		XCreatePixmapCursor(
73		Display *display,
74		Pixmap source,
75		Pixmap mask,
76		XColor *foreground_color,
77		XColor *background_color,
78		unsigned int x,
79		unsigned int y)
80		{
81		return (Cursor) NULL;
82		}
83
84	77	int
85	78	XDeleteProperty(
86	79	Display *display,
87	80	Window w,
88	81	Atom property)
89	82	{
90		return Success;
91		}
92
93		void
94		XDestroyIC(
95		XIC ic)
96		{
	83	(void)display;
	84	(void)w;
	85	(void)property;
	86
	87	return Success;
97	88	}
98	89
99	90	Bool

101	92	XEvent *event,
102	93	Window window)
103	94	{
	95	(void)event;
	96	(void)window;
	97
104	98	return 0;
105	99	}
106	100

109	103	Display *display,
110	104	int mode)
111	105	{
	106	(void)display;
	107	(void)mode;
	108
112	109	return Success;
113	110	}
114	111

117	114	Display *display,
118	115	Cursor cursor)
119	116	{
	117	(void)display;
	118	(void)cursor;
	119
120	120	return Success;
121	121	}
122	122

124	124	XGContextFromGC(
125	125	GC gc)
126	126	{
	127	(void)gc;
	128
127	129	return (GContext) NULL;
128	130	}
129	131

132	134	Display *display,
133	135	Atom atom)
134	136	{
	137	(void)display;
	138	(void)atom;
	139
135	140	return NULL;
136	141	}
137	142

141	146	Window w,
142	147	XWindowAttributes *window_attributes_return)
143	148	{
	149	(void)display;
	150	(void)w;
	151	(void)window_attributes_return;
	152
144	153	return Success;
145	154	}
146	155

151	160	Window **windows_return,
152	161	int *count_return)
153	162	{
154		return (Status) 0;
	163	(void)display;
	164	(void)w;
	165	(void)windows_return;
	166	(void)count_return;
	167
	168	return Success;
155	169	}
156	170
157	171	int

160	174	Window w,
161	175	int screen_number)
162	176	{
	177	(void)display;
	178	(void)w;
	179	(void)screen_number;
	180
163	181	return Success;
164	182	}
165	183

169	187	int *nhosts_return,
170	188	Bool *state_return)
171	189	{
	190	(void)display;
	191	(void)nhosts_return;
	192	(void)state_return;
	193
172	194	return NULL;
173	195	}
174	196

180	202	XColor *exact_def_return,
181	203	XColor *screen_def_return)
182	204	{
	205	(void)display;
	206	(void)colormap;
	207	(void)color_name;
	208	(void)exact_def_return;
	209	(void)screen_def_return;
	210
183	211	return Success;
184	212	}
185	213

188	216	Display *display,
189	217	XEvent *event_return)
190	218	{
	219	(void)display;
	220	(void)event_return;
	221
191	222	return Success;
192	223	}
193	224

196	227	Display *display,
197	228	XEvent *event)
198	229	{
	230	(void)display;
	231	(void)event;
	232
199	233	return Success;
200	234	}
201	235

206	240	XColor *defs_in_out,
207	241	int ncolors)
208	242	{
	243	(void)display;
	244	(void)colormap;
	245	(void)defs_in_out;
	246	(void)ncolors;
	247
209	248	return Success;
210	249	}
211	250

218	257	Window **children_return,
219	258	unsigned int *nchildren_return)
220	259	{
	260	(void)display;
	261	(void)w;
	262	(void)root_return;
	263	(void)parent_return;
	264	(void)children_return;
	265	(void)nchildren_return;
	266
221	267	return Success;
222	268	}
223	269

225	271	XRefreshKeyboardMapping(
226	272	XMappingEvent *event_map)
227	273	{
	274	(void)event_map;
	275
228	276	return Success;
229	277	}
230	278

233	281	Display *display,
234	282	int screen_number)
235	283	{
	284	(void)display;
	285	(void)screen_number;
	286
236	287	return (Window) NULL;
237	288	}
238	289

242	293	Window w,
243	294	long event_mask)
244	295	{
	296	(void)display;
	297	(void)w;
	298	(void)event_mask;
	299
245	300	return Success;
246	301	}
247	302

253	308	long event_mask,
254	309	XEvent *event_send)
255	310	{
	311	(void)display;
	312	(void)w;
	313	(void)propagate;
	314	(void)event_mask;
	315	(void)event_send;
	316
256	317	return Success;
257	318	}
258	319

263	324	char **argv,
264	325	int argc)
265	326	{
	327	(void)display;
	328	(void)w;
	329	(void)argv;
	330	(void)argc;
	331
266	332	return Success;
267	333	}
268	334

270	336	XSetErrorHandler(
271	337	XErrorHandler handler)
272	338	{
	339	(void)handler;
	340
273	341	return NULL;
274	342	}
275	343

279	347	Window w,
280	348	_Xconst char *icon_name)
281	349	{
	350	(void)display;
	351	(void)w;
	352	(void)icon_name;
	353
282	354	return Success;
283	355	}
284	356

288	360	Window w,
289	361	unsigned long background_pixel)
290	362	{
	363	(void)display;
	364	(void)w;
	365	(void)background_pixel;
	366
291	367	return Success;
292	368	}
293	369

297	373	Window w,
298	374	Pixmap background_pixmap)
299	375	{
	376	(void)display;
	377	(void)w;
	378	(void)background_pixmap;
	379
300	380	return Success;
301	381	}
302	382

306	386	Window w,
307	387	unsigned long border_pixel)
308	388	{
	389	(void)display;
	390	(void)w;
	391	(void)border_pixel;
	392
309	393	return Success;
310	394	}
311	395

315	399	Window w,
316	400	Pixmap border_pixmap)
317	401	{
	402	(void)display;
	403	(void)w;
	404	(void)border_pixmap;
	405
318	406	return Success;
319	407	}
320	408

324	412	Window w,
325	413	unsigned int width)
326	414	{
	415	(void)display;
	416	(void)w;
	417	(void)width;
	418
327	419	return Success;
328	420	}
329	421

333	425	Window w,
334	426	Colormap colormap)
335	427	{
	428	(void)display;
	429	(void)w;
	430	(void)colormap;
	431
336	432	return Success;
337	433	}
338	434

347	443	int *dest_y_return,
348	444	Window *child_return)
349	445	{
	446	(void)display;
	447	(void)src_w;
	448	(void)dest_w;
	449	(void)src_x;
	450	(void)src_y;
	451	(void)dest_x_return;
	452	(void)dest_y_return;
	453	(void)child_return;
	454
350	455	return 0;
351	456	}
352	457

357	462	long event_mask,
358	463	XEvent *event_return)
359	464	{
	465	(void)display;
	466	(void)w;
	467	(void)event_mask;
	468	(void)event_return;
	469
360	470	return Success;
361	471	}
362	472

366	476	Window w,
367	477	int screen_number)
368	478	{
	479	(void)display;
	480	(void)w;
	481	(void)screen_number;
	482
369	483	return Success;
370	484	}
371	485

378	492	KeySym *keysym_return,
379	493	Status *status_return)
380	494	{
	495	(void)ic;
	496	(void)event;
	497	(void)buffer_return;
	498	(void)bytes_buffer;
	499	(void)keysym_return;
	500	(void)status_return;
	501
381	502	return Success;
382	503	}
383	504

388	509	Atom property,
389	510	long long_offset,
390	511	long long_length,
391		Bool delete,
	512	Bool del,
392	513	Atom req_type,
393	514	Atom *actual_type_return,
394	515	int *actual_format_return,

396	517	unsigned long *bytes_after_return,
397	518	unsigned char **prop_return)
398	519	{
	520	(void)display;
	521	(void)w;
	522	(void)property;
	523	(void)long_offset;
	524	(void)long_length;
	525	(void)del;
	526	(void)req_type;
	527
399	528	*actual_type_return = None;
400	529	*actual_format_return = 0;
401	530	*nitems_return = 0;

412	541	XFlush(
413	542	Display *display)
414	543	{
	544	(void)display;
	545
415	546	return 0;
416	547	}
417	548

419	550	XGrabServer(
420	551	Display *display)
421	552	{
	553	(void)display;
	554
422	555	return 0;
423	556	}
424	557

426	559	XUngrabServer(
427	560	Display *display)
428	561	{
	562	(void)display;
	563
429	564	return 0;
430	565	}
431	566

452	587	Display *display,
453	588	Bool onoff)
454	589	{
	590	(void)onoff;
	591
455	592	display->request++;
456	593	return NULL;
457	594	}

461	598	Display *display,
462	599	Bool discard)
463	600	{
	601	(void)discard;
	602
464	603	display->request++;
465	604	return 0;
466	605	}

471	610	{
472	611	return visual->visualid;
473	612	}
	613
	614	int
	615	XOffsetRegion(
	616	Region rgn,
	617	int dx,
	618	int dy)
	619	{
	620	(void)rgn;
	621	(void)dx;
	622	(void)dy;
	623
	624	return 0;
	625	}

+16

-37

win/tcl.m4 less more

363	363	AC_ARG_ENABLE(shared,
364	364	[ --enable-shared build and link with shared libraries (default: on)],
365	365	[tcl_ok=$enableval], [tcl_ok=yes])
366
367		if test "${enable_shared+set}" = set; then
368		enableval="$enable_shared"
369		tcl_ok=$enableval
370		else
371		tcl_ok=yes
372		fi
373
374	366	if test "$tcl_ok" = "yes" ; then
375	367	AC_MSG_RESULT([shared])
376	368	SHARED_BUILD=1

582	574	if test "$ac_cv_cross" = "yes"; then
583	575	case "$do64bit" in
584	576	amd64\|x64\|yes)
585		CC="x86_64-w64-mingw32-gcc"
	577	CC="x86_64-w64-mingw32-${CC}"
586	578	LD="x86_64-w64-mingw32-ld"
587	579	AR="x86_64-w64-mingw32-ar"
588	580	RANLIB="x86_64-w64-mingw32-ranlib"
589	581	RC="x86_64-w64-mingw32-windres"
590	582	;;
591	583	*)
592		CC="i686-w64-mingw32-gcc"
	584	CC="i686-w64-mingw32-${CC}"
593	585	LD="i686-w64-mingw32-ld"
594	586	AR="i686-w64-mingw32-ar"
595	587	RANLIB="i686-w64-mingw32-ranlib"

714	706	SHLIB_LD='${CC} -shared'
715	707	SHLIB_LD_LIBS='${LIBS}'
716	708	MAKE_DLL="\${SHLIB_LD} \$(LDFLAGS) -o \[$]@ ${extra_ldflags} \
717		-Wl,--out-implib,\$(patsubst %.dll,lib%.a,\[$]@)"
	709	-Wl,--out-implib,\$(patsubst %.dll,lib%.dll.a,\[$]@)"
718	710	# DLLSUFFIX is separate because it is the building block for
719	711	# users of tclConfig.sh that may build shared or static.
720	712	DLLSUFFIX="\${DBGX}.dll"

726	718
727	719	CFLAGS_DEBUG=-g
728	720	CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer"
729		CFLAGS_WARNING="-Wall -Wdeclaration-after-statement"
	721	CFLAGS_WARNING="-Wall -Wpointer-arith"
730	722	LDFLAGS_DEBUG=
731	723	LDFLAGS_OPTIMIZE=
	724
	725	case "${CC}" in
	726	*++)
	727	CFLAGS_WARNING="${CFLAGS_WARNING} -Wno-format"
	728	;;
	729	*)
	730	CFLAGS_WARNING="${CFLAGS_WARNING} -Wdeclaration-after-statement"
	731	;;
	732	esac
732	733
733	734	# Specify the CC output file names based on the target name
734	735	CC_OBJNAME="-o \[$]@"

805	806	LIBSUFFIX="\${DBGX}.lib"
806	807	LIBFLAGSUFFIX="\${DBGX}"
807	808
808		# This is a 2-stage check to make sure we have the 64-bit SDK
809		# We have to know where the SDK is installed.
810		# This magic is based on MS Platform SDK for Win2003 SP1 - hobbs
811	809	if test "$do64bit" != "no" ; then
812		if test "x${MSSDK}x" = "xx" ; then
813		MSSDK="C:/Progra~1/Microsoft Platform SDK"
814		fi
815		MSSDK=`echo "$MSSDK" \| sed -e 's!\\\!/!g'`
816		PATH64=""
817	810	case "$do64bit" in
818	811	amd64\|x64\|yes)
819	812	MACHINE="AMD64" ; # assume AMD64 as default 64-bit build
820		PATH64="${MSSDK}/Bin/Win64/x86/AMD64"
821	813	;;
822	814	ia64)
823	815	MACHINE="IA64"
824		PATH64="${MSSDK}/Bin/Win64"
825	816	;;
826	817	esac
827		if test ! -d "${PATH64}" ; then
828		AC_MSG_WARN([Could not find 64-bit $MACHINE SDK])
829		fi
830	818	AC_MSG_RESULT([ Using 64-bit $MACHINE mode])
831	819	fi
832	820

841	829	esac
842	830
843	831	if test "$do64bit" != "no" ; then
844		# The space-based-path will work for the Makefile, but will
845		# not work if AC_TRY_COMPILE is called. TEA has the
846		# TEA_PATH_NOSPACE to avoid this issue.
847		# Check if _WIN64 is already recognized, and if so we don't
848		# need to modify CC.
849		AC_CHECK_DECL([_WIN64], [],
850		[CC="\"${PATH64}/cl.exe\" -I\"${MSSDK}/Include\" \
851		-I\"${MSSDK}/Include/crt\" \
852		-I\"${MSSDK}/Include/crt/sys\""])
853		RC="\"${MSSDK}/bin/rc.exe\""
	832	RC="rc"
854	833	CFLAGS_DEBUG="-nologo -Zi -Od ${runtime}d"
855	834	# Do not use -O2 for Win64 - this has proved buggy in code gen.
856	835	CFLAGS_OPTIMIZE="-nologo -O1 ${runtime}"
857		lflags="${lflags} -nologo -MACHINE:${MACHINE} -LIBPATH:\"${MSSDK}/Lib/${MACHINE}\""
858		LINKBIN="\"${PATH64}/link.exe\""
	836	lflags="${lflags} -nologo -MACHINE:${MACHINE}"
	837	LINKBIN="link"
859	838	# Avoid 'unresolved external symbol __security_cookie' errors.
860	839	# c.f. http://support.microsoft.com/?id=894573
861	840	LIBS="$LIBS bufferoverflowU.lib"

+2

-2

win/tkWin32Dll.c less more

133	133	"leaq %[registration], %%rdx" "\n\t"
134	134	"movq %%gs:0, %%rax" "\n\t"
135	135	"movq %%rax, 0x0(%%rdx)" "\n\t" /* link */
136		"leaq 1f, %%rax" "\n\t"
	136	"leaq 1f(%%rip), %%rax" "\n\t"
137	137	"movq %%rax, 0x8(%%rdx)" "\n\t" /* handler */
138	138	"movq %%rbp, 0x10(%%rdx)" "\n\t" /* rbp */
139	139	"movq %%rsp, 0x18(%%rdx)" "\n\t" /* rsp */

149	149	* Call TkFinalize
150	150	*/
151	151
152		"movq $0x0, 0x0(%%esp)" "\n\t"
	152	"movq $0x0, 0x0(%%rsp)" "\n\t"
153	153	"call TkFinalize" "\n\t"
154	154
155	155	/*

+19

-11

win/tkWinClipboard.c less more

77	77	CloseClipboard();
78	78	goto error;
79	79	}
80		data = GlobalLock(handle);
81		Tcl_WinTCharToUtf((LPCTSTR)data, -1, &ds);
	80	data = (char *)GlobalLock(handle);
	81	Tcl_DStringInit(&ds);
	82	Tcl_WCharToUtfDString((WCHAR )data, wcslen((WCHAR )data), &ds);
82	83	GlobalUnlock(handle);
83	84	} else if (IsClipboardFormatAvailable(CF_TEXT)) {
84	85	/*

99	100
100	101	Tcl_DStringInit(&ds);
101	102	Tcl_DStringAppend(&ds, "cp######", -1);
102		data = GlobalLock(handle);
	103	data = (char *)GlobalLock(handle);
103	104
104	105	/*
105	106	* Even though the documentation claims that GetLocaleInfo expects

129	130	CloseClipboard();
130	131	goto error;
131	132	}
132		data = GlobalLock(handle);
	133	data = (char *)GlobalLock(handle);
133	134	Tcl_ExternalToUtfDString(encoding, data, -1, &ds);
134	135	GlobalUnlock(handle);
135	136	if (encoding) {

156	157	Tcl_DStringAppend(&ds, "\n", 1);
157	158	}
158	159	len = wcslen(fname);
159		Tcl_WinTCharToUtf((LPCTSTR)fname, len * sizeof(WCHAR), &dsTmp);
	160	Tcl_DStringInit(&dsTmp);
	161	Tcl_WCharToUtfDString(fname, len, &dsTmp);
160	162	Tcl_DStringAppend(&ds, Tcl_DStringValue(&dsTmp),
161	163	Tcl_DStringLength(&dsTmp));
162	164	Tcl_DStringFree(&dsTmp);

231	233	{
232	234	HWND hwnd = owner ? TkWinGetHWND(owner) : NULL;
233	235	Tk_Window tkwin;
	236	(void)display;
	237	(void)time;
234	238
235	239	/*
236	240	* This is a gross hack because the Tk_InternAtom interface is broken. It

280	284	char buffer, p, rawText, endPtr;
281	285	int length;
282	286	Tcl_DString ds;
	287	(void)format;
283	288
284	289	for (targetPtr = dispPtr->clipTargetPtr; targetPtr != NULL;
285	290	targetPtr = targetPtr->nextPtr) {

311	316	* Copy the data and change EOL characters.
312	317	*/
313	318
314		buffer = rawText = ckalloc(length + 1);
	319	buffer = rawText = (char *)ckalloc(length + 1);
315	320	if (targetPtr != NULL) {
316	321	for (cbPtr = targetPtr->firstBufferPtr; cbPtr != NULL;
317	322	cbPtr = cbPtr->nextPtr) {

327	332	*buffer = '\0';
328	333
329	334	Tcl_DStringInit(&ds);
330		Tcl_WinUtfToTChar(rawText, -1, &ds);
	335	Tcl_UtfToWCharDString(rawText, -1, &ds);
331	336	ckfree(rawText);
332	337	handle = GlobalAlloc(GMEM_MOVEABLE\|GMEM_DDESHARE,
333	338	Tcl_DStringLength(&ds) + 2);

335	340	Tcl_DStringFree(&ds);
336	341	return;
337	342	}
338		buffer = GlobalLock(handle);
	343	buffer = (char *)GlobalLock(handle);
339	344	memcpy(buffer, Tcl_DStringValue(&ds),
340	345	Tcl_DStringLength(&ds) + 2);
341	346	GlobalUnlock(handle);

366	371	TkClipboardTarget *targetPtr)
367	372	{
368	373	HWND hwnd = TkWinGetHWND(winPtr->window);
	374	(void)targetPtr;
	375
369	376	UpdateClipboard(hwnd);
370	377	}
371	378

418	425	void
419	426	TkSelEventProc(
420	427	Tk_Window tkwin, /* Window for which event was targeted. */
421		register XEvent eventPtr) / X event: either SelectionClear,
	428	XEvent eventPtr) / X event: either SelectionClear,
422	429	* SelectionRequest, or SelectionNotify. */
423	430	{
424	431	if (eventPtr->type == SelectionClear) {

445	452
446	453	void
447	454	TkSelPropProc(
448		register XEvent eventPtr) / X PropertyChange event. */
449		{
	455	XEvent eventPtr) / X PropertyChange event. */
	456	{
	457	(void)eventPtr;
450	458	}
451	459
452	460	/*

+1

-1

win/tkWinCursor.c less more

102	102
103	103	/*
104	104	* All cursor names are valid lists of one element (for
105		* Unix-compatability), even unadorned system cursor names.
	105	* Unix-compatibility), even unadorned system cursor names.
106	106	*/
107	107
108	108	if (Tcl_SplitList(interp, string, &argc, &argv) != TCL_OK) {

+125

-102

win/tkWinDialog.c less more

422	422	ULONG ( STDMETHODCALLTYPE Release )( IFileSaveDialog );
423	423	HRESULT ( STDMETHODCALLTYPE *Show )(
424	424	IFileSaveDialog *, HWND);
425		HRESULT ( STDMETHODCALLTYPE SetFileTypes )( IFileSaveDialog this,
	425	HRESULT ( STDMETHODCALLTYPE SetFileTypes )( IFileSaveDialog ,
426	426	UINT, const TCLCOMDLG_FILTERSPEC *);
427	427	HRESULT ( STDMETHODCALLTYPE *SetFileTypeIndex )(
428	428	IFileSaveDialog *, UINT);

588	588	LPARAM lParam);
589	589	static LRESULT CALLBACK MsgBoxCBTProc(int nCode, WPARAM wParam, LPARAM lParam);
590	590	static void SetTkDialog(ClientData clientData);
591		static const char ConvertExternalFilename(WCHAR filename,
592		Tcl_DString *dsPtr);
	591	static const char ConvertExternalFilename(LPCWSTR, Tcl_DString );
593	592	static void LoadShellProcs(void);
594	593
595	594

629	628	* ShellProcs is populated.
630	629	*-------------------------------------------------------------------------
631	630	*/
632		static void LoadShellProcs()
	631	static void LoadShellProcs(void)
633	632	{
634	633	static HMODULE shell32_handle = NULL;
635	634
636		if (shell32_handle != NULL)
637		return; /* We have already been through here. */
	635	if (shell32_handle != NULL) {
	636	return; /* We have already been through here. */
	637	}
638	638
639	639	shell32_handle = GetModuleHandleW(L"shell32.dll");
640		if (shell32_handle == NULL) /* Should never happen but check anyways. */
641		return;
642
643		ShellProcs.SHCreateItemFromParsingName =
644		(SHCreateItemFromParsingNameProc*) GetProcAddress(shell32_handle,
645		"SHCreateItemFromParsingName");
	640	if (shell32_handle == NULL) { /* Should never happen but check anyways. */
	641	return;
	642	}
	643
	644	ShellProcs.SHCreateItemFromParsingName = (SHCreateItemFromParsingNameProc*)
	645	(void *)GetProcAddress(shell32_handle, "SHCreateItemFromParsingName");
646	646	}
647	647
648	648

718	718	TkWinDialogDebug(
719	719	int debug)
720	720	{
721		ThreadSpecificData *tsdPtr =
	721	ThreadSpecificData tsdPtr = (ThreadSpecificData )
722	722	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
723	723
724	724	tsdPtr->debugFlag = debug;

750	750	int objc, /* Number of arguments. */
751	751	Tcl_Obj const objv[]) / Argument objects. */
752	752	{
753		Tk_Window tkwin = clientData, parent;
	753	Tk_Window tkwin = (Tk_Window)clientData, parent;
754	754	HWND hWnd;
755	755	int i, oldMode, winCode, result;
756	756	CHOOSECOLORW chooseColor;

788	788	chooseColor.lpCustColors = dwCustColors;
789	789	chooseColor.Flags = CC_RGBINIT \| CC_FULLOPEN \| CC_ENABLEHOOK;
790	790	chooseColor.lCustData = (LPARAM) NULL;
791		chooseColor.lpfnHook = (LPOFNHOOKPROC) ColorDlgHookProc;
	791	chooseColor.lpfnHook = (LPOFNHOOKPROC)(void *)ColorDlgHookProc;
792	792	chooseColor.lpTemplateName = (LPWSTR) interp;
793	793
794	794	for (i = 1; i < objc; i += 2) {

904	904	WPARAM wParam, /* First message parameter. */
905	905	LPARAM lParam) /* Second message parameter. */
906	906	{
907		ThreadSpecificData *tsdPtr =
	907	ThreadSpecificData tsdPtr = (ThreadSpecificData )
908	908	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
909	909	const char *title;
910	910	CHOOSECOLOR *ccPtr;
	911	(void)wParam;
911	912
912	913	if (WM_INITDIALOG == uMsg) {
913	914

921	922	if ((title != NULL) && (title[0] != '\0')) {
922	923	Tcl_DString ds;
923	924
924		SetWindowTextW(hDlg, (LPCWSTR)Tcl_WinUtfToTChar(title,-1,&ds));
	925	Tcl_DStringInit(&ds);
	926	SetWindowTextW(hDlg, Tcl_UtfToWCharDString(title, -1, &ds));
925	927	Tcl_DStringFree(&ds);
926	928	}
927	929	if (tsdPtr->debugFlag) {

1083	1085	}
1084	1086
1085	1087	ZeroMemory(optsPtr, sizeof(*optsPtr));
1086		// optsPtr->forceXPStyle = 1;
1087		optsPtr->tkwin = clientData;
	1088	/* optsPtr->forceXPStyle = 1; */
	1089	optsPtr->tkwin = (Tk_Window)clientData;
1088	1090	optsPtr->confirmOverwrite = 1; /* By default we ask for confirmation */
1089	1091	Tcl_DStringInit(&optsPtr->utfDirString);
1090	1092	optsPtr->file[0] = 0;

1145	1147	Tcl_DStringFree(&ds);
1146	1148	break;
1147	1149	case FILE_PARENT:
1148		optsPtr->tkwin = Tk_NameToWindow(interp, string, clientData);
	1150	optsPtr->tkwin = Tk_NameToWindow(interp, string, (Tk_Window)clientData);
1149	1151	if (optsPtr->tkwin == NULL)
1150	1152	goto error_return;
1151	1153	break;

1200	1202	* If new dialogs are available, COM is also initialized.
1201	1203	*----------------------------------------------------------------------
1202	1204	*/
1203		static int VistaFileDialogsAvailable()
	1205	static int VistaFileDialogsAvailable(void)
1204	1206	{
1205	1207	HRESULT hr;
1206	1208	IFileDialog *fdlgPtr = NULL;
1207		ThreadSpecificData *tsdPtr =
	1209	ThreadSpecificData tsdPtr = (ThreadSpecificData )
1208	1210	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
1209	1211
1210	1212	if (tsdPtr->newFileDialogsState == FDLG_STATE_INIT) {

1266	1268	IShellItem *dirIf = NULL;
1267	1269	LPWSTR wstr;
1268	1270	Tcl_Obj *resultObj = NULL;
1269		ThreadSpecificData *tsdPtr =
	1271	ThreadSpecificData tsdPtr = (ThreadSpecificData )
1270	1272	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
1271	1273	int oldMode;
1272	1274

1370	1372	const char *src;
1371	1373
1372	1374	src = Tcl_GetString(optsPtr->extObj);
1373		wstr = (LPWSTR) Tcl_WinUtfToTChar(src, optsPtr->extObj->length, &ds);
1374		if (wstr[0] == L'.')
	1375	Tcl_DStringInit(&ds);
	1376	wstr = Tcl_UtfToWCharDString(src, optsPtr->extObj->length, &ds);
	1377	if (wstr[0] == '.')
1375	1378	++wstr;
1376	1379	hr = fdlgIf->lpVtbl->SetDefaultExtension(fdlgIf, wstr);
1377	1380	Tcl_DStringFree(&ds);

1384	1387	const char *src;
1385	1388
1386	1389	src = Tcl_GetString(optsPtr->titleObj);
1387		wstr = (LPWSTR) Tcl_WinUtfToTChar(src, optsPtr->titleObj->length, &ds);
	1390	Tcl_DStringInit(&ds);
	1391	wstr = Tcl_UtfToWCharDString(src, optsPtr->titleObj->length, &ds);
1388	1392	hr = fdlgIf->lpVtbl->SetTitle(fdlgIf, wstr);
1389	1393	Tcl_DStringFree(&ds);
1390	1394	if (FAILED(hr))

1406	1410	if (normPath) {
1407	1411	LPCWSTR nativePath;
1408	1412	Tcl_IncrRefCount(normPath);
1409		nativePath = Tcl_FSGetNativePath(normPath); /* Points INTO normPath*/
	1413	nativePath = (LPCWSTR)Tcl_FSGetNativePath(normPath); /* Points INTO normPath*/
1410	1414	if (nativePath) {
1411	1415	hr = ShellProcs.SHCreateItemFromParsingName(
1412	1416	nativePath, NULL,

1510	1514	Tcl_DString ftds;
1511	1515	Tcl_Obj *ftobj;
1512	1516
1513		Tcl_WinTCharToUtf((LPCTSTR)filterPtr[ftix-1].pszName, -1, &ftds);
	1517	Tcl_DStringInit(&ftds);
	1518	Tcl_WCharToUtfDString(filterPtr[ftix-1].pszName, wcslen(filterPtr[ftix-1].pszName), &ftds);
1514	1519	ftobj = Tcl_NewStringObj(Tcl_DStringValue(&ftds),
1515	1520	Tcl_DStringLength(&ftds));
1516	1521	Tcl_ObjSetVar2(interp, optsPtr->typeVariableObj, NULL,

1572	1577	Tcl_DString utfFilterString, ds;
1573	1578	Tcl_DString extString, filterString, dirString, titleString;
1574	1579	const char *str;
1575		ThreadSpecificData *tsdPtr =
	1580	ThreadSpecificData tsdPtr = (ThreadSpecificData )
1576	1581	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
1577	1582
1578	1583	ZeroMemory(&ofnData, sizeof(OFNData));

1597	1602	ofn.nMaxFile = TK_MULTI_MAX_PATH;
1598	1603	ofn.Flags = OFN_HIDEREADONLY \| OFN_PATHMUSTEXIST \| OFN_NOCHANGEDIR
1599	1604	\| OFN_EXPLORER\| OFN_ENABLEHOOK\| OFN_ENABLESIZING;
1600		ofn.lpfnHook = (LPOFNHOOKPROC) OFNHookProc;
	1605	ofn.lpfnHook = (LPOFNHOOKPROC)(void *)OFNHookProc;
1601	1606	ofn.lCustData = (LPARAM) &ofnData;
1602	1607
1603	1608	if (oper != OFN_FILE_SAVE) {

1617	1622	*/
1618	1623
1619	1624	ofnData.dynFileBufferSize = 512;
1620		ofnData.dynFileBuffer = ckalloc(512 * sizeof(WCHAR));
	1625	ofnData.dynFileBuffer = (WCHAR )ckalloc(512 sizeof(WCHAR));
1621	1626	}
1622	1627
1623	1628	if (optsPtr->extObj != NULL) {
1624		str = Tcl_GetString(optsPtr->extObj);
1625		if (str[0] == '.')
1626		++str;
1627		Tcl_WinUtfToTChar(str, -1, &extString);
1628		ofn.lpstrDefExt = (WCHAR *) Tcl_DStringValue(&extString);
1629		}
1630
1631		Tcl_WinUtfToTChar(Tcl_DStringValue(&utfFilterString),
	1629	str = Tcl_GetString(optsPtr->extObj);
	1630	if (str[0] == '.') {
	1631	++str;
	1632	}
	1633	Tcl_DStringInit(&extString);
	1634	ofn.lpstrDefExt = Tcl_UtfToWCharDString(str, -1, &extString);
	1635	}
	1636
	1637	Tcl_DStringInit(&filterString);
	1638	ofn.lpstrFilter = Tcl_UtfToWCharDString(Tcl_DStringValue(&utfFilterString),
1632	1639	Tcl_DStringLength(&utfFilterString), &filterString);
1633		ofn.lpstrFilter = (WCHAR *) Tcl_DStringValue(&filterString);
1634	1640	ofn.nFilterIndex = filterIndex;
1635	1641
1636	1642	if (Tcl_DStringValue(&optsPtr->utfDirString)[0] != '\0') {
1637		Tcl_WinUtfToTChar(Tcl_DStringValue(&optsPtr->utfDirString),
	1643	Tcl_DStringInit(&dirString);
	1644	Tcl_UtfToWCharDString(Tcl_DStringValue(&optsPtr->utfDirString),
1638	1645	Tcl_DStringLength(&optsPtr->utfDirString), &dirString);
1639	1646	} else {
1640	1647	/*

1650	1657	Tcl_DStringValue(&optsPtr->utfDirString), &cwd) == NULL)) {
1651	1658	Tcl_ResetResult(interp);
1652	1659	} else {
1653		Tcl_WinUtfToTChar(Tcl_DStringValue(&cwd),
	1660	Tcl_DStringInit(&dirString);
	1661	Tcl_UtfToWCharDString(Tcl_DStringValue(&cwd),
1654	1662	Tcl_DStringLength(&cwd), &dirString);
1655	1663	}
1656	1664	Tcl_DStringFree(&cwd);

1658	1666	ofn.lpstrInitialDir = (WCHAR *) Tcl_DStringValue(&dirString);
1659	1667
1660	1668	if (optsPtr->titleObj != NULL) {
1661		Tcl_WinUtfToTChar(Tcl_GetString(optsPtr->titleObj), -1, &titleString);
1662		ofn.lpstrTitle = (WCHAR *) Tcl_DStringValue(&titleString);
	1669	Tcl_DStringInit(&titleString);
	1670	ofn.lpstrTitle = Tcl_UtfToWCharDString(Tcl_GetString(optsPtr->titleObj), -1, &titleString);
1663	1671	}
1664	1672
1665	1673	/*

1912	1920	WPARAM wParam, /* Message parameter */
1913	1921	LPARAM lParam) /* Message parameter */
1914	1922	{
1915		ThreadSpecificData *tsdPtr =
	1923	ThreadSpecificData tsdPtr = (ThreadSpecificData )
1916	1924	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
1917	1925	OPENFILENAME *ofnPtr;
1918	1926	OFNData *ofnData;
	1927	(void)wParam;
1919	1928
1920	1929	if (uMsg == WM_INITDIALOG) {
1921	1930	TkWinSetUserData(hdlg, lParam);

1960	1969
1961	1970	if ((selsize > 1) && (dirsize > 0)) {
1962	1971	if (ofnData->dynFileBufferSize < buffersize) {
1963		buffer = ckrealloc(buffer, buffersize * sizeof(WCHAR));
	1972	buffer = (WCHAR )ckrealloc(buffer, buffersize sizeof(WCHAR));
1964	1973	ofnData->dynFileBufferSize = buffersize;
1965	1974	ofnData->dynFileBuffer = buffer;
1966	1975	}

2006	2015	if (TCL_PATH_ABSOLUTE ==
2007	2016	Tcl_GetPathType(Tcl_DStringValue(&tmpfile))) {
2008	2017	/* re-get the full path to the start of the buffer */
2009		buffer = (WCHAR *) ofnData->dynFileBuffer;
	2018	buffer = ofnData->dynFileBuffer;
2010	2019	SendMessageW(hdlg, CDM_GETSPEC, selsize, (LPARAM) buffer);
2011	2020	} else {
2012	2021	*(buffer-1) = '\\';

2092	2101	*/
2093	2102	const char defaultFilter = "All Files (.*)";
2094	2103
2095		p = filterStr = ckalloc(30);
	2104	p = filterStr = (char *)ckalloc(30);
2096	2105
2097	2106	strcpy(p, defaultFilter);
2098	2107	p+= strlen(defaultFilter);

2106	2115	*p = '\0';
2107	2116
2108	2117	} else {
2109		size_t len;
	2118	int len;
2110	2119
2111	2120	if (valuePtr == NULL) {
2112	2121	len = 0;
2113	2122	} else {
2114		(void) Tcl_GetString(valuePtr);
2115		len = valuePtr->length;
	2123	(void) Tcl_GetStringFromObj(valuePtr, &len);
2116	2124	}
2117	2125
2118	2126	/*

2129	2137	* twice the size of the string to format the filter
2130	2138	*/
2131	2139
2132		filterStr = ckalloc(len * 3);
	2140	filterStr = (char )ckalloc(len 3);
2133	2141
2134	2142	for (filterPtr = flist.filters, p = filterStr; filterPtr;
2135	2143	filterPtr = filterPtr->next) {

2282	2290
2283	2291	Tcl_DStringInit(&ds);
2284	2292	Tcl_DStringInit(&patterns);
2285		dlgFilterPtr = ckalloc(flist.numFilters * sizeof(*dlgFilterPtr));
	2293	dlgFilterPtr = (TCLCOMDLG_FILTERSPEC )ckalloc(flist.numFilters sizeof(*dlgFilterPtr));
2286	2294
2287	2295	for (i = 0, filterPtr = flist.filters;
2288	2296	filterPtr;

2296	2304	initialIndex = i+1; /* Windows filter indices are 1-based */
2297	2305
2298	2306	/* First stash away the text description of the pattern */
2299		Tcl_WinUtfToTChar(filterPtr->name, -1, &ds);
	2307	Tcl_DStringInit(&ds);
	2308	Tcl_UtfToWCharDString(filterPtr->name, -1, &ds);
2300	2309	nbytes = Tcl_DStringLength(&ds); /* # bytes, not Unicode chars */
2301	2310	nbytes += sizeof(WCHAR); /* Terminating \0 */
2302		dlgFilterPtr[i].pszName = ckalloc(nbytes);
	2311	dlgFilterPtr[i].pszName = (LPCWSTR)ckalloc(nbytes);
2303	2312	memmove((void *) dlgFilterPtr[i].pszName, Tcl_DStringValue(&ds), nbytes);
2304	2313	Tcl_DStringFree(&ds);
2305	2314

2324	2333	}
2325	2334
2326	2335	/* Again we need a Unicode form of the string */
2327		Tcl_WinUtfToTChar(Tcl_DStringValue(&patterns), -1, &ds);
	2336	Tcl_DStringInit(&ds);
	2337	Tcl_UtfToWCharDString(Tcl_DStringValue(&patterns), -1, &ds);
2328	2338	nbytes = Tcl_DStringLength(&ds); /* # bytes, not Unicode chars */
2329	2339	nbytes += sizeof(WCHAR); /* Terminating \0 */
2330		dlgFilterPtr[i].pszSpec = ckalloc(nbytes);
	2340	dlgFilterPtr[i].pszSpec = (LPCWSTR)ckalloc(nbytes);
2331	2341	memmove((void *)dlgFilterPtr[i].pszSpec, Tcl_DStringValue(&ds), nbytes);
2332	2342	Tcl_DStringFree(&ds);
2333	2343	Tcl_DStringSetLength(&patterns, 0);

2423	2433	int objc, /* Number of arguments. */
2424	2434	Tcl_Obj const objv[]) / Argument objects. */
2425	2435	{
2426		WCHAR path[MAX_PATH];
	2436	WCHAR path[MAX_PATH];
2427	2437	int oldMode, result;
2428	2438	LPCITEMIDLIST pidl; /* Returned by browser */
2429	2439	BROWSEINFOW bInfo; /* Used by browser */

2460	2470	if (utfDir[0] != '\0') {
2461	2471	LPCWSTR uniStr;
2462	2472
2463		Tcl_WinUtfToTChar(Tcl_DStringValue(&ofnOpts.utfDirString), -1,
	2473	Tcl_DStringInit(&tempString);
	2474	Tcl_UtfToWCharDString(Tcl_DStringValue(&ofnOpts.utfDirString), -1,
2464	2475	&tempString);
2465		uniStr = (WCHAR *) Tcl_DStringValue(&tempString);
2466
2467		/* Convert possible relative path to full path to keep dialog happy. */
2468
2469		GetFullPathNameW(uniStr, MAX_PATH, saveDir, NULL);
2470		wcsncpy(cdCBData.initDir, saveDir, MAX_PATH);
	2476	uniStr = (WCHAR *) Tcl_DStringValue(&tempString);
	2477
	2478	/* Convert possible relative path to full path to keep dialog happy. */
	2479
	2480	GetFullPathNameW(uniStr, MAX_PATH, saveDir, NULL);
	2481	wcsncpy(cdCBData.initDir, saveDir, MAX_PATH);
2471	2482	}
2472	2483
2473	2484	/* XXX - rest of this (original) code has no error checks at all. */

2492	2503	bInfo.lParam = (LPARAM) &cdCBData;
2493	2504
2494	2505	if (ofnOpts.titleObj != NULL) {
2495		bInfo.lpszTitle = (LPCWSTR)Tcl_WinUtfToTChar(
2496		Tcl_GetString(ofnOpts.titleObj), -1, &titleString);
	2506	Tcl_DStringInit(&titleString);
	2507	bInfo.lpszTitle = Tcl_UtfToWCharDString(Tcl_GetString(ofnOpts.titleObj), -1, &titleString);
2497	2508	} else {
2498	2509	bInfo.lpszTitle = L"Please choose a directory, then select OK.";
2499	2510	}

2617	2628	Tcl_DString tempString;
2618	2629	Tcl_DString initDirString;
2619	2630	WCHAR string[MAX_PATH];
2620		ThreadSpecificData *tsdPtr =
	2631	ThreadSpecificData tsdPtr = (ThreadSpecificData )
2621	2632	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
2622	2633
2623	2634	if (tsdPtr->debugFlag) {

2636	2647	* like ~ are converted correctly.
2637	2648	*/
2638	2649
2639		Tcl_WinTCharToUtf((LPCTSTR) lParam, -1, &initDirString);
	2650	Tcl_DStringInit(&initDirString);
	2651	Tcl_WCharToUtfDString((WCHAR ) lParam, wcslen((WCHAR ) lParam), &initDirString);
2640	2652	if (Tcl_TranslateFileName(chooseDirSharedData->interp,
2641	2653	Tcl_DStringValue(&initDirString), &tempString) == NULL) {
2642	2654	/*

2647	2659	chooseDirSharedData->retDir[0] = '\0';
2648	2660	return 1;
2649	2661	}
2650		Tcl_DStringFree(&initDirString);
2651		Tcl_WinUtfToTChar(Tcl_DStringValue(&tempString), -1, &initDirString);
2652		Tcl_DStringFree(&tempString);
2653		wcsncpy(string, (WCHAR *) Tcl_DStringValue(&initDirString),
	2662	Tcl_DStringSetLength(&initDirString, 0);
	2663	wcsncpy(string, Tcl_UtfToWCharDString(Tcl_DStringValue(&tempString), -1, &initDirString),
2654	2664	MAX_PATH);
2655	2665	Tcl_DStringFree(&initDirString);
	2666	Tcl_DStringFree(&tempString);
2656	2667
2657	2668	if (SetCurrentDirectoryW(string) == 0) {
2658	2669

2699	2710
2700	2711	if (SHGetPathFromIDListW((LPITEMIDLIST) lParam, selDir)) {
2701	2712	SendMessageW(hwnd, BFFM_SETSTATUSTEXTW, 0, (LPARAM) selDir);
2702		// enable the OK button
	2713	/* enable the OK button */
2703	2714	SendMessageW(hwnd, BFFM_ENABLEOK, 0, (LPARAM) 1);
2704	2715	} else {
2705		// disable the OK button
	2716	/* disable the OK button */
2706	2717	SendMessageW(hwnd, BFFM_ENABLEOK, 0, (LPARAM) 0);
2707	2718	}
2708	2719	UpdateWindow(hwnd);

2733	2744	ULONG ulCount, ulAttr;
2734	2745
2735	2746	if (SUCCEEDED(psfFolder->lpVtbl->ParseDisplayName(
2736		psfFolder, hwnd, NULL, (WCHAR *)
2737		initDir, &ulCount,&pidlMain,&ulAttr))
	2747	psfFolder, hwnd, NULL, initDir,
	2748	&ulCount,&pidlMain,&ulAttr))
2738	2749	&& (pidlMain != NULL)) {
2739	2750	SendMessageW(hwnd, BFFM_SETSELECTIONW, FALSE,
2740	2751	(LPARAM) pidlMain);

2780	2791	int objc, /* Number of arguments. */
2781	2792	Tcl_Obj const objv[]) / Argument objects. */
2782	2793	{
2783		Tk_Window tkwin = clientData, parent;
	2794	Tk_Window tkwin = (Tk_Window)clientData, parent;
2784	2795	HWND hWnd;
2785	2796	Tcl_Obj messageObj, titleObj, detailObj, tmpObj;
2786	2797	int defaultBtn, icon, type;

2794	2805	MSG_DEFAULT, MSG_DETAIL, MSG_ICON, MSG_MESSAGE,
2795	2806	MSG_PARENT, MSG_TITLE, MSG_TYPE
2796	2807	};
2797		ThreadSpecificData *tsdPtr =
	2808	ThreadSpecificData tsdPtr = (ThreadSpecificData )
2798	2809	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
2799	2810	Tcl_DString titleBuf, tmpBuf;
2800	2811	LPCWSTR titlePtr, tmpPtr;

2928	2939	tsdPtr->hMsgBoxHook = SetWindowsHookExW(WH_CBT, MsgBoxCBTProc, NULL,
2929	2940	GetCurrentThreadId());
2930	2941	src = Tcl_GetString(tmpObj);
2931		tmpPtr = (LPCWSTR)Tcl_WinUtfToTChar(src, tmpObj->length, &tmpBuf);
	2942	Tcl_DStringInit(&tmpBuf);
	2943	tmpPtr = Tcl_UtfToWCharDString(src, tmpObj->length, &tmpBuf);
2932	2944	if (titleObj != NULL) {
2933	2945	src = Tcl_GetString(titleObj);
2934		titlePtr = (LPCWSTR)Tcl_WinUtfToTChar(src, titleObj->length, &titleBuf);
	2946	Tcl_DStringInit(&titleBuf);
	2947	titlePtr = Tcl_UtfToWCharDString(src, titleObj->length, &titleBuf);
2935	2948	} else {
2936	2949	titlePtr = L"";
2937	2950	Tcl_DStringInit(&titleBuf);

2962	2975	WPARAM wParam,
2963	2976	LPARAM lParam)
2964	2977	{
2965		ThreadSpecificData *tsdPtr =
	2978	ThreadSpecificData tsdPtr = (ThreadSpecificData )
2966	2979	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
2967	2980
2968	2981	if (nCode == HCBT_CREATEWND) {

3009	3022	SetTkDialog(
3010	3023	ClientData clientData)
3011	3024	{
3012		ThreadSpecificData *tsdPtr =
	3025	ThreadSpecificData tsdPtr = (ThreadSpecificData )
3013	3026	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
3014	3027	char buf[32];
3015	3028

3023	3036
3024	3037	static const char *
3025	3038	ConvertExternalFilename(
3026		WCHAR *filename,
	3039	LPCWSTR filename,
3027	3040	Tcl_DString *dsPtr)
3028	3041	{
3029	3042	char *p;
3030	3043
3031		Tcl_WinTCharToUtf((LPCTSTR)filename, -1, dsPtr);
	3044	Tcl_DStringInit(dsPtr);
	3045	Tcl_WCharToUtfDString(filename, wcslen(filename), dsPtr);
3032	3046	for (p = Tcl_DStringValue(dsPtr); *p != '\0'; p++) {
3033	3047	/*
3034	3048	* Change the pathname to the Tcl "normalized" pathname, where back

3065	3079	int pt = 0;
3066	3080
3067	3081	resObj = Tcl_NewListObj(0, NULL);
3068		Tcl_WinTCharToUtf((LPCTSTR)plf->lfFaceName, -1, &ds);
	3082	Tcl_DStringInit(&ds);
	3083	Tcl_WCharToUtfDString(plf->lfFaceName, wcslen(plf->lfFaceName), &ds);
3069	3084	Tcl_ListObjAppendElement(NULL, resObj,
3070	3085	Tcl_NewStringObj(Tcl_DStringValue(&ds), -1));
3071	3086	Tcl_DStringFree(&ds);

3100	3115	Tcl_Obj objv, tmpv;
3101	3116
3102	3117	Tcl_ListObjGetElements(NULL, cmdObj, &objc, &objv);
3103		tmpv = ckalloc(sizeof(Tcl_Obj ) (objc + 2));
	3118	tmpv = (Tcl_Obj *)ckalloc(sizeof(Tcl_Obj ) * (objc + 2));
3104	3119	memcpy(tmpv, objv, sizeof(Tcl_Obj ) objc);
3105	3120	tmpv[objc] = GetFontObj(hdc, logfontPtr);
3106	3121	TkBackgroundEvalObjv(interp, objc+1, tmpv, TCL_EVAL_GLOBAL);

3138	3153	CHOOSEFONT pcf = (CHOOSEFONT ) lParam;
3139	3154	HWND hwndCtrl;
3140	3155	static HookData *phd = NULL;
3141		ThreadSpecificData *tsdPtr =
	3156	ThreadSpecificData tsdPtr = (ThreadSpecificData )
3142	3157	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
3143	3158
3144	3159	if (WM_INITDIALOG == msg && lParam != 0) {

3151	3166	if (phd->titleObj != NULL) {
3152	3167	Tcl_DString title;
3153	3168
3154		Tcl_WinUtfToTChar(Tcl_GetString(phd->titleObj), -1, &title);
	3169	Tcl_DStringInit(&title);
	3170	Tcl_UtfToWCharDString(Tcl_GetString(phd->titleObj), -1, &title);
3155	3171	if (Tcl_DStringLength(&title) > 0) {
3156	3172	SetWindowTextW(hwndDlg, (LPCWSTR) Tcl_DStringValue(&title));
3157	3173	}

3280	3296	int objc,
3281	3297	Tcl_Obj *const objv[])
3282	3298	{
3283		Tk_Window tkwin = clientData;
	3299	Tk_Window tkwin = (Tk_Window)clientData;
3284	3300	HookData *hdPtr = NULL;
3285	3301	int i, r = TCL_OK;
3286	3302	static const char *const optionStrings[] = {
3287	3303	"-parent", "-title", "-font", "-command", "-visible", NULL
3288	3304	};
3289	3305
3290		hdPtr = Tcl_GetAssocData(interp, "::tk::fontchooser", NULL);
	3306	hdPtr = (HookData *)Tcl_GetAssocData(interp, "::tk::fontchooser", NULL);
3291	3307
3292	3308	/*
3293	3309	* With no arguments we return all the options in a dict.

3424	3440	Tcl_Obj *const objv[])
3425	3441	{
3426	3442	Tcl_DString ds;
3427		Tk_Window tkwin = clientData, parent;
	3443	Tk_Window tkwin = (Tk_Window)clientData, parent;
3428	3444	CHOOSEFONTW cf;
3429	3445	LOGFONTW lf;
3430	3446	HDC hdc;
3431	3447	HookData *hdPtr;
3432	3448	int r = TCL_OK, oldMode = 0;
3433
3434		hdPtr = Tcl_GetAssocData(interp, "::tk::fontchooser", NULL);
	3449	(void)objc;
	3450	(void)objv;
	3451
	3452	hdPtr = (HookData *)Tcl_GetAssocData(interp, "::tk::fontchooser", NULL);
3435	3453
3436	3454	parent = tkwin;
3437	3455	if (hdPtr->parentObj) {

3468	3486	}
3469	3487	fontPtr = (TkFont *) f;
3470	3488	cf.Flags \|= CF_INITTOLOGFONTSTRUCT;
3471		Tcl_WinUtfToTChar(fontPtr->fa.family, -1, &ds);
3472		wcsncpy(lf.lfFaceName, (WCHAR *)Tcl_DStringValue(&ds),
	3489	Tcl_DStringInit(&ds);
	3490	wcsncpy(lf.lfFaceName, Tcl_UtfToWCharDString(fontPtr->fa.family, -1, &ds),
3473	3491	LF_FACESIZE-1);
3474	3492	Tcl_DStringFree(&ds);
3475	3493	lf.lfFaceName[LF_FACESIZE-1] = 0;

3532	3550
3533	3551	static int
3534	3552	FontchooserHideCmd(
3535		ClientData clientData, /* Main window */
	3553	ClientData dummy, /* Main window */
3536	3554	Tcl_Interp *interp,
3537	3555	int objc,
3538	3556	Tcl_Obj *const objv[])
3539	3557	{
3540		HookData *hdPtr = Tcl_GetAssocData(interp, "::tk::fontchooser", NULL);
	3558	HookData hdPtr = (HookData )Tcl_GetAssocData(interp, "::tk::fontchooser", NULL);
	3559	(void)dummy;
	3560	(void)objc;
	3561	(void)objv;
3541	3562
3542	3563	if (hdPtr->hwnd && IsWindow(hdPtr->hwnd)) {
3543	3564	EndDialog(hdPtr->hwnd, 0);

3557	3578	*/
3558	3579
3559	3580	static void
3560		DeleteHookData(ClientData clientData, Tcl_Interp *interp)
	3581	DeleteHookData(ClientData clientData, Tcl_Interp *dummy)
3561	3582	{
3562		HookData *hdPtr = clientData;
	3583	HookData hdPtr = (HookData )clientData;
	3584	(void)dummy;
3563	3585
3564	3586	if (hdPtr->parentObj) {
3565	3587	Tcl_DecrRefCount(hdPtr->parentObj);

3596	3618	};
3597	3619
3598	3620	int
3599		TkInitFontchooser(Tcl_Interp *interp, ClientData clientData)
	3621	TkInitFontchooser(Tcl_Interp *interp, ClientData dummy)
3600	3622	{
3601		HookData *hdPtr = ckalloc(sizeof(HookData));
	3623	HookData hdPtr = (HookData )ckalloc(sizeof(HookData));
	3624	(void)dummy;
3602	3625
3603	3626	memset(hdPtr, 0, sizeof(HookData));
3604	3627	Tcl_SetAssocData(interp, "::tk::fontchooser", DeleteHookData, hdPtr);

+111

-72

win/tkWinFont.c less more

28	28	#define FONTMAP_SHIFT 10
29	29
30	30	#define FONTMAP_BITSPERPAGE (1 << FONTMAP_SHIFT)
31		#define FONTMAP_PAGES (0x30000 / FONTMAP_BITSPERPAGE)
	31	#define FONTMAP_NUMCHARS 0x40000
	32	#define FONTMAP_PAGES (FONTMAP_NUMCHARS / FONTMAP_BITSPERPAGE)
32	33
33	34	typedef struct FontFamily {
34	35	struct FontFamily nextPtr; / Next in list of all known font families. */

213	214	USHORT startCount, USHORT endCount,
214	215	int *symbolPtr);
215	216	static void MultiFontTextOut(HDC hdc, WinFont *fontPtr,
216		const char *source, int numBytes, int x, int y,
217		double angle);
	217	const char *source, int numBytes,
	218	double x, double y, double angle);
218	219	static void ReleaseFont(WinFont *fontPtr);
219	220	static inline void ReleaseSubFont(SubFont *subFontPtr);
220	221	static int SeenName(const char name, Tcl_DString dsPtr);

298	299	}
299	300
300	301	tkwin = (Tk_Window) ((TkWindow *) tkwin)->mainPtr->winPtr;
301		fontPtr = ckalloc(sizeof(WinFont));
302		InitFont(tkwin, GetStockObject(object), 0, fontPtr);
	302	fontPtr = (WinFont *)ckalloc(sizeof(WinFont));
	303	InitFont(tkwin, (HFONT)GetStockObject(object), 0, fontPtr);
303	304
304	305	return (TkFont *) fontPtr;
305	306	}

556	557	hFont = GetScreenFont(faPtr, faceName,
557	558	(int)(TkFontGetPixels(tkwin, faPtr->size) + 0.5), 0.0);
558	559	if (tkFontPtr == NULL) {
559		fontPtr = ckalloc(sizeof(WinFont));
	560	fontPtr = (WinFont *)ckalloc(sizeof(WinFont));
560	561	} else {
561	562	fontPtr = (WinFont *) tkFontPtr;
562	563	ReleaseFont(fontPtr);

652	653	static int CALLBACK
653	654	WinFontFamilyEnumProc(
654	655	ENUMLOGFONTW lfPtr, / Logical-font data. */
655		NEWTEXTMETRIC tmPtr, / Physical-font data (not used). */
656		int fontType, /* Type of font (not used). */
	656	TCL_UNUSED(NEWTEXTMETRIC ), / Physical-font data (not used). */
	657	TCL_UNUSED(int), /* Type of font (not used). */
657	658	LPARAM lParam) /* Result object to hold result. */
658	659	{
	660	WCHAR *faceName = lfPtr->elfLogFont.lfFaceName;
659	661	Tcl_Obj resultObj = (Tcl_Obj ) lParam;
660	662	Tcl_DString faceString;
661	663
662		Tcl_WinTCharToUtf((LPCTSTR)lfPtr->elfLogFont.lfFaceName, -1, &faceString);
	664	Tcl_DStringInit(&faceString);
	665	Tcl_WCharToUtfDString(faceName, wcslen(faceName), &faceString);
663	666	Tcl_ListObjAppendElement(NULL, resultObj, Tcl_NewStringObj(
664	667	Tcl_DStringValue(&faceString), Tcl_DStringLength(&faceString)));
665	668	Tcl_DStringFree(&faceString);

748	751	* Get the font attributes.
749	752	*/
750	753
751		oldfont = SelectObject(hdc, thisSubFontPtr->hFont0);
	754	oldfont = (HFONT)SelectObject(hdc, thisSubFontPtr->hFont0);
752	755	GetTextMetricsW(hdc, &tm);
753	756	SelectObject(hdc, oldfont);
754	757	ReleaseDC(fontPtr->hwnd, hdc);

826	829
827	830	hdc = GetDC(fontPtr->hwnd);
828	831	lastSubFontPtr = &fontPtr->subFontArray[0];
829		oldFont = SelectObject(hdc, lastSubFontPtr->hFont0);
	832	oldFont = (HFONT)SelectObject(hdc, lastSubFontPtr->hFont0);
830	833
831	834	/*
832	835	* A three step process:

1012	1015	Tk_Font tkfont, /* Font in which characters will be drawn. */
1013	1016	const char source, / UTF-8 string to be displayed. Need not be
1014	1017	* '\0' terminated. */
1015		int numBytes, /* Maximum number of bytes to consider from
	1018	TCL_UNUSED(int), /* Maximum number of bytes to consider from
1016	1019	* source string in all. */
1017	1020	int rangeStart, /* Index of first byte to measure. */
1018	1021	int rangeLength, /* Length of range to measure in bytes. */

1034	1037	int lengthPtr) / Filled with x-location just after the
1035	1038	* terminating character. */
1036	1039	{
1037		(void) numBytes; /unused/
1038	1040	return Tk_MeasureChars(tkfont, source + rangeStart, rangeLength,
1039	1041	maxLength, flags, lengthPtr);
1040	1042	}

1060	1062	Display display, / Display on which to draw. */
1061	1063	Drawable drawable, /* Window or pixmap in which to draw. */
1062	1064	GC gc, /* Graphics context for drawing characters. */
1063		Tk_Font tkfont, /* Font in which characters will be drawn;
	1065	TCL_UNUSED(Tk_Font), /* Font in which characters will be drawn;
1064	1066	* must be the same as font used in GC. */
1065	1067	const char source, / UTF-8 string to be displayed. Need not be
1066	1068	* '\0' terminated. All Tk meta-characters

1115	1117
1116	1118	stipple = CreatePatternBrush(twdPtr->bitmap.handle);
1117	1119	SetBrushOrgEx(dc, gc->ts_x_origin, gc->ts_y_origin, NULL);
1118		oldBrush = SelectObject(dc, stipple);
	1120	oldBrush = (HBRUSH)SelectObject(dc, stipple);
1119	1121
1120	1122	SetTextAlign(dcMem, TA_LEFT \| TA_BASELINE);
1121	1123	SetTextColor(dcMem, gc->foreground);

1130	1132	GetTextMetricsW(dcMem, &tm);
1131	1133	size.cx -= tm.tmOverhang;
1132	1134	bitmap = CreateCompatibleBitmap(dc, size.cx, size.cy);
1133		oldBitmap = SelectObject(dcMem, bitmap);
	1135	oldBitmap = (HBITMAP)SelectObject(dcMem, bitmap);
1134	1136
1135	1137	/*
1136	1138	* The following code is tricky because fonts are rendered in multiple

1184	1186	GetTextMetricsW(dcMem, &tm);
1185	1187	size.cx -= tm.tmOverhang;
1186	1188	bitmap = CreateCompatibleBitmap(dc, size.cx, size.cy);
1187		oldBitmap = SelectObject(dcMem, bitmap);
	1189	oldBitmap = (HBITMAP)SelectObject(dcMem, bitmap);
1188	1190
1189	1191	MultiFontTextOut(dcMem, fontPtr, source, numBytes, 0, tm.tmAscent,
1190	1192	0.0);

1207	1209	Display display, / Display on which to draw. */
1208	1210	Drawable drawable, /* Window or pixmap in which to draw. */
1209	1211	GC gc, /* Graphics context for drawing characters. */
1210		Tk_Font tkfont, /* Font in which characters will be drawn;
	1212	TCL_UNUSED(Tk_Font), /* Font in which characters will be drawn;
1211	1213	* must be the same as font used in GC. */
1212	1214	const char source, / UTF-8 string to be displayed. Need not be
1213	1215	* '\0' terminated. All Tk meta-characters

1263	1265
1264	1266	stipple = CreatePatternBrush(twdPtr->bitmap.handle);
1265	1267	SetBrushOrgEx(dc, gc->ts_x_origin, gc->ts_y_origin, NULL);
1266		oldBrush = SelectObject(dc, stipple);
	1268	oldBrush = (HBRUSH)SelectObject(dc, stipple);
1267	1269
1268	1270	SetTextAlign(dcMem, TA_LEFT \| TA_BASELINE);
1269	1271	SetTextColor(dcMem, gc->foreground);

1278	1280	GetTextMetricsW(dcMem, &tm);
1279	1281	size.cx -= tm.tmOverhang;
1280	1282	bitmap = CreateCompatibleBitmap(dc, size.cx, size.cy);
1281		oldBitmap = SelectObject(dcMem, bitmap);
	1283	oldBitmap = (HBITMAP)SelectObject(dcMem, bitmap);
1282	1284
1283	1285	/*
1284	1286	* The following code is tricky because fonts are rendered in multiple

1289	1291	*/
1290	1292
1291	1293	PatBlt(dcMem, 0, 0, size.cx, size.cy, BLACKNESS);
1292		MultiFontTextOut(dc, fontPtr, source, numBytes, (int)x, (int)y, angle);
	1294	MultiFontTextOut(dc, fontPtr, source, numBytes, x, y, angle);
1293	1295	BitBlt(dc, (int)x, (int)y - tm.tmAscent, size.cx, size.cy, dcMem,
1294	1296	0, 0, 0xEA02E9);
1295	1297	PatBlt(dcMem, 0, 0, size.cx, size.cy, WHITENESS);
1296		MultiFontTextOut(dc, fontPtr, source, numBytes, (int)x, (int)y, angle);
	1298	MultiFontTextOut(dc, fontPtr, source, numBytes, x, y, angle);
1297	1299	BitBlt(dc, (int)x, (int)y - tm.tmAscent, size.cx, size.cy, dcMem,
1298	1300	0, 0, 0x8A0E06);
1299	1301

1310	1312	SetTextAlign(dc, TA_LEFT \| TA_BASELINE);
1311	1313	SetTextColor(dc, gc->foreground);
1312	1314	SetBkMode(dc, TRANSPARENT);
1313		MultiFontTextOut(dc, fontPtr, source, numBytes, (int)x, (int)y, angle);
	1315	MultiFontTextOut(dc, fontPtr, source, numBytes, x, y, angle);
1314	1316	} else {
1315	1317	HBITMAP oldBitmap, bitmap;
1316	1318	HDC dcMem;

1332	1334	GetTextMetricsW(dcMem, &tm);
1333	1335	size.cx -= tm.tmOverhang;
1334	1336	bitmap = CreateCompatibleBitmap(dc, size.cx, size.cy);
1335		oldBitmap = SelectObject(dcMem, bitmap);
	1337	oldBitmap = (HBITMAP)SelectObject(dcMem, bitmap);
1336	1338
1337	1339	MultiFontTextOut(dcMem, fontPtr, source, numBytes, 0, tm.tmAscent,
1338	1340	angle);

1358	1360	* Draw a string of characters on the screen like Tk_DrawChars(), but
1359	1361	* with access to all the characters on the line for context. On Windows
1360	1362	* this context isn't consulted, so we just call Tk_DrawChars().
1361		*
	1363	*
	1364	* Note: TK_DRAW_IN_CONTEXT being currently defined only on macOS, this
	1365	* function is unused (and possibly unfinished). See [7655f65ae7].
	1366	*
1362	1367	* Results:
1363	1368	* None.
1364	1369	*

1382	1387	* is passed to this function. If they are not
1383	1388	* stripped out, they will be displayed as
1384	1389	* regular printing characters. */
1385		int numBytes, /* Number of bytes in string. */
	1390	TCL_UNUSED(int), /* Number of bytes in string. */
1386	1391	int rangeStart, /* Index of first byte to draw. */
1387	1392	int rangeLength, /* Length of range to draw in bytes. */
1388	1393	int x, int y) /* Coordinates at which to place origin of the

1391	1396	{
1392	1397	int widthUntilStart;
1393	1398
1394		(void) numBytes; /unused/
1395
1396	1399	Tk_MeasureChars(tkfont, source, rangeStart, -1, 0, &widthUntilStart);
1397	1400	Tk_DrawChars(display, drawable, gc, tkfont, source + rangeStart,
1398	1401	rangeLength, x+widthUntilStart, y);
	1402	}
	1403
	1404	void
	1405	TkpDrawAngledCharsInContext(
	1406	Display display, / Display on which to draw. */
	1407	Drawable drawable, /* Window or pixmap in which to draw. */
	1408	GC gc, /* Graphics context for drawing characters. */
	1409	Tk_Font tkfont, /* Font in which characters will be drawn; must
	1410	* be the same as font used in GC. */
	1411	const char * source, /* UTF-8 string to be displayed. Need not be
	1412	* '\0' terminated. All Tk meta-characters
	1413	* (tabs, control characters, and newlines)
	1414	* should be stripped out of the string that is
	1415	* passed to this function. If they are not
	1416	* stripped out, they will be displayed as
	1417	* regular printing characters. */
	1418	int numBytes, /* Number of bytes in string. */
	1419	int rangeStart, /* Index of first byte to draw. */
	1420	int rangeLength, /* Length of range to draw in bytes. */
	1421	double x, double y, /* Coordinates at which to place origin of the
	1422	* whole (not just the range) string when
	1423	* drawing. */
	1424	double angle) /* What angle to put text at, in degrees. */
	1425	{
	1426	int widthUntilStart;
	1427	double sinA = sin(angle * PI/180.0), cosA = cos(angle * PI/180.0);
	1428	(void) numBytes; /unused/
	1429
	1430	Tk_MeasureChars(tkfont, source, rangeStart, -1, 0, &widthUntilStart);
	1431	TkDrawAngledChars(display, drawable, gc, tkfont, source + rangeStart,
	1432	rangeLength, x+cosAwidthUntilStart, y-sinAwidthUntilStart, angle);
1399	1433	}
1400	1434
1401	1435	/*

1425	1459	* following string. */
1426	1460	const char source, / Potentially multilingual UTF-8 string. */
1427	1461	int numBytes, /* Length of string in bytes. */
1428		int x, int y, /* Coordinates at which to place origin of
	1462	double x, double y, /* Coordinates at which to place origin of
1429	1463	* string when drawing. */
1430	1464	double angle)
1431	1465	{

1437	1471	const char p, end, *next;
1438	1472	SubFont lastSubFontPtr, thisSubFontPtr;
1439	1473	TEXTMETRICW tm;
	1474	double sinA = sin(angle * PI/180.0), cosA = cos(angle * PI/180.0);
1440	1475
1441	1476	lastSubFontPtr = &fontPtr->subFontArray[0];
1442	1477	oldFont = SelectFont(hdc, fontPtr, lastSubFontPtr, angle);

1459	1494	familyPtr = lastSubFontPtr->familyPtr;
1460	1495	Tcl_UtfToExternalDString(familyPtr->encoding, source,
1461	1496	(int) (p - source), &runString);
1462		familyPtr->textOutProc(hdc, x-(tm.tmOverhang/2), y,
	1497	familyPtr->textOutProc(hdc, (int)(x-(double)tm.tmOverhang/2.0), y,
1463	1498	(WCHAR *)Tcl_DStringValue(&runString),
1464		Tcl_DStringLength(&runString)>>familyPtr->isWideFont);
	1499	Tcl_DStringLength(&runString) >> familyPtr->isWideFont);
1465	1500	familyPtr->getTextExtentPoint32Proc(hdc,
1466	1501	(WCHAR *)Tcl_DStringValue(&runString),
1467	1502	Tcl_DStringLength(&runString) >> familyPtr->isWideFont,
1468	1503	&size);
1469		x += size.cx;
	1504	x += cosA*size.cx;
	1505	y -= sinA*size.cx;
1470	1506	Tcl_DStringFree(&runString);
1471	1507	}
1472	1508	lastSubFontPtr = thisSubFontPtr;

1480	1516	familyPtr = lastSubFontPtr->familyPtr;
1481	1517	Tcl_UtfToExternalDString(familyPtr->encoding, source,
1482	1518	(int) (p - source), &runString);
1483		familyPtr->textOutProc(hdc, x-(tm.tmOverhang/2), y,
	1519	familyPtr->textOutProc(hdc, (int)(x-(double)tm.tmOverhang/2.0), y,
1484	1520	(WCHAR *)Tcl_DStringValue(&runString),
1485	1521	Tcl_DStringLength(&runString) >> familyPtr->isWideFont);
1486	1522	Tcl_DStringFree(&runString);

1496	1532	double angle)
1497	1533	{
1498	1534	if (angle == 0.0) {
1499		return SelectObject(hdc, subFontPtr->hFont0);
	1535	return (HFONT)SelectObject(hdc, subFontPtr->hFont0);
1500	1536	} else if (angle == subFontPtr->angle) {
1501		return SelectObject(hdc, subFontPtr->hFontAngled);
	1537	return (HFONT)SelectObject(hdc, subFontPtr->hFontAngled);
1502	1538	} else {
1503	1539	if (subFontPtr->hFontAngled) {
1504	1540	DeleteObject(subFontPtr->hFontAngled);

1506	1542	subFontPtr->hFontAngled = GetScreenFont(&fontPtr->font.fa,
1507	1543	subFontPtr->familyPtr->faceName, fontPtr->pixelSize, angle);
1508	1544	if (subFontPtr->hFontAngled == NULL) {
1509		return SelectObject(hdc, subFontPtr->hFont0);
	1545	return (HFONT)SelectObject(hdc, subFontPtr->hFont0);
1510	1546	}
1511	1547	subFontPtr->angle = angle;
1512		return SelectObject(hdc, subFontPtr->hFontAngled);
	1548	return (HFONT)SelectObject(hdc, subFontPtr->hFontAngled);
1513	1549	}
1514	1550	}
1515	1551

1561	1597	window = Tk_WindowId(tkwin);
1562	1598	hwnd = (window == None) ? NULL : TkWinGetHWND(window);
1563	1599	hdc = GetDC(hwnd);
1564		oldFont = SelectObject(hdc, hFont);
	1600	oldFont = (HFONT)SelectObject(hdc, hFont);
1565	1601
1566	1602	GetTextMetricsW(hdc, &tm);
1567	1603
1568	1604	GetTextFaceW(hdc, LF_FACESIZE, buf);
1569		Tcl_WinTCharToUtf((LPCTSTR)buf, -1, &faceString);
	1605	Tcl_DStringInit(&faceString);
	1606	Tcl_WCharToUtfDString(buf, wcslen(buf), &faceString);
1570	1607
1571	1608	fontPtr->font.fid = (Font) fontPtr;
1572	1609	fontPtr->hwnd = hwnd;

1730	1767	HDC hdc, /* HDC in which font can be selected. */
1731	1768	HFONT hFont, /* Screen font whose FontFamily is to be
1732	1769	* returned. */
1733		int base) /* Non-zero if this font family is to be used
	1770	TCL_UNUSED(int)) /* Non-zero if this font family is to be used
1734	1771	* in the base font of a font object. */
1735	1772	{
1736	1773	Tk_Uid faceName;

1738	1775	Tcl_DString faceString;
1739	1776	Tcl_Encoding encoding;
1740	1777	WCHAR buf[LF_FACESIZE];
1741		ThreadSpecificData *tsdPtr =
	1778	ThreadSpecificData tsdPtr = (ThreadSpecificData )
1742	1779	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
1743	1780
1744		hFont = SelectObject(hdc, hFont);
	1781	hFont = (HFONT)SelectObject(hdc, hFont);
1745	1782	GetTextFaceW(hdc, LF_FACESIZE, buf);
1746		Tcl_WinTCharToUtf((LPCTSTR)buf, -1, &faceString);
	1783	Tcl_DStringInit(&faceString);
	1784	Tcl_WCharToUtfDString(buf, wcslen(buf), &faceString);
1747	1785	faceName = Tk_GetUid(Tcl_DStringValue(&faceString));
1748	1786	Tcl_DStringFree(&faceString);
1749		hFont = SelectObject(hdc, hFont);
	1787	hFont = (HFONT)SelectObject(hdc, hFont);
1750	1788
1751	1789	familyPtr = tsdPtr->fontFamilyList;
1752	1790	for ( ; familyPtr != NULL; familyPtr = familyPtr->nextPtr) {

1756	1794	}
1757	1795	}
1758	1796
1759		familyPtr = ckalloc(sizeof(FontFamily));
	1797	familyPtr = (FontFamily *)ckalloc(sizeof(FontFamily));
1760	1798	memset(familyPtr, 0, sizeof(FontFamily));
1761	1799	familyPtr->nextPtr = tsdPtr->fontFamilyList;
1762	1800	tsdPtr->fontFamilyList = familyPtr;

1842	1880	{
1843	1881	int i;
1844	1882	FontFamily **familyPtrPtr;
1845		ThreadSpecificData *tsdPtr =
	1883	ThreadSpecificData tsdPtr = (ThreadSpecificData )
1846	1884	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
1847	1885
1848	1886	if (familyPtr == NULL) {

1919	1957	SubFont *subFontPtr;
1920	1958	Tcl_DString ds;
1921	1959
1922		if ((ch < BASE_CHARS) \|\| (ch >= 0x30000)) {
	1960	if ((ch < BASE_CHARS) \|\| (ch >= FONTMAP_NUMCHARS)) {
1923	1961	return &fontPtr->subFontArray[0];
1924	1962	}
1925	1963

2027	2065	static int CALLBACK
2028	2066	WinFontCanUseProc(
2029	2067	ENUMLOGFONTW lfPtr, / Logical-font data. */
2030		NEWTEXTMETRIC tmPtr, / Physical-font data (not used). */
2031		int fontType, /* Type of font (not used). */
	2068	TCL_UNUSED(NEWTEXTMETRIC ), / Physical-font data (not used). */
	2069	TCL_UNUSED(int), /* Type of font (not used). */
2032	2070	LPARAM lParam) /* Result object to hold result. */
2033	2071	{
2034	2072	int ch;

2046	2084	fontPtr = canUsePtr->fontPtr;
2047	2085	nameTriedPtr = canUsePtr->nameTriedPtr;
2048	2086
2049		fallbackName = Tcl_WinTCharToUtf((LPCTSTR)lfPtr->elfLogFont.lfFaceName, -1, &faceString);
	2087	fallbackName = (char *) lfPtr->elfLogFont.lfFaceName;
	2088	Tcl_DStringInit(&faceString);
	2089	Tcl_WCharToUtfDString((WCHAR )fallbackName, wcslen((WCHAR )fallbackName), &faceString);
	2090	fallbackName = Tcl_DStringValue(&faceString);
2050	2091
2051	2092	if (SeenName(fallbackName, nameTriedPtr) == 0) {
2052	2093	subFontPtr = CanUseFallback(hdc, fontPtr, fallbackName, ch,

2089	2130	{
2090	2131	int row, bitOffset;
2091	2132
2092		if (ch < 0 \|\| ch >= 0x30000) {
	2133	if (ch < 0 \|\| ch >= FONTMAP_NUMCHARS) {
2093	2134	return 0;
2094	2135	}
2095	2136

2133	2174	{
2134	2175	int row, bitOffset;
2135	2176
2136		if (ch >= 0 && ch < 0x30000) {
	2177	if (ch >= 0 && ch < FONTMAP_NUMCHARS) {
2137	2178	row = ch >> FONTMAP_SHIFT;
2138	2179	if (subFontPtr->fontMap[row] == NULL) {
2139	2180	FontMapLoadPage(subFontPtr, row);

2171	2212	{
2172	2213	FontFamily *familyPtr;
2173	2214	Tcl_Encoding encoding;
2174		char src[XMaxTransChars], buf[16];
	2215	int i, j, bitOffset, end, segCount;
2175	2216	USHORT startCount, endCount;
2176		int i, j, bitOffset, end, segCount;
2177
2178		subFontPtr->fontMap[row] = ckalloc(FONTMAP_BITSPERPAGE / 8);
	2217	char buf[16], src[6];
	2218
	2219	subFontPtr->fontMap[row] = (char *)ckalloc(FONTMAP_BITSPERPAGE / 8);
2179	2220	memset(subFontPtr->fontMap[row], 0, FONTMAP_BITSPERPAGE / 8);
2180	2221
2181	2222	familyPtr = subFontPtr->familyPtr;

2406	2447	if (fontPtr->numSubFonts >= SUBFONT_SPACE) {
2407	2448	SubFont *newPtr;
2408	2449
2409		newPtr = ckalloc(sizeof(SubFont) * (fontPtr->numSubFonts + 1));
	2450	newPtr = (SubFont )ckalloc(sizeof(SubFont) (fontPtr->numSubFonts + 1));
2410	2451	memcpy(newPtr, fontPtr->subFontArray,
2411	2452	fontPtr->numSubFonts * sizeof(SubFont));
2412	2453	if (fontPtr->subFontArray != fontPtr->staticSubFonts) {

2454	2495	double angle) /* What is the desired orientation of the
2455	2496	* font. */
2456	2497	{
2457		Tcl_DString ds;
2458	2498	HFONT hFont;
2459	2499	LOGFONTW lf;
2460	2500

2473	2513	lf.lfQuality = DEFAULT_QUALITY;
2474	2514	lf.lfPitchAndFamily = DEFAULT_PITCH \| FF_DONTCARE;
2475	2515
2476		Tcl_WinUtfToTChar(faceName, -1, &ds);
2477		wcsncpy(lf.lfFaceName, (WCHAR *)Tcl_DStringValue(&ds), LF_FACESIZE-1);
2478		Tcl_DStringFree(&ds);
	2516	MultiByteToWideChar(CP_UTF8, 0, faceName, -1, lf.lfFaceName, LF_FACESIZE);
2479	2517	lf.lfFaceName[LF_FACESIZE-1] = 0;
2480	2518	hFont = CreateFontIndirectW(&lf);
2481	2519	return hFont;

2524	2562	return 0;
2525	2563	}
2526	2564
2527		Tcl_WinUtfToTChar(faceName, -1, &faceString);
	2565	Tcl_DStringInit(&faceString);
	2566	Tcl_UtfToWCharDString(faceName, -1, &faceString);
2528	2567
2529	2568	/*
2530	2569	* If the family exists, WinFontExistProc() will be called and

2533	2572	* non-zero value.
2534	2573	*/
2535	2574
2536		result = EnumFontFamiliesW(hdc, (WCHAR*) Tcl_DStringValue(&faceString),
	2575	result = EnumFontFamiliesW(hdc, (WCHAR *)Tcl_DStringValue(&faceString),
2537	2576	(FONTENUMPROCW) WinFontExistProc, 0);
2538	2577	Tcl_DStringFree(&faceString);
2539	2578	return (result == 0);

2563	2602
2564	2603	static int CALLBACK
2565	2604	WinFontExistProc(
2566		ENUMLOGFONTW lfPtr, / Logical-font data. */
2567		NEWTEXTMETRIC tmPtr, / Physical-font data (not used). */
2568		int fontType, /* Type of font (not used). */
2569		LPARAM lParam) /* EnumFontData to hold result. */
	2605	TCL_UNUSED(ENUMLOGFONTW ), / Logical-font data. */
	2606	TCL_UNUSED(NEWTEXTMETRIC ), / Physical-font data (not used). */
	2607	TCL_UNUSED(int), /* Type of font (not used). */
	2608	TCL_UNUSED(LPARAM)) /* EnumFontData to hold result. */
2570	2609	{
2571	2610	return 0;
2572	2611	}

2721	2760	endCount = NULL;
2722	2761	*symbolPtr = 0;
2723	2762
2724		hFont = SelectObject(hdc, hFont);
	2763	hFont = (HFONT)SelectObject(hdc, hFont);
2725	2764
2726	2765	i = 0;
2727	2766	s = (char *) &i;

2776	2815	segCount = subTable.segment.segCountX2 / 2;
2777	2816	cbData = segCount * sizeof(USHORT);
2778	2817
2779		startCount = ckalloc(cbData);
2780		endCount = ckalloc(cbData);
	2818	startCount = (USHORT *)ckalloc(cbData);
	2819	endCount = (USHORT *)ckalloc(cbData);
2781	2820
2782	2821	offset = encTable.offset + sizeof(subTable.segment);
2783	2822	GetFontData(hdc, cmapKey, (DWORD) offset, endCount, cbData);

2820	2859
2821	2860	segCount = 1;
2822	2861	cbData = segCount * sizeof(USHORT);
2823		startCount = ckalloc(cbData);
2824		endCount = ckalloc(cbData);
	2862	startCount = (USHORT *)ckalloc(cbData);
	2863	endCount = (USHORT *)ckalloc(cbData);
2825	2864	startCount[0] = 0x0000;
2826	2865	endCount[0] = 0x00ff;
2827	2866	}

+8

-7

win/tkWinInit.c less more

34	34	TkpInit(
35	35	Tcl_Interp *interp)
36	36	{
	37	(void)interp;
37	38	/*
38	39	* This is necessary for static initialization, and is ok otherwise
39	40	* because TkWinXInit flips a static bit to do its work just once.

136	137
137	138	len = MultiByteToWideChar(CP_UTF8, 0, title, -1, titleString, TK_MAX_WARN_LEN);
138	139	msgString = &titleString[len + 1];
139		titleString[TK_MAX_WARN_LEN - 1] = L'\0';
	140	titleString[TK_MAX_WARN_LEN - 1] = '\0';
140	141	MultiByteToWideChar(CP_UTF8, 0, msg, -1, msgString, (TK_MAX_WARN_LEN - 1) - len);
141	142	/*
142	143	* Truncate MessageBox string if it is too long to not overflow the screen
143	144	* and cause possible oversized window error.
144	145	*/
145		if (titleString[TK_MAX_WARN_LEN - 1] != L'\0') {
	146	if (titleString[TK_MAX_WARN_LEN - 1] != '\0') {
146	147	memcpy(titleString + (TK_MAX_WARN_LEN - 5), L" ...", 5 * sizeof(WCHAR));
147	148	}
148	149	if (IsDebuggerPresent()) {
149		titleString[len - 1] = L':';
150		titleString[len] = L' ';
	150	titleString[len - 1] = ':';
	151	titleString[len] = ' ';
151	152	OutputDebugStringW(titleString);
152	153	} else {
153		titleString[len - 1] = L'\0';
	154	titleString[len - 1] = '\0';
154	155	MessageBoxW(NULL, msgString, titleString,
155	156	MB_OK \| MB_ICONEXCLAMATION \| MB_SYSTEMMODAL
156	157	\| MB_SETFOREGROUND \| MB_TOPMOST);

195	196	*p = '\0';
196	197	}
197	198
198		Tcl_WinTCharToUtf((LPCTSTR)lpBuffer, -1, &ds);
	199	Tcl_DStringInit(&ds);
	200	Tcl_WCharToUtfDString(lpBuffer, wcslen(lpBuffer), &ds);
199	201	errPtr = Tcl_NewStringObj(Tcl_DStringValue(&ds), Tcl_DStringLength(&ds));
200	202	Tcl_DStringFree(&ds);
201	203

205	207
206	208	return errPtr;
207	209	}
208
209	210
210	211	/*
211	212	* Local Variables:

+1

-0

win/tkWinInt.h less more

184	184
185	185	#define TK_THEME_WIN_CLASSIC 1
186	186	#define TK_THEME_WIN_XP 2
	187	#define TK_THEME_WIN_VISTA 3
187	188
188	189	/*
189	190	* The following is implemented in tkWinWm and used by tkWinEmbed.c

+5

-4

win/tkWinKey.c less more

96	96	* result. */
97	97	{
98	98	XKeyEvent *keyEv = &eventPtr->xkey;
	99	int len;
99	100	char buf[6];
100		int len;
101	101
102	102	Tcl_DStringInit(dsPtr);
103	103	if (keyEv->send_event == -1) {
104		if (keyEv->nbytes > 0) {
	104	TkKeyEvent ev = (TkKeyEvent )keyEv;
	105	if (ev->nbytes > 0) {
105	106	Tcl_ExternalToUtfDString(TkWinGetKeyInputEncoding(),
106		keyEv->trans_chars, keyEv->nbytes, dsPtr);
	107	ev->trans_chars, ev->nbytes, dsPtr);
107	108	}
108	109	} else if (keyEv->send_event == -3) {
109	110
110	111	/*
111		* Special case for WM_UNICHAR and win2000 multi-lingal IME input
	112	* Special case for WM_UNICHAR and win2000 multilingual IME input
112	113	*/
113	114
114	115	len = TkUniCharToUtf(keyEv->keycode, buf);

+153

-90

win/tkWinMenu.c less more

232	232	TkMenuEntry mePtr, / The menu we are working with. */
233	233	WORD menuIDPtr) / The resulting id. */
234	234	{
235		ThreadSpecificData *tsdPtr =
	235	ThreadSpecificData tsdPtr = (ThreadSpecificData )
236	236	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
237	237	WORD curID = tsdPtr->lastCommandID;
238	238
239	239	while (1) {
240	240	Tcl_HashEntry *commandEntryPtr;
241		int new;
	241	int isNew;
242	242
243	243	/*
244	244	* Try the next ID number, taking care to wrap rather than stray

254	254	}
255	255
256	256	commandEntryPtr = Tcl_CreateHashEntry(&tsdPtr->commandTable,
257		INT2PTR(curID), &new);
258		if (new) {
	257	INT2PTR(curID), &isNew);
	258	if (isNew) {
259	259	Tcl_SetHashValue(commandEntryPtr, mePtr);
260	260	*menuIDPtr = curID;
261	261	tsdPtr->lastCommandID = curID;

284	284	FreeID(
285	285	WORD commandID)
286	286	{
287		ThreadSpecificData *tsdPtr =
	287	ThreadSpecificData tsdPtr = (ThreadSpecificData )
288	288	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
289	289
290	290	/*

327	327	HMENU winMenuHdl;
328	328	Tcl_HashEntry *hashEntryPtr;
329	329	int newEntry;
330		ThreadSpecificData *tsdPtr =
	330	ThreadSpecificData tsdPtr = (ThreadSpecificData )
331	331	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
332	332
333	333	winMenuHdl = CreatePopupMenu();

373	373	{
374	374	HMENU winMenuHdl = (HMENU) menuPtr->platformData;
375	375	const char *searchName;
376		ThreadSpecificData *tsdPtr =
	376	ThreadSpecificData tsdPtr = (ThreadSpecificData )
377	377	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
378	378
379	379	if (menuPtr->menuFlags & MENU_RECONFIGURE_PENDING) {

387	387	if (menuPtr->menuFlags & MENU_SYSTEM_MENU) {
388	388	TkMenuEntry *searchEntryPtr;
389	389	Tcl_HashTable *tablePtr = TkGetMenuHashTable(menuPtr->interp);
390		char *menuName = Tcl_GetHashKey(tablePtr,
	390	char menuName = (char )Tcl_GetHashKey(tablePtr,
391	391	menuPtr->menuRefPtr->hashEntryPtr);
392	392
393	393	/*

419	419
420	420	if (tsdPtr->menuHWND != NULL) {
421	421	Tcl_HashEntry *hashEntryPtr =
422		Tcl_FindHashEntry(&tsdPtr->winMenuTable, (char *) winMenuHdl);
	422	Tcl_FindHashEntry(&tsdPtr->winMenuTable, winMenuHdl);
423	423
424	424	if (hashEntryPtr != NULL) {
425	425	Tcl_DeleteHashEntry(hashEntryPtr);

491	491	char *itemText;
492	492
493	493	if (mePtr->type == TEAROFF_ENTRY) {
494		itemText = ckalloc(sizeof("(Tear-off)"));
	494	itemText = (char *)ckalloc(sizeof("(Tear-off)"));
495	495	strcpy(itemText, "(Tear-off)");
496	496	} else if (mePtr->imagePtr != NULL) {
497		itemText = ckalloc(sizeof("(Image)"));
	497	itemText = (char *)ckalloc(sizeof("(Image)"));
498	498	strcpy(itemText, "(Image)");
499	499	} else if (mePtr->bitmapPtr != NULL) {
500		itemText = ckalloc(sizeof("(Pixmap)"));
	500	itemText = (char *)ckalloc(sizeof("(Pixmap)"));
501	501	strcpy(itemText, "(Pixmap)");
502	502	} else if (mePtr->labelPtr == NULL \|\| mePtr->labelLength == 0) {
503		itemText = ckalloc(sizeof("( )"));
	503	itemText = (char *)ckalloc(sizeof("( )"));
504	504	strcpy(itemText, "( )");
505	505	} else {
506	506	int i;

510	510	: Tcl_GetString(mePtr->accelPtr);
511	511	const char p, next;
512	512	Tcl_DString itemString;
	513	int ch;
513	514
514	515	/*
515	516	* We have to construct the string with an ampersand preceeding the

526	527	if (*p == '&') {
527	528	Tcl_DStringAppend(&itemString, "&", 1);
528	529	}
529		next = Tcl_UtfNext(p);
	530	next = p + TkUtfToUniChar(p, &ch);
530	531	Tcl_DStringAppend(&itemString, p, (int) (next - p));
531	532	}
532	533	if (mePtr->accelLength > 0) {

535	536	if (*p == '&') {
536	537	Tcl_DStringAppend(&itemString, "&", 1);
537	538	}
538		next = Tcl_UtfNext(p);
	539	next = p + TkUtfToUniChar(p, &ch);
539	540	Tcl_DStringAppend(&itemString, p, (int) (next - p));
540	541	}
541	542	}
542	543
543		itemText = ckalloc(Tcl_DStringLength(&itemString) + 1);
	544	itemText = (char *)ckalloc(Tcl_DStringLength(&itemString) + 1);
544	545	strcpy(itemText, Tcl_DStringValue(&itemString));
545	546	Tcl_DStringFree(&itemString);
546	547	}

568	569	ReconfigureWindowsMenu(
569	570	ClientData clientData) /* The menu we are rebuilding */
570	571	{
571		TkMenu *menuPtr = clientData;
	572	TkMenu menuPtr = (TkMenu )clientData;
572	573	TkMenuEntry *mePtr;
573	574	HMENU winMenuHdl = (HMENU) menuPtr->platformData;
574	575	char *itemText = NULL;

608	609	itemText = GetEntryText(menuPtr, mePtr);
609	610	if ((menuPtr->menuType == MENUBAR)
610	611	\|\| (menuPtr->menuFlags & MENU_SYSTEM_MENU)) {
611		Tcl_WinUtfToTChar(itemText, -1, &translatedText);
	612	Tcl_DStringInit(&translatedText);
	613	Tcl_UtfToWCharDString(itemText, -1, &translatedText);
612	614	lpNewItem = (LPCWSTR) Tcl_DStringValue(&translatedText);
613	615	flags \|= MF_STRING;
614	616	} else {

727	729
728	730	if ((menuPtr->menuType == MENUBAR)
729	731	&& (menuPtr->parentTopLevelPtr != NULL)) {
730		HANDLE bar = TkWinGetWrapperWindow(menuPtr->parentTopLevelPtr);
	732	HWND bar = TkWinGetWrapperWindow(menuPtr->parentTopLevelPtr);
731	733
732	734	if (bar) {
733	735	DrawMenuBar(bar);

758	760
759	761	int
760	762	TkpPostMenu(
761		Tcl_Interp *interp,
	763	Tcl_Interp *dummy,
762	764	TkMenu *menuPtr,
763	765	int x, int y, int index)
764	766	{

768	770	POINT point;
769	771	Tk_Window parentWindow = Tk_Parent(menuPtr->tkwin);
770	772	int oldServiceMode = Tcl_GetServiceMode();
771		ThreadSpecificData *tsdPtr =
	773	ThreadSpecificData tsdPtr = (ThreadSpecificData )
772	774	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
	775	(void)dummy;
773	776
774	777	tsdPtr->inPostMenu++;
775	778	CallPendingReconfigureImmediately(menuPtr);

868	871
869	872	int
870	873	TkpPostTearoffMenu(
871		Tcl_Interp interp, / The interpreter of the menu */
	874	Tcl_Interp dummy, / The interpreter of the menu */
872	875	TkMenu menuPtr, / The menu we are posting */
873	876	int x, int y, int index) /* The root X,Y coordinates where we are
874	877	* posting */
875	878	{
876	879	int vRootX, vRootY, vRootWidth, vRootHeight;
877	880	int result;
	881	(void)dummy;
878	882
879	883	if (index >= menuPtr->numEntries) {
880	884	index = menuPtr->numEntries - 1;

1063	1067	{
1064	1068	static int nIdles = 0;
1065	1069	LRESULT lResult = 1;
1066		ThreadSpecificData *tsdPtr =
	1070	ThreadSpecificData tsdPtr = (ThreadSpecificData )
1067	1071	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
1068	1072
1069	1073	switch(message) {

1139	1143	int returnResult = 0;
1140	1144	TkMenu *menuPtr;
1141	1145	TkMenuEntry *mePtr;
1142		ThreadSpecificData *tsdPtr =
	1146	ThreadSpecificData tsdPtr = (ThreadSpecificData )
1143	1147	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
	1148	(void)phwnd;
1144	1149
1145	1150	switch (*pMessage) {
1146	1151	case WM_UNINITMENUPOPUP:
1147	1152	hashEntryPtr = Tcl_FindHashEntry(&tsdPtr->winMenuTable,
1148		(char ) pwParam);
	1153	*pwParam);
1149	1154	if (hashEntryPtr != NULL) {
1150		menuPtr = Tcl_GetHashValue(hashEntryPtr);
	1155	menuPtr = (TkMenu *)Tcl_GetHashValue(hashEntryPtr);
1151	1156	if ((menuPtr->menuRefPtr != NULL)
1152	1157	&& (menuPtr->menuRefPtr->parentEntryPtr != NULL)) {
1153	1158	TkPostSubmenu(menuPtr->interp,

1159	1164	case WM_INITMENU:
1160	1165	TkMenuInit();
1161	1166	hashEntryPtr = Tcl_FindHashEntry(&tsdPtr->winMenuTable,
1162		(char ) pwParam);
	1167	*pwParam);
1163	1168	if (hashEntryPtr != NULL) {
1164	1169	tsdPtr->oldServiceMode = Tcl_SetServiceMode(TCL_SERVICE_ALL);
1165		menuPtr = Tcl_GetHashValue(hashEntryPtr);
	1170	menuPtr = (TkMenu *)Tcl_GetHashValue(hashEntryPtr);
1166	1171	tsdPtr->modalMenuPtr = menuPtr;
1167	1172	CallPendingReconfigureImmediately(menuPtr);
1168	1173	RecursivelyClearActiveMenu(menuPtr);

1198	1203	if (hashEntryPtr == NULL) {
1199	1204	break;
1200	1205	}
1201		mePtr = Tcl_GetHashValue(hashEntryPtr);
	1206	mePtr = (TkMenuEntry *)Tcl_GetHashValue(hashEntryPtr);
1202	1207	if (mePtr != NULL) {
1203	1208	TkMenuReferences *menuRefPtr;
1204	1209	TkMenuEntry *parentEntryPtr;

1244	1249
1245	1250	case WM_MENUCHAR: {
1246	1251	hashEntryPtr = Tcl_FindHashEntry(&tsdPtr->winMenuTable,
1247		(char ) plParam);
	1252	*plParam);
1248	1253	if (hashEntryPtr != NULL) {
1249	1254	int i, len, underline;
1250	1255	Tcl_Obj *labelPtr;
1251		LPCWSTR wlabel;
	1256	WCHAR *wlabel;
1252	1257	int menuChar;
1253	1258	Tcl_DString ds;
1254	1259
1255	1260	*plResult = 0;
1256		menuPtr = Tcl_GetHashValue(hashEntryPtr);
	1261	menuPtr = (TkMenu *)Tcl_GetHashValue(hashEntryPtr);
1257	1262	/*
1258	1263	* Assume we have something directly convertable to Tcl_UniChar.
1259	1264	* True at least for wide systems.

1271	1276	const char *src = Tcl_GetStringFromObj(labelPtr, &len);
1272	1277
1273	1278	Tcl_DStringFree(&ds);
1274		wlabel = (LPCWSTR) Tcl_WinUtfToTChar(src, len, &ds);
1275		if ((underline < len) && (menuChar ==
	1279	Tcl_DStringInit(&ds);
	1280	wlabel = Tcl_UtfToWCharDString(src, len, &ds);
	1281	if ((underline + 1 < len + 1) && (menuChar ==
1276	1282	Tcl_UniCharToUpper(wlabel[underline]))) {
1277	1283	*plResult = (2 << 16) \| i;
1278	1284	returnResult = 1;

1324	1330	}
1325	1331	mePtr = (TkMenuEntry *) itemPtr->itemData;
1326	1332	menuPtr = mePtr->menuPtr;
1327		twdPtr = ckalloc(sizeof(TkWinDrawable));
	1333	twdPtr = (TkWinDrawable *)ckalloc(sizeof(TkWinDrawable));
1328	1334	twdPtr->type = TWD_WINDC;
1329	1335	twdPtr->winDC.hdc = itemPtr->hDC;
1330	1336

1388	1394	menuPtr = NULL;
1389	1395	if (*plParam != 0) {
1390	1396	hashEntryPtr = Tcl_FindHashEntry(&tsdPtr->winMenuTable,
1391		(char ) plParam);
	1397	*plParam);
1392	1398	if (hashEntryPtr != NULL) {
1393		menuPtr = Tcl_GetHashValue(hashEntryPtr);
	1399	menuPtr = (TkMenu *)Tcl_GetHashValue(hashEntryPtr);
1394	1400	}
1395	1401	}
1396	1402

1415	1421	hashEntryPtr = Tcl_FindHashEntry(&tsdPtr->commandTable,
1416	1422	INT2PTR(entryIndex));
1417	1423	if (hashEntryPtr != NULL) {
1418		mePtr = Tcl_GetHashValue(hashEntryPtr);
	1424	mePtr = (TkMenuEntry *)Tcl_GetHashValue(hashEntryPtr);
1419	1425	}
1420	1426	}
1421	1427	}

1504	1510	TkMenu menuPtr) / The menu we are inserting */
1505	1511	{
1506	1512	HMENU winMenuHdl;
1507		ThreadSpecificData *tsdPtr =
	1513	ThreadSpecificData tsdPtr = (ThreadSpecificData )
1508	1514	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
1509	1515
1510	1516	if (menuPtr != NULL) {

1513	1519
1514	1520	winMenuHdl = (HMENU) menuPtr->platformData;
1515	1521	hashEntryPtr = Tcl_FindHashEntry(&tsdPtr->winMenuTable,
1516		(char *) winMenuHdl);
	1522	winMenuHdl);
1517	1523	Tcl_DeleteHashEntry(hashEntryPtr);
1518	1524	DestroyMenu(winMenuHdl);
1519	1525	winMenuHdl = CreateMenu();

1552	1558	const char menuName) / The name of the menu to put in front. If
1553	1559	* NULL, use the default menu bar. */
1554	1560	{
	1561	(void)interp;
	1562	(void)tkwin;
	1563	(void)menuName;
	1564
1555	1565	/*
1556	1566	* Nothing to do.
1557	1567	*/

1582	1592	int widthPtr, / The resulting width */
1583	1593	int heightPtr) / The resulting height */
1584	1594	{
	1595	(void)menuPtr;
	1596	(void)tkfont;
	1597	(void)fmPtr;
	1598
1585	1599	*heightPtr = indicatorDimensions[0];
1586	1600	if (mePtr->hideMargin) {
1587	1601	*widthPtr = 0;

1630	1644	{
1631	1645	*heightPtr = fmPtr->linespace;
1632	1646	if (mePtr->type == CASCADE_ENTRY) {
1633		*widthPtr = 0;
	1647	/*
	1648	* Cascade entries have no accelerator but do show an arrow. Set
	1649	* this field width to the width of the OBM_MNARROW system bitmap
	1650	* used to display the arrow. I couldn't find how to query the
	1651	* system for this value, therefore I resort to hardcoding.
	1652	*/
	1653	*widthPtr = CASCADE_ARROW_WIDTH;
1634	1654	} else if ((menuPtr->menuType != MENUBAR) && (mePtr->accelPtr != NULL)) {
1635	1655	const char *accel = Tcl_GetString(mePtr->accelPtr);
1636	1656

1665	1685	int widthPtr, / The resulting width */
1666	1686	int heightPtr) / The resulting height */
1667	1687	{
1668		if (menuPtr->menuType != MASTER_MENU) {
	1688	(void)mePtr;
	1689	(void)tkfont;
	1690
	1691	if (menuPtr->menuType != MAIN_MENU) {
1669	1692	*heightPtr = 0;
1670	1693	} else {
1671	1694	*heightPtr = fmPtr->linespace;

1698	1721	int widthPtr, / The resulting width */
1699	1722	int heightPtr) / The resulting height */
1700	1723	{
	1724	(void)menuPtr;
	1725	(void)mePtr;
	1726	(void)tkfont;
	1727
1701	1728	*widthPtr = 0;
1702	1729	heightPtr = fmPtr->linespace - (2 fmPtr->descent);
1703	1730	}

1811	1838	int width,
1812	1839	int height)
1813	1840	{
	1841	(void)tkfont;
	1842	(void)fmPtr;
	1843	(void)width;
	1844	(void)height;
	1845
1814	1846	if ((mePtr->type == CHECK_BUTTON_ENTRY)
1815	1847	\|\| (mePtr->type == RADIO_BUTTON_ENTRY)) {
1816	1848	if (mePtr->indicatorOn && (mePtr->entryFlags & ENTRY_SELECTED)) {

1891	1923	int baseline;
1892	1924	int leftEdge = x + mePtr->indicatorSpace + mePtr->labelWidth;
1893	1925	const char *accel;
	1926	(void)activeBorder;
	1927	(void)width;
	1928	(void)height;
1894	1929
1895	1930	if (menuPtr->menuType == MENUBAR) {
1896	1931	return;

1908	1943	* Draw disabled 3D text highlight only with the Win95/98 look.
1909	1944	*/
1910	1945
1911		if (TkWinGetPlatformTheme() == TK_THEME_WIN_CLASSIC) {
	1946	if (TkWinGetPlatformTheme() != TK_THEME_WIN_XP) {
1912	1947	if ((mePtr->state == ENTRY_DISABLED)
1913	1948	&& (menuPtr->disabledFgPtr != NULL) && (accel != NULL)) {
1914	1949	COLORREF oldFgColor = gc->foreground;

1934	1969	* DrawMenuEntryArrow --
1935	1970	*
1936	1971	* This function draws the arrow bitmap on the right side of a menu
1937		* entry. This function is only used when drawing the arrow for a
1938		* disabled cascade menu.
	1972	* entry. This function is only used when drawing the arrow for:
	1973	* - a disabled cascade item
	1974	* - a cascade item in any state in a torn-off menu
1939	1975	*
1940	1976	* Results:
1941	1977	* None.

1964	2000	COLORREF oldFgColor;
1965	2001	COLORREF oldBgColor;
1966	2002	RECT rect;
	2003	(void)gc;
	2004	(void)activeBorder;
1967	2005
1968	2006	if (!drawArrow \|\| (mePtr->type != CASCADE_ENTRY)) {
1969	2007	return;
	2008	}
	2009
	2010	/*
	2011	* Don't draw the arrow if a submenu is not attached to this
	2012	* cascade entry.
	2013	*/
	2014
	2015	if ((mePtr->childMenuRefPtr == NULL)
	2016	\|\| (mePtr->childMenuRefPtr->menuPtr == NULL)) {
	2017	return;
1970	2018	}
1971	2019
1972	2020	oldFgColor = gc->foreground;

2034	2082	{
2035	2083	XPoint points[2];
2036	2084	Tk_3DBorder border;
	2085	(void)mePtr;
	2086	(void)gc;
	2087	(void)tkfont;
	2088	(void)fmPtr;
2037	2089
2038	2090	points[0].x = x;
2039	2091	points[0].y = y + height / 2;

2073	2125	int width, /* Width of entry */
2074	2126	int height) /* Height of entry */
2075	2127	{
	2128	(void)fmPtr;
	2129	(void)width;
	2130
2076	2131	if ((mePtr->underline >= 0) && (mePtr->labelPtr != NULL)) {
2077	2132	int len;
2078	2133
2079	2134	len = Tcl_GetCharLength(mePtr->labelPtr);
2080	2135	if (mePtr->underline < len) {
2081	2136	const char label, start, *end;
	2137	int ch;
2082	2138
2083	2139	label = Tcl_GetString(mePtr->labelPtr);
2084		start = Tcl_UtfAtIndex(label, mePtr->underline);
2085		end = Tcl_UtfNext(start);
	2140	start = TkUtfAtIndex(label, mePtr->underline);
	2141	end = start + TkUtfToUniChar(start, &ch);
2086	2142	Tk_UnderlineChars(menuPtr->display, d,
2087	2143	gc, tkfont, label, x + mePtr->indicatorSpace,
2088	2144	y + (height + fmPtr->ascent - fmPtr->descent) / 2,

2112	2168
2113	2169	static int
2114	2170	TkWinMenuKeyObjCmd(
2115		ClientData clientData, /* Unused. */
	2171	ClientData dummy, /* Unused. */
2116	2172	Tcl_Interp interp, / Current interpreter. */
2117	2173	int objc, /* Number of arguments. */
2118	2174	Tcl_Obj const objv[]) / Argument objects. */

2124	2180	TkWindow *winPtr;
2125	2181	KeySym keySym;
2126	2182	int i;
	2183	(void)dummy;
2127	2184
2128	2185	if (objc != 3) {
2129	2186	Tcl_WrongNumArgs(interp, 1, objv, "window keySym");

2173	2230	virtualKey = XKeysymToKeycode(winPtr->display, keySym);
2174	2231	scanCode = MapVirtualKeyW(virtualKey, 0);
2175	2232	if (0 != scanCode) {
2176		XKeyEvent xkey = eventPtr->xkey;
	2233	TkKeyEvent xkey;
	2234	memcpy(&xkey, eventPtr, sizeof(xkey));
2177	2235	CallWindowProcW(DefWindowProcW, Tk_GetHWND(Tk_WindowId(tkwin)),
2178	2236	WM_SYSKEYDOWN, virtualKey,
2179	2237	(int) ((scanCode << 16) \| (1 << 29)));
2180		if (xkey.nbytes > 0) {
2181		for (i = 0; i < xkey.nbytes; i++) {
2182		CallWindowProcW(DefWindowProcW,
2183		Tk_GetHWND(Tk_WindowId(tkwin)), WM_SYSCHAR,
2184		xkey.trans_chars[i],
2185		(int) ((scanCode << 16) \| (1 << 29)));
2186		}
	2238	for (i = 0; i < xkey.nbytes; i++) {
	2239	CallWindowProcW(DefWindowProcW,
	2240	Tk_GetHWND(Tk_WindowId(tkwin)), WM_SYSCHAR,
	2241	xkey.trans_chars[i],
	2242	(int) ((scanCode << 16) \| (1 << 29)));
2187	2243	}
2188	2244	}
2189	2245	}

2256	2312	*/
2257	2313
2258	2314	(void) Tcl_CreateObjCommand(interp, "tk::WinMenuKey",
2259		TkWinMenuKeyObjCmd,
2260		(ClientData) Tk_MainWindow(interp), (Tcl_CmdDeleteProc *) NULL);
	2315	TkWinMenuKeyObjCmd, Tk_MainWindow(interp), NULL);
2261	2316
2262	2317	(void) Tk_CreateBinding(interp, bindingTable, (ClientData) uid,
2263	2318	"<Alt_L>", "tk::WinMenuKey %W %N", 0);

2440	2495	int baseline = y + (height + fmPtr->ascent - fmPtr->descent) / 2;
2441	2496	const char *label = Tcl_GetString(mePtr->labelPtr);
2442	2497
2443		if (TkWinGetPlatformTheme() == TK_THEME_WIN_CLASSIC) {
	2498	if (TkWinGetPlatformTheme() != TK_THEME_WIN_XP) {
2444	2499	/*
2445	2500	* Win 95/98 systems draw disabled menu text with a 3D
2446	2501	* highlight, unless the menu item is highlighted,

2536	2591	XPoint points[2];
2537	2592	int segmentWidth, maxX;
2538	2593	Tk_3DBorder border;
2539
2540		if (menuPtr->menuType != MASTER_MENU) {
	2594	(void)mePtr;
	2595	(void)gc;
	2596	(void)tkfont;
	2597	(void)fmPtr;
	2598
	2599	if (menuPtr->menuType != MAIN_MENU) {
2541	2600	return;
2542	2601	}
2543	2602

2579	2638
2580	2639	int
2581	2640	TkpConfigureMenuEntry(
2582		register TkMenuEntry mePtr)/ Information about menu entry; may or may
	2641	TkMenuEntry mePtr)/ Information about menu entry; may or may
2583	2642	* not already have values for some fields. */
2584	2643	{
2585	2644	ScheduleMenuReconfigure(mePtr->menuPtr);

2643	2702	menuDc = TkWinGetDrawableDC(menuPtr->display, menuDrawable, &dcState);
2644	2703
2645	2704	memDc = CreateCompatibleDC(menuDc);
2646		oldBitmap = SelectObject(memDc,
	2705	oldBitmap = (HBITMAP)SelectObject(memDc,
2647	2706	CreateCompatibleBitmap(menuDc, width, height) );
2648	2707
2649	2708	memWinDraw.type = TWD_WINDC;

3100	3159	MenuSelectEvent(
3101	3160	TkMenu menuPtr) / the menu we have selected. */
3102	3161	{
3103		XVirtualEvent event;
	3162	union {XEvent general; XVirtualEvent virt;} event;
3104	3163	union {DWORD msgpos; POINTS point;} root;
3105	3164
3106		event.type = VirtualEvent;
3107		event.serial = menuPtr->display->request;
3108		event.send_event = 0;
3109		event.display = menuPtr->display;
	3165	memset(&event, 0, sizeof(event));
	3166	event.virt.type = VirtualEvent;
	3167	event.virt.serial = menuPtr->display->request;
	3168	event.virt.send_event = 0;
	3169	event.virt.display = menuPtr->display;
3110	3170	Tk_MakeWindowExist(menuPtr->tkwin);
3111		event.event = Tk_WindowId(menuPtr->tkwin);
3112		event.root = XRootWindow(menuPtr->display, 0);
3113		event.subwindow = None;
3114		event.time = TkpGetMS();
	3171	event.virt.event = Tk_WindowId(menuPtr->tkwin);
	3172	event.virt.root = XRootWindow(menuPtr->display, 0);
	3173	event.virt.subwindow = None;
	3174	event.virt.time = TkpGetMS();
3115	3175
3116	3176	root.msgpos = GetMessagePos();
3117		event.x_root = root.point.x;
3118		event.y_root = root.point.y;
3119		event.state = TkWinGetModifierState();
3120		event.same_screen = 1;
3121		event.name = Tk_GetUid("MenuSelect");
3122		event.user_data = NULL;
3123		Tk_QueueWindowEvent((XEvent *) &event, TCL_QUEUE_TAIL);
	3177	event.virt.x_root = root.point.x;
	3178	event.virt.y_root = root.point.y;
	3179	event.virt.state = TkWinGetModifierState();
	3180	event.virt.same_screen = 1;
	3181	event.virt.name = Tk_GetUid("MenuSelect");
	3182	event.virt.user_data = NULL;
	3183	Tk_QueueWindowEvent(&event.general, TCL_QUEUE_TAIL);
3124	3184	}
3125	3185
3126	3186	/*

3185	3245	Tk_GetMenuHWND(
3186	3246	Tk_Window tkwin)
3187	3247	{
3188		ThreadSpecificData *tsdPtr =
	3248	ThreadSpecificData tsdPtr = (ThreadSpecificData )
3189	3249	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
	3250	(void)tkwin;
3190	3251
3191	3252	TkMenuInit();
3192	3253	return tsdPtr->embeddedMenuHWND;

3210	3271
3211	3272	static void
3212	3273	MenuExitHandler(
3213		ClientData clientData) /* Not used */
3214		{
	3274	ClientData dummy) /* Not used */
	3275	{
	3276	(void)dummy;
	3277
3215	3278	UnregisterClassW(MENU_CLASS_NAME, Tk_GetHINSTANCE());
3216	3279	UnregisterClassW(EMBEDDED_MENU_CLASS_NAME, Tk_GetHINSTANCE());
3217	3280	}

3235	3298
3236	3299	static void
3237	3300	MenuThreadExitHandler(
3238		ClientData clientData) /* Not used */
3239		{
3240		ThreadSpecificData *tsdPtr =
	3301	ClientData dummy) /* Not used */
	3302	{
	3303	ThreadSpecificData tsdPtr = (ThreadSpecificData )
3241	3304	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
	3305	(void)dummy;
3242	3306
3243	3307	DestroyWindow(tsdPtr->menuHWND);
3244	3308	DestroyWindow(tsdPtr->embeddedMenuHWND);

3275	3339	const char className) / The name of the option class. */
3276	3340	{
3277	3341	Tcl_Obj *valuePtr = NULL;
	3342	(void)tkwin;
	3343	(void)className;
3278	3344
3279	3345	if ((strcmp(dbName, "activeBorderWidth") == 0) \|\|
3280	3346	(strcmp(dbName, "borderWidth") == 0)) {

3323	3389	int padding;
3324	3390	#endif
3325	3391	} nc;
3326		OSVERSIONINFOW os;
3327	3392
3328	3393	/*
3329	3394	* Set all of the default options. The loop will terminate when we run out

3343	3408
3344	3409	nc.metrics.cbSize = sizeof(nc);
3345	3410
3346		os.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW);
3347		GetVersionExW(&os);
3348		if (os.dwMajorVersion < 6) {
	3411	if (TkWinGetPlatformTheme() != TK_THEME_WIN_VISTA) {
3349	3412	nc.metrics.cbSize -= sizeof(int);
3350	3413	}
3351	3414

3478	3541	void
3479	3542	TkpMenuThreadInit(void)
3480	3543	{
3481		ThreadSpecificData *tsdPtr =
	3544	ThreadSpecificData tsdPtr = (ThreadSpecificData )
3482	3545	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
3483	3546
3484	3547	tsdPtr->menuHWND = CreateWindowW(MENU_CLASS_NAME, L"MenuWindow", WS_POPUP,

+13

-0

win/tkWinPointer.c less more

367	367	input.type = INPUT_MOUSE;
368	368	input.mi.dx = (x * 65535 + xscreen/2) / xscreen;
369	369	input.mi.dy = (y * 65535 + yscreen/2) / yscreen;
	370
	371	/*
	372	* Horrible workaround here. There is a bug on Win 10: when warping to
	373	* pixel (x = 0, y = 0) the SendInput() below just does not move the
	374	* mouse pointer. However, as soon as dx or dy is non zero it moves as
	375	* expected. Given the scaling factor of 65535 (see above),
	376	* (dx = 1 , dy = 0) still means pixel (x = 0, y = 0).
	377	* See ticket [69b48f427e].
	378	*/
	379	if (input.mi.dx == 0 && input.mi.dy == 0) {
	380	input.mi.dx = 1;
	381	}
	382
370	383	input.mi.mouseData = 0;
371	384	input.mi.dwFlags = MOUSEEVENTF_ABSOLUTE \| MOUSEEVENTF_MOVE;
372	385	input.mi.time = 0;

+10

-0

win/tkWinPort.h less more

90	90	* See ticket [916c1095438eae56]: GetVersionExW triggers warnings
91	91	*/
92	92	#if defined(_MSC_VER)
	93	# pragma warning(disable:4146)
93	94	# pragma warning(disable:4267)
94	95	# pragma warning(disable:4244)
95	96	# pragma warning(disable:4311)
96	97	# pragma warning(disable:4312)
97	98	# pragma warning(disable:4996)
	99	#if !defined(_WIN64)
	100	# pragma warning(disable:4305)
	101	#endif
98	102	#endif
99	103
100	104	/*

116	120	\| ((p)->green & 0xff00) \| (((p)->blue << 8) & 0xff0000)) \| 0x20000000)
117	121
118	122	/*
	123	* Used by tkWindow.c
	124	*/
	125
	126	#define TkpHandleMapOrUnmap(tkwin, event) Tk_HandleEvent(event)
	127
	128	/*
119	129	* These calls implement native bitmaps which are not currently
120	130	* supported under Windows. The macros eliminate the calls.
121	131	*/

+24

-15

win/tkWinSend.c less more

120	120	* be globally unique. */
121	121	{
122	122	#ifndef TK_SEND_ENABLED_ON_WINDOWS
	123	(void)tkwin;
	124
123	125	/*
124	126	* Temporarily disabled for bug #858822
125	127	*/

162	164	if (riPtr == NULL) {
163	165	LPUNKNOWN *objPtr;
164	166
165		riPtr = ckalloc(sizeof(RegisteredInterp));
	167	riPtr = (RegisteredInterp *)ckalloc(sizeof(RegisteredInterp));
166	168	memset(riPtr, 0, sizeof(RegisteredInterp));
167	169	riPtr->interp = interp;
168	170

212	214	* lookup. */
213	215	{
214	216	#ifndef TK_SEND_ENABLED_ON_WINDOWS
	217	(void)interp;
	218	(void)tkwin;
215	219	/*
216	220	* Temporarily disabled for bug #858822
217	221	*/

253	257	if (*p) {
254	258	Tcl_DString ds;
255	259
256		Tcl_WinTCharToUtf((LPCTSTR)(p + 1), -1, &ds);
	260	Tcl_DStringInit(&ds);
	261	Tcl_WCharToUtfDString(p + 1, wcslen(p + 1), &ds);
257	262	result = Tcl_ListObjAppendElement(interp,
258	263	objList,
259	264	Tcl_NewStringObj(Tcl_DStringValue(&ds),

618	623	LPMONIKER pmkItem = NULL;
619	624	Tcl_DString dString;
620	625
621		Tcl_WinUtfToTChar(name, -1, &dString);
	626	Tcl_DStringInit(&dString);
	627	Tcl_UtfToWCharDString(name, -1, &dString);
622	628	hr = CreateFileMoniker((LPOLESTR)Tcl_DStringValue(&dString), &pmkItem);
623	629	Tcl_DStringFree(&dString);
624	630	if (SUCCEEDED(hr)) {

732	738	* object. */
733	739	Tcl_Interp interp, / The local interpreter. */
734	740	int async, /* Flag for the calling style. */
735		ClientData clientData, /* The RegisteredInterp structure for this
	741	ClientData dummy, /* The RegisteredInterp structure for this
736	742	* interp. */
737	743	int objc, /* Number of arguments to be sent. */
738	744	Tcl_Obj const objv[]) / The arguments to be sent. */

746	752	DISPID dispid;
747	753	Tcl_DString ds;
748	754	const char *src;
	755	(void)dummy;
749	756
750	757	cmd = Tcl_ConcatObj(objc, objv);
751	758

760	767
761	768	vCmd.vt = VT_BSTR;
762	769	src = Tcl_GetString(cmd);
763		Tcl_WinUtfToTChar(src, cmd->length, &ds);
764		vCmd.bstrVal = SysAllocString((WCHAR *) Tcl_DStringValue(&ds));
	770	Tcl_DStringInit(&ds);
	771	vCmd.bstrVal = SysAllocString(Tcl_UtfToWCharDString(src, cmd->length, &ds));
765	772	Tcl_DStringFree(&ds);
766	773
767	774	dp.cArgs = 1;

783	790
784	791	ehr = VariantChangeType(&vResult, &vResult, 0, VT_BSTR);
785	792	if (SUCCEEDED(ehr)) {
786		Tcl_WinTCharToUtf((LPCTSTR)vResult.bstrVal, SysStringLen(vResult.bstrVal) *
787		sizeof (WCHAR), &ds);
	793	Tcl_DStringInit(&ds);
	794	Tcl_WCharToUtfDString(vResult.bstrVal, SysStringLen(vResult.bstrVal), &ds);
788	795	Tcl_DStringResult(interp, &ds);
789	796	}
790	797

796	803
797	804	if (hr == DISP_E_EXCEPTION && ei.bstrSource != NULL) {
798	805	Tcl_Obj opError, opErrorCode, *opErrorInfo;
799		Tcl_WinTCharToUtf((LPCTSTR)ei.bstrSource, SysStringLen(ei.bstrSource) *
800		sizeof (WCHAR), &ds);
	806
	807	Tcl_DStringInit(&ds);
	808	Tcl_WCharToUtfDString(ei.bstrSource, SysStringLen(ei.bstrSource), &ds);
801	809	opError = Tcl_NewStringObj(Tcl_DStringValue(&ds),
802	810	Tcl_DStringLength(&ds));
803	811	Tcl_DStringFree(&ds);

868	876	/* TODO: Handle failure to append */
869	877
870	878	src = Tcl_GetString(opError);
871		Tcl_WinUtfToTChar(src, opError->length, &ds);
	879	Tcl_DStringInit(&ds);
872	880	pExcepInfo->bstrDescription =
873		SysAllocString((WCHAR *) Tcl_DStringValue(&ds));
	881	SysAllocString(Tcl_UtfToWCharDString(src, opError->length, &ds));
874	882	Tcl_DStringFree(&ds);
875	883	src = Tcl_GetString(opErrorCode);
876		Tcl_WinUtfToTChar(src, opErrorCode->length, &ds);
	884	Tcl_DStringInit(&ds);
877	885	pExcepInfo->bstrSource =
878		SysAllocString((WCHAR *) Tcl_DStringValue(&ds));
	886	SysAllocString(Tcl_UtfToWCharDString(src, opErrorCode->length, &ds));
879	887	Tcl_DStringFree(&ds);
880	888	Tcl_DecrRefCount(opErrorCode);
881	889	pExcepInfo->scode = E_FAIL;

922	930
923	931	TRACE("SendQueueCommand()\n");
924	932
925		evPtr = ckalloc(sizeof(SendEvent));
	933	evPtr = (SendEvent *)ckalloc(sizeof(SendEvent));
926	934	evPtr->header.proc = SendEventProc;
927	935	evPtr->header.nextPtr = NULL;
928	936	evPtr->interp = interp;

964	972	int flags)
965	973	{
966	974	SendEvent evPtr = (SendEvent )eventPtr;
	975	(void)flags;
967	976
968	977	TRACE("SendEventProc\n");
969	978

+46

-31

win/tkWinSendCom.c less more

165	165	void **ppvObject)
166	166	{
167	167	HRESULT hr = E_NOINTERFACE;
168		TkWinSendCom this = (TkWinSendCom ) This;
	168	TkWinSendCom sendCom = (TkWinSendCom ) This;
169	169	*ppvObject = NULL;
170	170
171	171	if (memcmp(riid, &IID_IUnknown, sizeof(IID)) == 0
172	172	\|\| memcmp(riid, &IID_IDispatch, sizeof(IID)) == 0) {
173		ppvObject = (void *) this;
174		this->lpVtbl->AddRef(This);
	173	ppvObject = (void *) sendCom;
	174	sendCom->lpVtbl->AddRef(This);
175	175	hr = S_OK;
176	176	} else if (memcmp(riid, &IID_ISupportErrorInfo, sizeof(IID)) == 0) {
177		ppvObject = (void *) (this + 1);
178		this->lpVtbl2->AddRef((ISupportErrorInfo *) (this + 1));
	177	ppvObject = (void *) (sendCom + 1);
	178	sendCom->lpVtbl2->AddRef((ISupportErrorInfo *) (sendCom + 1));
179	179	hr = S_OK;
180	180	}
181	181	return hr;

185	185	WinSendCom_AddRef(
186	186	IDispatch *This)
187	187	{
188		TkWinSendCom this = (TkWinSendCom)This;
189
190		return InterlockedIncrement(&this->refcount);
	188	TkWinSendCom sendCom = (TkWinSendCom)This;
	189
	190	return InterlockedIncrement(&sendCom->refcount);
191	191	}
192	192
193	193	static STDMETHODIMP_(ULONG)

195	195	IDispatch *This)
196	196	{
197	197	long r = 0;
198		TkWinSendCom this = (TkWinSendCom)This;
199
200		if ((r = InterlockedDecrement(&this->refcount)) == 0) {
	198	TkWinSendCom sendCom = (TkWinSendCom)This;
	199
	200	if ((r = InterlockedDecrement(&sendCom->refcount)) == 0) {
201	201	TkWinSendCom_Destroy(This);
202	202	}
203	203	return r;

209	209	UINT *pctinfo)
210	210	{
211	211	HRESULT hr = E_POINTER;
	212	(void)This;
212	213
213	214	if (pctinfo != NULL) {
214	215	*pctinfo = 0;

225	226	ITypeInfo **ppTI)
226	227	{
227	228	HRESULT hr = E_POINTER;
	229	(void)This;
	230	(void)iTInfo;
	231	(void)lcid;
228	232
229	233	if (ppTI) {
230	234	*ppTI = NULL;

243	247	DISPID *rgDispId)
244	248	{
245	249	HRESULT hr = E_POINTER;
	250	(void)This;
	251	(void)riid;
	252	(void)cNames;
	253	(void)lcid;
246	254
247	255	if (rgDispId) {
248	256	hr = DISP_E_UNKNOWNNAME;

268	276	UINT *puArgErr)
269	277	{
270	278	HRESULT hr = DISP_E_MEMBERNOTFOUND;
271		TkWinSendCom this = (TkWinSendCom)This;
	279	TkWinSendCom sendCom = (TkWinSendCom)This;
	280	(void)riid;
	281	(void)lcid;
272	282
273	283	switch (dispidMember) {
274	284	case TKWINSENDCOM_DISPID_SEND:

276	286	if (pDispParams->cArgs != 1) {
277	287	hr = DISP_E_BADPARAMCOUNT;
278	288	} else {
279		hr = Send(this, pDispParams->rgvarg[0], pvarResult,
	289	hr = Send(sendCom, pDispParams->rgvarg[0], pvarResult,
280	290	pExcepInfo, puArgErr);
281	291	}
282	292	}

287	297	if (pDispParams->cArgs != 1) {
288	298	hr = DISP_E_BADPARAMCOUNT;
289	299	} else {
290		hr = Async(this, pDispParams->rgvarg[0], pExcepInfo, puArgErr);
	300	hr = Async(sendCom, pDispParams->rgvarg[0], pExcepInfo, puArgErr);
291	301	}
292	302	}
293	303	break;

312	322	REFIID riid,
313	323	void **ppvObject)
314	324	{
315		TkWinSendCom this = (TkWinSendCom )(This - 1);
316
317		return this->lpVtbl->QueryInterface((IDispatch *) this, riid, ppvObject);
	325	TkWinSendCom sendCom = (TkWinSendCom )(This - 1);
	326
	327	return sendCom->lpVtbl->QueryInterface((IDispatch *) sendCom, riid, ppvObject);
318	328	}
319	329
320	330	static STDMETHODIMP_(ULONG)
321	331	ISupportErrorInfo_AddRef(
322	332	ISupportErrorInfo *This)
323	333	{
324		TkWinSendCom this = (TkWinSendCom )(This - 1);
325
326		return InterlockedIncrement(&this->refcount);
	334	TkWinSendCom sendCom = (TkWinSendCom )(This - 1);
	335
	336	return InterlockedIncrement(&sendCom->refcount);
327	337	}
328	338
329	339	static STDMETHODIMP_(ULONG)
330	340	ISupportErrorInfo_Release(
331	341	ISupportErrorInfo *This)
332	342	{
333		TkWinSendCom this = (TkWinSendCom )(This - 1);
334
335		return this->lpVtbl->Release((IDispatch *) this);
	343	TkWinSendCom sendCom = (TkWinSendCom )(This - 1);
	344
	345	return sendCom->lpVtbl->Release((IDispatch *) sendCom);
336	346	}
337	347
338	348	static STDMETHODIMP

340	350	ISupportErrorInfo *This,
341	351	REFIID riid)
342	352	{
343		/TkWinSendCom this = (TkWinSendCom)(This - 1);/
	353	(void)This;
	354	(void)riid;
	355
	356	/TkWinSendCom sendCom = (TkWinSendCom)(This - 1);/
344	357	return S_OK; /* or S_FALSE */
345	358	}
346	359

370	383	HRESULT hr = S_OK;
371	384	VARIANT vCmd;
372	385	Tcl_DString ds;
	386	(void)puArgErr;
373	387
374	388	VariantInit(&vCmd);
375	389

384	398	if (SUCCEEDED(hr) && obj->interp) {
385	399	Tcl_Obj *scriptPtr;
386	400
387		Tcl_WinTCharToUtf((LPCTSTR)vCmd.bstrVal, SysStringLen(vCmd.bstrVal) *
388		sizeof (WCHAR), &ds);
	401	Tcl_DStringInit(&ds);
	402	Tcl_WCharToUtfDString(vCmd.bstrVal, SysStringLen(vCmd.bstrVal), &ds);
389	403	scriptPtr =
390	404	Tcl_NewStringObj(Tcl_DStringValue(&ds), Tcl_DStringLength(&ds));
391	405	Tcl_DStringFree(&ds);

426	440	HRESULT hr = S_OK;
427	441	int result = TCL_OK;
428	442	VARIANT v;
429		register Tcl_Interp *interp = obj->interp;
	443	Tcl_Interp *interp = obj->interp;
430	444	Tcl_Obj *scriptPtr;
431	445	Tcl_DString ds;
	446	(void)puArgErr;
432	447
433	448	if (interp == NULL) {
434	449	return S_OK;

439	454	return hr;
440	455	}
441	456
442		Tcl_WinTCharToUtf((LPCTSTR)v.bstrVal, SysStringLen(v.bstrVal) *
443		sizeof(WCHAR), &ds);
	457	Tcl_DStringInit(&ds);
	458	Tcl_WCharToUtfDString(v.bstrVal, SysStringLen(v.bstrVal), &ds);
444	459	scriptPtr = Tcl_NewStringObj(Tcl_DStringValue(&ds), Tcl_DStringLength(&ds));
445	460	Tcl_DStringFree(&ds);
446	461	Tcl_Preserve(interp);

456	471	pvResult->vt = VT_BSTR;
457	472	obj = Tcl_GetObjResult(interp);
458	473	src = Tcl_GetString(obj);
459		Tcl_WinUtfToTChar(src, obj->length, &ds);
460		pvResult->bstrVal = SysAllocString((WCHAR *) Tcl_DStringValue(&ds));
	474	Tcl_DStringInit(&ds);
	475	pvResult->bstrVal = SysAllocString(Tcl_UtfToWCharDString(src, obj->length, &ds));
461	476	Tcl_DStringFree(&ds);
462	477	}
463	478	if (result == TCL_ERROR) {

+38

-27

win/tkWinTest.c less more

66	66	*/
67	67
68	68	Tcl_CreateObjCommand(interp, "testclipboard", TestclipboardObjCmd,
69		(ClientData) Tk_MainWindow(interp), NULL);
	69	Tk_MainWindow(interp), NULL);
70	70	Tcl_CreateObjCommand(interp, "testwinevent", TestwineventObjCmd,
71		(ClientData) Tk_MainWindow(interp), NULL);
	71	Tk_MainWindow(interp), NULL);
72	72	Tcl_CreateObjCommand(interp, "testfindwindow", TestfindwindowObjCmd,
73		(ClientData) Tk_MainWindow(interp), NULL);
	73	Tk_MainWindow(interp), NULL);
74	74	Tcl_CreateObjCommand(interp, "testgetwindowinfo", TestgetwindowinfoObjCmd,
75		(ClientData) Tk_MainWindow(interp), NULL);
	75	Tk_MainWindow(interp), NULL);
76	76	Tcl_CreateObjCommand(interp, "testwinlocale", TestwinlocaleObjCmd,
77		(ClientData) Tk_MainWindow(interp), NULL);
	77	Tk_MainWindow(interp), NULL);
78	78	return TCL_OK;
79	79	}
80	80

176	176	} else {
177	177	char *msgPtr;
178	178
179		Tcl_WinTCharToUtf((LPCTSTR)wMsgPtr, -1, &ds);
	179	Tcl_DStringInit(&ds);
	180	Tcl_WCharToUtfDString(wMsgPtr, wcslen(wMsgPtr), &ds);
180	181	LocalFree(wMsgPtr);
181	182
182	183	msgPtr = Tcl_DStringValue(&ds);

229	230	Tcl_Interp *interp,
230	231	const char *selection)
231	232	{
	233	(void)dummy;
	234
232	235	Tcl_AppendResult(interp, selection, NULL);
233	236	return TCL_OK;
234	237	}

240	243	int objc, /* Number of arguments. */
241	244	Tcl_Obj const objv[]) / Argument values. */
242	245	{
243		Tk_Window tkwin = (Tk_Window) clientData;
	246	Tk_Window tkwin = (Tk_Window)clientData;
244	247
245	248	if (objc != 1) {
246	249	Tcl_WrongNumArgs(interp, 1, objv, NULL);

269	272
270	273	static int
271	274	TestwineventObjCmd(
272		ClientData clientData, /* Main window for application. */
	275	ClientData dummy, /* Main window for application. */
273	276	Tcl_Interp interp, / Current interpreter. */
274	277	int objc, /* Number of arguments. */
275	278	Tcl_Obj const objv[]) / Argument strings. */

292	295	{WM_COMMAND, "WM_COMMAND"},
293	296	{-1, NULL}
294	297	};
	298	(void)dummy;
295	299
296	300	if ((objc == 3) && (strcmp(Tcl_GetString(objv[1]), "debug") == 0)) {
297	301	int b;

374	378	case WM_SETTEXT: {
375	379	Tcl_DString ds;
376	380
377		control = TestFindControl(hwnd, id);
378		if (control == NULL) {
379		Tcl_SetObjResult(interp,
380		Tcl_ObjPrintf("Could not find control with id %d", id));
381		return TCL_ERROR;
382		}
	381	control = TestFindControl(hwnd, id);
	382	if (control == NULL) {
	383	Tcl_SetObjResult(interp,
	384	Tcl_ObjPrintf("Could not find control with id %d", id));
	385	return TCL_ERROR;
	386	}
383	387	Tcl_UtfToExternalDString(NULL, Tcl_GetString(objv[4]), -1, &ds);
384		result = SendMessageA(control, WM_SETTEXT, 0,
385		(LPARAM) Tcl_DStringValue(&ds));
	388	result = SendMessageA(control, WM_SETTEXT, 0,
	389	(LPARAM) Tcl_DStringValue(&ds));
386	390	Tcl_DStringFree(&ds);
387	391	if (result == 0) {
388		Tcl_SetObjResult(interp, Tcl_NewStringObj("failed to send text to dialog: ", -1));
389		AppendSystemError(interp, GetLastError());
390		return TCL_ERROR;
	392	Tcl_SetObjResult(interp, Tcl_NewStringObj("failed to send text to dialog: ", -1));
	393	AppendSystemError(interp, GetLastError());
	394	return TCL_ERROR;
391	395	}
392	396	break;
393	397	}

426	430
427	431	static int
428	432	TestfindwindowObjCmd(
429		ClientData clientData, /* Main window for application. */
	433	ClientData dummy, /* Main window for application. */
430	434	Tcl_Interp interp, / Current interpreter. */
431	435	int objc, /* Number of arguments. */
432	436	Tcl_Obj const objv[]) / Argument values. */

436	440	HWND hwnd = NULL;
437	441	int r = TCL_OK;
438	442	DWORD myPid;
	443	(void)dummy;
439	444
440	445	Tcl_DStringInit(&classString);
441	446	Tcl_DStringInit(&titleString);

445	450	return TCL_ERROR;
446	451	}
447	452
448		title = (LPCWSTR)Tcl_WinUtfToTChar(Tcl_GetString(objv[1]), -1, &titleString);
	453	Tcl_DStringInit(&titleString);
	454	title = Tcl_UtfToWCharDString(Tcl_GetString(objv[1]), -1, &titleString);
449	455	if (objc == 3) {
450		windowClass = (LPCWSTR)Tcl_WinUtfToTChar(Tcl_GetString(objv[2]), -1, &classString);
	456	Tcl_DStringInit(&classString);
	457	windowClass = Tcl_UtfToWCharDString(Tcl_GetString(objv[2]), -1, &classString);
451	458	}
452	459	if (title[0] == 0)
453	460	title = NULL;

496	503
497	504	static int
498	505	TestgetwindowinfoObjCmd(
499		ClientData clientData,
	506	ClientData dummy,
500	507	Tcl_Interp *interp,
501	508	int objc,
502	509	Tcl_Obj *const objv[])

507	514	WCHAR buf[512];
508	515	int cch, cchBuf = 256;
509	516	Tcl_DString ds;
	517	(void)dummy;
510	518
511	519	if (objc != 2) {
512	520	Tcl_WrongNumArgs(interp, 1, objv, "hwnd");

522	530	AppendSystemError(interp, GetLastError());
523	531	return TCL_ERROR;
524	532	} else {
525		Tcl_DString ds;
526		Tcl_WinTCharToUtf((LPCTSTR)buf, -1, &ds);
	533	Tcl_DStringInit(&ds);
	534	Tcl_WCharToUtfDString(buf, wcslen(buf), &ds);
527	535	classObj = Tcl_NewStringObj(Tcl_DStringValue(&ds), Tcl_DStringLength(&ds));
528	536	Tcl_DStringFree(&ds);
529	537	}

534	542	Tcl_NewWideIntObj(GetWindowLongPtrW(INT2PTR(hwnd), GWL_ID)));
535	543
536	544	cch = GetWindowTextW(INT2PTR(hwnd), buf, cchBuf);
537		Tcl_WinTCharToUtf((LPCTSTR)buf, cch * sizeof (WCHAR), &ds);
	545	Tcl_DStringInit(&ds);
	546	Tcl_WCharToUtfDString(buf, cch, &ds);
538	547	textObj = Tcl_NewStringObj(Tcl_DStringValue(&ds), Tcl_DStringLength(&ds));
539	548	Tcl_DStringFree(&ds);
540	549

552	561
553	562	static int
554	563	TestwinlocaleObjCmd(
555		ClientData clientData, /* Main window for application. */
	564	ClientData dummy, /* Main window for application. */
556	565	Tcl_Interp interp, / Current interpreter. */
557	566	int objc, /* Number of arguments. */
558	567	Tcl_Obj const objv[]) / Argument values. */
559	568	{
	569	(void)dummy;
	570
560	571	if (objc != 1) {
561	572	Tcl_WrongNumArgs(interp, 1, objv, NULL);
562	573	return TCL_ERROR;

+207

-179

win/tkWinWm.c less more

56	56	/* Next in list of protocol handlers for the
57	57	* same top-level window, or NULL for end of
58	58	* list. */
59		Tcl_Interp interp; / Interpreter in which to invoke command. */
60		char command[1]; /* Tcl command to invoke when a client message
	59	Tcl_Interp interp; / Interpreter in which to invoke command. */
	60	char command[TKFLEXARRAY]; /* Tcl command to invoke when a client message
61	61	* for this protocol arrives. The actual size
62	62	* of the structure varies to accommodate the
63	63	* needs of the actual command. THIS MUST BE

65	65	} ProtocolHandler;
66	66
67	67	#define HANDLER_SIZE(cmdLength) \
68		((unsigned) ((Tk_Offset(ProtocolHandler, command) + 1) + cmdLength))
	68	((Tk_Offset(ProtocolHandler, command) + 1) + cmdLength)
69	69
70	70	/*
71	71	* Helper type passed via lParam to TkWmStackorderToplevelEnumProc

176	176	* (corresponds to hints.window_group).
177	177	* Malloc-ed. Note: this field doesn't get
178	178	* updated if leader is destroyed. */
179		TkWindow masterPtr; / Master window for TRANSIENT_FOR property,
	179	TkWindow containerPtr; / Container window for TRANSIENT_FOR property,
180	180	* or NULL. */
181	181	Tk_Window icon; /* Window to use as icon for this window, or
182	182	* NULL. */

314	314	* window (controlled by "wm resizable" command).
315	315	* WM_WITHDRAWN - Non-zero means that this window has explicitly
316	316	* been withdrawn. If it's a transient, it should
317		* not mirror state changes in the master.
	317	* not mirror state changes in the container.
318	318	* WM_FULLSCREEN - Non-zero means that this window has been placed
319	319	* in the full screen mode. It should be mapped at
320	320	* 0,0 and be the width and height of the screen.

855	855	InitWindowClass(
856	856	WinIconPtr titlebaricon)
857	857	{
858		ThreadSpecificData *tsdPtr =
	858	ThreadSpecificData tsdPtr = (ThreadSpecificData )
859	859	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
860	860
861	861	if (!tsdPtr->initialized) {

1116	1116	{
1117	1117	WmInfo *wmPtr;
1118	1118	HICON icon;
1119		ThreadSpecificData *tsdPtr =
	1119	ThreadSpecificData tsdPtr = (ThreadSpecificData )
1120	1120	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
1121	1121
1122	1122	if (tsdPtr->iconPtr != NULL) {

1240	1240	if (file == NULL) {
1241	1241	return NULL;
1242	1242	}
1243		Tcl_WinUtfToTChar(file, -1, &ds2);
	1243	Tcl_DStringInit(&ds2);
	1244	res = (DWORD *)SHGetFileInfoW(Tcl_UtfToWCharDString(file, -1, &ds2), 0, &sfiSM,
	1245	sizeof(SHFILEINFO), SHGFI_SMALLICON\|SHGFI_ICON);
1244	1246	Tcl_DStringFree(&ds);
1245		res = (DWORD )SHGetFileInfoW((WCHAR )Tcl_DStringValue(&ds2), 0, &sfiSM,
1246		sizeof(SHFILEINFO), SHGFI_SMALLICON\|SHGFI_ICON);
1247	1247
1248	1248	if (res != 0) {
1249	1249	SHFILEINFOW sfi;

1259	1259
1260	1260	size = sizeof(BlockOfIconImages)
1261	1261	+ ((res != 0) ? sizeof(ICONIMAGE) : 0);
1262		lpIR = ckalloc(size);
	1262	lpIR = (BlockOfIconImagesPtr)ckalloc(size);
1263	1263	if (lpIR == NULL) {
1264	1264	if (res != 0) {
1265	1265	DestroyIcon(sfi.hIcon);

1290	1290	Tcl_DStringFree(&ds2);
1291	1291	}
1292	1292	if (lpIR != NULL) {
1293		titlebaricon = ckalloc(sizeof(WinIconInstance));
	1293	titlebaricon = (WinIconPtr)ckalloc(sizeof(WinIconInstance));
1294	1294	titlebaricon->iconBlock = lpIR;
1295	1295	titlebaricon->refCount = 1;
1296	1296	}

1366	1366	return NULL;
1367	1367	}
1368	1368
1369		lpIR = ckalloc(sizeof(BlockOfIconImages));
	1369	lpIR = (BlockOfIconImagesPtr)ckalloc(sizeof(BlockOfIconImages));
1370	1370	if (lpIR == NULL) {
1371	1371	DestroyIcon(hIcon);
1372	1372	return NULL;

1387	1387	lpIR->IconImages[0].lpXOR = 0;
1388	1388	lpIR->IconImages[0].lpAND = 0;
1389	1389
1390		titlebaricon = ckalloc(sizeof(WinIconInstance));
	1390	titlebaricon = (WinIconPtr)ckalloc(sizeof(WinIconInstance));
1391	1391	titlebaricon->iconBlock = lpIR;
1392	1392	titlebaricon->refCount = 1;
1393	1393	return titlebaricon;

1592	1592	* Allocate memory for the resource structure
1593	1593	*/
1594	1594
1595		lpIR = ckalloc(sizeof(BlockOfIconImages));
	1595	lpIR = (BlockOfIconImagesPtr)ckalloc(sizeof(BlockOfIconImages));
1596	1596
1597	1597	/*
1598	1598	* Read in the header

1610	1610	* Adjust the size of the struct to account for the images.
1611	1611	*/
1612	1612
1613		lpIR = ckrealloc(lpIR, sizeof(BlockOfIconImages)
	1613	lpIR = (BlockOfIconImagesPtr)ckrealloc(lpIR, sizeof(BlockOfIconImages)
1614	1614	+ (lpIR->nNumImages - 1) * sizeof(ICONIMAGE));
1615	1615
1616	1616	/*
1617	1617	* Allocate enough memory for the icon directory entries.
1618	1618	*/
1619	1619
1620		lpIDE = ckalloc(lpIR->nNumImages * sizeof(ICONDIRENTRY));
	1620	lpIDE = (LPICONDIRENTRY)ckalloc(lpIR->nNumImages * sizeof(ICONDIRENTRY));
1621	1621
1622	1622	/*
1623	1623	* Read in the icon directory entries.

1652	1652	* Allocate memory for the resource.
1653	1653	*/
1654	1654
1655		lpIR->IconImages[i].lpBits = ckalloc(lpIDE[i].dwBytesInRes);
	1655	lpIR->IconImages[i].lpBits = (LPBYTE)ckalloc(lpIDE[i].dwBytesInRes);
1656	1656	lpIR->IconImages[i].dwNumBytes = lpIDE[i].dwBytesInRes;
1657	1657
1658	1658	/*

1731	1731	GetTopLevel(
1732	1732	HWND hwnd)
1733	1733	{
1734		ThreadSpecificData *tsdPtr =
	1734	ThreadSpecificData tsdPtr = (ThreadSpecificData )
1735	1735	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
1736	1736
1737	1737	/*

1768	1768	HWND hwnd,
1769	1769	MINMAXINFO *info)
1770	1770	{
1771		register WmInfo *wmPtr;
	1771	WmInfo *wmPtr;
1772	1772	int maxWidth, maxHeight;
1773	1773	int minWidth, minHeight;
1774	1774	int base;

1873	1873	}
1874	1874	initialized = 0;
1875	1875
1876		tsdPtr = Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
	1876	tsdPtr = (ThreadSpecificData *)Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
1877	1877
1878	1878	if (!tsdPtr->initialized) {
1879	1879	return;

1904	1904	TkWmNewWindow(
1905	1905	TkWindow winPtr) / Newly-created top-level window. */
1906	1906	{
1907		register WmInfo *wmPtr = ckalloc(sizeof(WmInfo));
	1907	WmInfo wmPtr = (WmInfo )ckalloc(sizeof(WmInfo));
1908	1908
1909	1909	/*
1910	1910	* Initialize full structure, then set what isn't NULL

1989	1989	UpdateWrapper(
1990	1990	TkWindow winPtr) / Top-level window to redecorate. */
1991	1991	{
1992		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	1992	WmInfo *wmPtr = winPtr->wmInfoPtr;
1993	1993	HWND parentHWND, oldWrapper = wmPtr->wrapper;
1994	1994	HWND child, nextHWND, focusHWND;
1995	1995	int x, y, width, height, state;

1998	1998	HICON hBigIcon = NULL;
1999	1999	Tcl_DString titleString;
2000	2000	int *childStateInfo = NULL;
2001		ThreadSpecificData *tsdPtr =
	2001	ThreadSpecificData tsdPtr = (ThreadSpecificData )
2002	2002	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
2003	2003
2004	2004	if (winPtr->window == None) {

2036	2036	* Pick the decorative frame style. Override redirect windows get
2037	2037	* created as undecorated popups if they have no transient parent,
2038	2038	* otherwise they are children. This allows splash screens to operate
2039		* as an independent window, while having dropdows (like for a
	2039	* as an independent window, while having dropdowns (like for a
2040	2040	* combobox) not grab focus away from their parent. Transient windows
2041	2041	* get a modal dialog frame. Neither override, nor transient windows
2042	2042	* appear in the Windows taskbar. Note that a transient window does

2053	2053	*/
2054	2054
2055	2055	parentHWND = GetDesktopWindow();
2056		if (wmPtr->masterPtr) {
	2056	if (wmPtr->containerPtr) {
2057	2057	wmPtr->style \|= WS_CHILD;
2058	2058	} else {
2059	2059	wmPtr->style \|= WS_POPUP;

2061	2061	} else if (wmPtr->flags & WM_FULLSCREEN) {
2062	2062	wmPtr->style = WM_FULLSCREEN_STYLE;
2063	2063	wmPtr->exStyle = EX_FULLSCREEN_STYLE;
2064		} else if (wmPtr->masterPtr) {
	2064	} else if (wmPtr->containerPtr) {
2065	2065	wmPtr->style = WM_TRANSIENT_STYLE;
2066	2066	wmPtr->exStyle = EX_TRANSIENT_STYLE;
2067		parentHWND = Tk_GetHWND(Tk_WindowId(wmPtr->masterPtr));
	2067	parentHWND = Tk_GetHWND(Tk_WindowId(wmPtr->containerPtr));
2068	2068	if (! ((wmPtr->flags & WM_WIDTH_NOT_RESIZABLE)
2069	2069	&& (wmPtr->flags & WM_HEIGHT_NOT_RESIZABLE))) {
2070	2070	wmPtr->style \|= WS_THICKFRAME;

2120	2120	*/
2121	2121
2122	2122	tsdPtr->createWindow = winPtr;
2123		Tcl_WinUtfToTChar(((wmPtr->title != NULL) ?
	2123	Tcl_DStringInit(&titleString);
	2124	Tcl_UtfToWCharDString(((wmPtr->title != NULL) ?
2124	2125	wmPtr->title : winPtr->nameUid), -1, &titleString);
2125	2126
2126	2127	wmPtr->wrapper = CreateWindowExW(wmPtr->exStyle,

2202	2203	if (wmPtr->numTransients > 0) {
2203	2204	/*
2204	2205	* Unset the current wrapper as the parent for all transient
2205		* children for whom this is the master
	2206	* children for whom this is the container
2206	2207	*/
2207	2208
2208	2209	WmInfo *wmPtr2;
2209	2210
2210		childStateInfo = ckalloc(wmPtr->numTransients * sizeof(int));
	2211	childStateInfo = (int )ckalloc(wmPtr->numTransients sizeof(int));
2211	2212	state = 0;
2212	2213	for (wmPtr2 = winPtr->dispPtr->firstWmPtr; wmPtr2 != NULL;
2213	2214	wmPtr2 = wmPtr2->nextPtr) {
2214		if (wmPtr2->masterPtr == winPtr
	2215	if (wmPtr2->containerPtr == winPtr
2215	2216	&& !(wmPtr2->flags & WM_NEVER_MAPPED)) {
2216	2217	childStateInfo[state++] = wmPtr2->hints.initial_state;
2217	2218	SetParent(TkWinGetHWND(wmPtr2->winPtr->window), NULL);

2290	2291	if (childStateInfo) {
2291	2292	if (wmPtr->numTransients > 0) {
2292	2293	/*
2293		* Reset all transient children for whom this is the master.
	2294	* Reset all transient children for whom this is the container.
2294	2295	*/
2295	2296
2296	2297	WmInfo *wmPtr2;

2298	2299	state = 0;
2299	2300	for (wmPtr2 = winPtr->dispPtr->firstWmPtr; wmPtr2 != NULL;
2300	2301	wmPtr2 = wmPtr2->nextPtr) {
2301		if (wmPtr2->masterPtr == winPtr
	2302	if (wmPtr2->containerPtr == winPtr
2302	2303	&& !(wmPtr2->flags & WM_NEVER_MAPPED)) {
2303	2304	UpdateWrapper(wmPtr2->winPtr);
2304	2305	TkpWmSetState(wmPtr2->winPtr, childStateInfo[state++]);

2353	2354	TkWindow winPtr) / Top-level window that's about to be
2354	2355	* mapped. */
2355	2356	{
2356		register WmInfo *wmPtr = winPtr->wmInfoPtr;
2357		ThreadSpecificData *tsdPtr =
	2357	WmInfo *wmPtr = winPtr->wmInfoPtr;
	2358	ThreadSpecificData tsdPtr = (ThreadSpecificData )
2358	2359	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
2359	2360
2360	2361	if (!tsdPtr->initialized) {

2363	2364
2364	2365	if (wmPtr->flags & WM_NEVER_MAPPED) {
2365	2366	/*
2366		* Don't map a transient if the master is not mapped.
	2367	* Don't map a transient if the container is not mapped.
2367	2368	*/
2368	2369
2369		if (wmPtr->masterPtr != NULL && !Tk_IsMapped(wmPtr->masterPtr)) {
	2370	if (wmPtr->containerPtr != NULL && !Tk_IsMapped(wmPtr->containerPtr)) {
2370	2371	wmPtr->hints.initial_state = WithdrawnState;
2371	2372	return;
2372	2373	}

2579	2580	TkWmDeadWindow(
2580	2581	TkWindow winPtr) / Top-level window that's being deleted. */
2581	2582	{
2582		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	2583	WmInfo *wmPtr = winPtr->wmInfoPtr;
2583	2584	WmInfo *wmPtr2;
2584	2585
2585	2586	if (wmPtr == NULL) {

2593	2594	if (winPtr->dispPtr->firstWmPtr == wmPtr) {
2594	2595	winPtr->dispPtr->firstWmPtr = wmPtr->nextPtr;
2595	2596	} else {
2596		register WmInfo *prevPtr;
	2597	WmInfo *prevPtr;
2597	2598
2598	2599	for (prevPtr = winPtr->dispPtr->firstWmPtr; ;
2599	2600	prevPtr = prevPtr->nextPtr) {

2608	2609	}
2609	2610
2610	2611	/*
2611		* Reset all transient windows whose master is the dead window.
	2612	* Reset all transient windows whose container is the dead window.
2612	2613	*/
2613	2614
2614	2615	for (wmPtr2 = winPtr->dispPtr->firstWmPtr; wmPtr2 != NULL;
2615	2616	wmPtr2 = wmPtr2->nextPtr) {
2616		if (wmPtr2->masterPtr == winPtr) {
	2617	if (wmPtr2->containerPtr == winPtr) {
2617	2618	wmPtr->numTransients--;
2618		Tk_DeleteEventHandler((Tk_Window) wmPtr2->masterPtr,
	2619	Tk_DeleteEventHandler((Tk_Window) wmPtr2->containerPtr,
2619	2620	VisibilityChangeMask\|StructureNotifyMask,
2620	2621	WmWaitVisibilityOrMapProc, wmPtr2->winPtr);
2621		wmPtr2->masterPtr = NULL;
	2622	wmPtr2->containerPtr = NULL;
2622	2623	if ((wmPtr2->wrapper != NULL)
2623	2624	&& !(wmPtr2->flags & (WM_NEVER_MAPPED))) {
2624	2625	UpdateWrapper(wmPtr2->winPtr);

2668	2669	if (wmPtr->flags & WM_UPDATE_PENDING) {
2669	2670	Tcl_CancelIdleCall(UpdateGeometryInfo, winPtr);
2670	2671	}
2671		if (wmPtr->masterPtr != NULL) {
2672		wmPtr2 = wmPtr->masterPtr->wmInfoPtr;
	2672	if (wmPtr->containerPtr != NULL) {
	2673	wmPtr2 = wmPtr->containerPtr->wmInfoPtr;
2673	2674
2674	2675	/*
2675		* If we had a master, tell them that we aren't tied to them anymore.
	2676	* If we had a container, tell them that we aren't tied to them anymore.
2676	2677	*/
2677	2678
2678	2679	if (wmPtr2 != NULL) {
2679	2680	wmPtr2->numTransients--;
2680	2681	}
2681		Tk_DeleteEventHandler((Tk_Window) wmPtr->masterPtr,
	2682	Tk_DeleteEventHandler((Tk_Window) wmPtr->containerPtr,
2682	2683	VisibilityChangeMask\|StructureNotifyMask,
2683	2684	WmWaitVisibilityOrMapProc, winPtr);
2684		wmPtr->masterPtr = NULL;
	2685	wmPtr->containerPtr = NULL;
2685	2686	}
2686	2687	if (wmPtr->crefObj != NULL) {
2687	2688	Tcl_DecrRefCount(wmPtr->crefObj);

2740	2741	TkWmSetClass(
2741	2742	TkWindow winPtr) / Newly-created top-level window. */
2742	2743	{
	2744	(void)winPtr;
	2745
2743	2746	/* Do nothing */
2744	2747	return;
2745	2748	}

2761	2764	*----------------------------------------------------------------------
2762	2765	*/
2763	2766
2764		/* ARGSUSED */
2765	2767	int
2766	2768	Tk_WmObjCmd(
2767	2769	ClientData clientData, /* Main window associated with interpreter. */

2769	2771	int objc, /* Number of arguments. */
2770	2772	Tcl_Obj const objv[]) / Argument objects. */
2771	2773	{
2772		Tk_Window tkwin = clientData;
	2774	Tk_Window tkwin = (Tk_Window)clientData;
2773	2775	static const char *const optionStrings[] = {
2774	2776	"aspect", "attributes", "client", "colormapwindows",
2775	2777	"command", "deiconify", "focusmodel", "forget", "frame",

2795	2797	WMOPT_WITHDRAW
2796	2798	};
2797	2799	int index;
2798		size_t length;
	2800	int length;
2799	2801	const char *argv1;
2800	2802	TkWindow winPtr, *winPtrPtr = &winPtr;
2801	2803	TkDisplay dispPtr = ((TkWindow ) tkwin)->dispPtr;

2806	2808	return TCL_ERROR;
2807	2809	}
2808	2810
2809		argv1 = Tcl_GetString(objv[1]);
2810		length = objv[1]->length;
	2811	argv1 = Tcl_GetStringFromObj(objv[1], &length);
2811	2812	if ((argv1[0] == 't') && !strncmp(argv1, "tracing", length)
2812	2813	&& (length >= 3)) {
2813	2814	int wmTracing;

2950	2951	int objc, /* Number of arguments. */
2951	2952	Tcl_Obj const objv[]) / Argument objects. */
2952	2953	{
2953		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	2954	WmInfo *wmPtr = winPtr->wmInfoPtr;
2954	2955	int numer1, denom1, numer2, denom2;
	2956	(void)tkwin;
2955	2957
2956	2958	if ((objc != 3) && (objc != 7)) {
2957	2959	Tcl_WrongNumArgs(interp, 2, objv,

3020	3022	int objc, /* Number of arguments. */
3021	3023	Tcl_Obj const objv[]) / Argument objects. */
3022	3024	{
3023		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	3025	WmInfo *wmPtr = winPtr->wmInfoPtr;
3024	3026	LONG style, exStyle, styleBit, *stylePtr = NULL;
3025	3027	const char *string;
3026	3028	int i, boolean;
3027		size_t length;
	3029	int length;
3028	3030	int config_fullscreen = 0, updatewrapper = 0;
3029	3031	int fullscreen_attr_changed = 0, fullscreen_attr = 0;
3030	3032

3071	3073	return TCL_OK;
3072	3074	}
3073	3075	for (i = 3; i < objc; i += 2) {
3074		string = Tcl_GetString(objv[i]);
3075		length = objv[i]->length;
	3076	string = Tcl_GetStringFromObj(objv[i], &length);
3076	3077	if ((length < 2) \|\| (string[0] != '-')) {
3077	3078	goto configArgs;
3078	3079	}

3140	3141	}
3141	3142	wmPtr->alpha = dval;
3142	3143	} else { /* -transparentcolor */
3143		const char *crefstr = Tcl_GetString(objv[i+1]);
3144
3145		length = objv[i+1]->length;
	3144	const char *crefstr = Tcl_GetStringFromObj(objv[i+1], &length);
	3145
3146	3146	if (length == 0) {
3147	3147	/* reset to no transparent color */
3148	3148	if (wmPtr->crefObj) {

3318	3318	int objc, /* Number of arguments. */
3319	3319	Tcl_Obj const objv[]) / Argument objects. */
3320	3320	{
3321		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	3321	WmInfo *wmPtr = winPtr->wmInfoPtr;
3322	3322	const char *argv3;
3323		size_t length;
	3323	int length;
	3324	(void)tkwin;
3324	3325
3325	3326	if ((objc != 3) && (objc != 4)) {
3326	3327	Tcl_WrongNumArgs(interp, 2, objv, "window ?name?");

3333	3334	}
3334	3335	return TCL_OK;
3335	3336	}
3336		argv3 = Tcl_GetString(objv[3]);
3337		length = objv[3]->length;
	3337	argv3 = Tcl_GetStringFromObj(objv[3], &length);
3338	3338	if (argv3[0] == 0) {
3339	3339	if (wmPtr->clientMachine != NULL) {
3340	3340	ckfree(wmPtr->clientMachine);

3349	3349	if (wmPtr->clientMachine != NULL) {
3350	3350	ckfree(wmPtr->clientMachine);
3351	3351	}
3352		wmPtr->clientMachine = ckalloc(length + 1);
	3352	wmPtr->clientMachine = (char *)ckalloc(length + 1);
3353	3353	memcpy(wmPtr->clientMachine, argv3, length + 1);
3354	3354	if (!(wmPtr->flags & WM_NEVER_MAPPED)) {
3355	3355	XTextProperty textProp;

3389	3389	int objc, /* Number of arguments. */
3390	3390	Tcl_Obj const objv[]) / Argument objects. */
3391	3391	{
3392		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	3392	WmInfo *wmPtr = winPtr->wmInfoPtr;
3393	3393	TkWindow *cmapList, winPtr2, **winPtr2Ptr = &winPtr2;
3394	3394	int i, windowObjc, gotToplevel;
3395	3395	Tcl_Obj *windowObjv, resultObj;

3416	3416	!= TCL_OK) {
3417	3417	return TCL_ERROR;
3418	3418	}
3419		cmapList = ckalloc((windowObjc + 1) * sizeof(TkWindow*));
	3419	cmapList = (TkWindow*)ckalloc((windowObjc + 1) sizeof(TkWindow*));
3420	3420	gotToplevel = 0;
3421	3421	for (i = 0; i < windowObjc; i++) {
3422	3422	if (TkGetWindowFromObj(interp, tkwin, windowObjv[i],

3483	3483	int objc, /* Number of arguments. */
3484	3484	Tcl_Obj const objv[]) / Argument objects. */
3485	3485	{
3486		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	3486	WmInfo *wmPtr = winPtr->wmInfoPtr;
3487	3487	const char *argv3;
3488	3488	int cmdArgc;
3489	3489	const char **cmdArgv;
	3490	(void)tkwin;
3490	3491
3491	3492	if ((objc != 3) && (objc != 4)) {
3492	3493	Tcl_WrongNumArgs(interp, 2, objv, "window ?value?");

3552	3553	int objc, /* Number of arguments. */
3553	3554	Tcl_Obj const objv[]) / Argument objects. */
3554	3555	{
3555		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	3556	WmInfo *wmPtr = winPtr->wmInfoPtr;
	3557	(void)tkwin;
3556	3558
3557	3559	if (objc != 3) {
3558	3560	Tcl_WrongNumArgs(interp, 2, objv, "window");

3604	3606	int objc, /* Number of arguments. */
3605	3607	Tcl_Obj const objv[]) / Argument objects. */
3606	3608	{
3607		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	3609	WmInfo *wmPtr = winPtr->wmInfoPtr;
3608	3610	static const char *const optionStrings[] = {
3609	3611	"active", "passive", NULL
3610	3612	};

3612	3614	OPT_ACTIVE, OPT_PASSIVE
3613	3615	};
3614	3616	int index;
	3617	(void)tkwin;
3615	3618
3616	3619	if ((objc != 3) && (objc != 4)) {
3617	3620	Tcl_WrongNumArgs(interp, 2, objv, "window ?active\|passive?");

3656	3659	WmForgetCmd(
3657	3660	Tk_Window tkwin, /* Main window of the application. */
3658	3661	TkWindow winPtr, / Toplevel or Frame to work with */
3659		Tcl_Interp interp, / Current interpreter. */
	3662	Tcl_Interp dummy, / Current interpreter. */
3660	3663	int objc, /* Number of arguments. */
3661	3664	Tcl_Obj const objv[]) / Argument objects. */
3662	3665	{
3663		register Tk_Window frameWin = (Tk_Window) winPtr;
	3666	Tk_Window frameWin = (Tk_Window) winPtr;
	3667	(void)tkwin;
	3668	(void)dummy;
	3669	(void)objc;
	3670	(void)objv;
3664	3671
3665	3672	if (Tk_IsTopLevel(frameWin)) {
3666	3673	Tk_UnmapWindow(frameWin);

3708	3715	int objc, /* Number of arguments. */
3709	3716	Tcl_Obj const objv[]) / Argument objects. */
3710	3717	{
3711		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	3718	WmInfo *wmPtr = winPtr->wmInfoPtr;
3712	3719	HWND hwnd;
3713	3720	char buf[TCL_INTEGER_SPACE];
	3721	(void)tkwin;
3714	3722
3715	3723	if (objc != 3) {
3716	3724	Tcl_WrongNumArgs(interp, 2, objv, "window");

3753	3761	int objc, /* Number of arguments. */
3754	3762	Tcl_Obj const objv[]) / Argument objects. */
3755	3763	{
3756		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	3764	WmInfo *wmPtr = winPtr->wmInfoPtr;
3757	3765	char xSign, ySign;
3758	3766	int width, height;
3759	3767	const char *argv3;
	3768	(void)tkwin;
3760	3769
3761	3770	if ((objc != 3) && (objc != 4)) {
3762	3771	Tcl_WrongNumArgs(interp, 2, objv, "window ?newGeometry?");

3821	3830	int objc, /* Number of arguments. */
3822	3831	Tcl_Obj const objv[]) / Argument objects. */
3823	3832	{
3824		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	3833	WmInfo *wmPtr = winPtr->wmInfoPtr;
3825	3834	int reqWidth, reqHeight, widthInc, heightInc;
	3835	(void)tkwin;
3826	3836
3827	3837	if ((objc != 3) && (objc != 7)) {
3828	3838	Tcl_WrongNumArgs(interp, 2, objv,

3919	3929	int objc, /* Number of arguments. */
3920	3930	Tcl_Obj const objv[]) / Argument objects. */
3921	3931	{
3922		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	3932	WmInfo *wmPtr = winPtr->wmInfoPtr;
3923	3933	Tk_Window tkwin2;
3924	3934	const char *argv3;
3925		size_t length;
	3935	int length;
3926	3936
3927	3937	if ((objc != 3) && (objc != 4)) {
3928	3938	Tcl_WrongNumArgs(interp, 2, objv, "window ?pathName?");

3934	3944	}
3935	3945	return TCL_OK;
3936	3946	}
3937		argv3 = Tcl_GetString(objv[3]);
3938		length = objv[3]->length;
	3947	argv3 = Tcl_GetStringFromObj(objv[3], &length);
3939	3948	if (*argv3 == '\0') {
3940	3949	wmPtr->hints.flags &= ~WindowGroupHint;
3941	3950	if (wmPtr->leaderName != NULL) {

3952	3961	}
3953	3962	wmPtr->hints.window_group = Tk_WindowId(tkwin2);
3954	3963	wmPtr->hints.flags \|= WindowGroupHint;
3955		wmPtr->leaderName = ckalloc(length + 1);
	3964	wmPtr->leaderName = (char *)ckalloc(length + 1);
3956	3965	memcpy(wmPtr->leaderName, argv3, length + 1);
3957	3966	}
3958	3967	return TCL_OK;

3983	3992	int objc, /* Number of arguments. */
3984	3993	Tcl_Obj const objv[]) / Argument objects. */
3985	3994	{
3986		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	3995	WmInfo *wmPtr = winPtr->wmInfoPtr;
3987	3996	TkWindow useWinPtr = winPtr; / window to apply to (NULL if -default) */
3988	3997	const char *string;
	3998	(void)tkwin;
3989	3999
3990	4000	if ((objc < 3) \|\| (objc > 5)) {
3991	4001	Tcl_WrongNumArgs(interp, 2, objv, "window ?-default? ?image?");

4119	4129	int objc, /* Number of arguments. */
4120	4130	Tcl_Obj const objv[]) / Argument objects. */
4121	4131	{
4122		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	4132	WmInfo *wmPtr = winPtr->wmInfoPtr;
	4133	(void)tkwin;
	4134
4123	4135	if (objc != 3) {
4124	4136	Tcl_WrongNumArgs(interp, 2, objv, "window");
4125	4137	return TCL_ERROR;

4141	4153	NULL);
4142	4154	return TCL_ERROR;
4143	4155	}
4144		if (wmPtr->masterPtr != NULL) {
	4156	if (wmPtr->containerPtr != NULL) {
4145	4157	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
4146	4158	"can't iconify \"%s\": it is a transient",
4147	4159	winPtr->pathName));

4184	4196	int objc, /* Number of arguments. */
4185	4197	Tcl_Obj const objv[]) / Argument objects. */
4186	4198	{
4187		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	4199	WmInfo *wmPtr = winPtr->wmInfoPtr;
4188	4200	Pixmap pixmap;
4189	4201	const char *argv3;
4190	4202

4242	4254	int objc, /* Number of arguments. */
4243	4255	Tcl_Obj const objv[]) / Argument objects. */
4244	4256	{
4245		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	4257	WmInfo *wmPtr = winPtr->wmInfoPtr;
4246	4258	const char *argv3;
4247		size_t length;
	4259	int length;
	4260	(void)tkwin;
4248	4261
4249	4262	if (objc > 4) {
4250	4263	Tcl_WrongNumArgs(interp, 2, objv, "window ?newName?");

4258	4271	if (wmPtr->iconName != NULL) {
4259	4272	ckfree(wmPtr->iconName);
4260	4273	}
4261		argv3 = Tcl_GetString(objv[3]);
4262		length = objv[3]->length;
4263		wmPtr->iconName = ckalloc(length + 1);
	4274	argv3 = Tcl_GetStringFromObj(objv[3], &length);
	4275	wmPtr->iconName = (char *)ckalloc(length + 1);
4264	4276	memcpy(wmPtr->iconName, argv3, length + 1);
4265	4277	if (!(wmPtr->flags & WM_NEVER_MAPPED)) {
4266	4278	XSetIconName(winPtr->display, winPtr->window, wmPtr->iconName);

4306	4318	unsigned size;
4307	4319	BITMAPINFO bmInfo;
4308	4320	ICONINFO iconInfo;
	4321	(void)tkwin;
4309	4322
4310	4323	if (objc < 4) {
4311	4324	Tcl_WrongNumArgs(interp, 2, objv,

4343	4356	*/
4344	4357
4345	4358	size = sizeof(BlockOfIconImages) + (sizeof(ICONIMAGE) * (objc-startObj-1));
4346		lpIR = attemptckalloc(size);
	4359	lpIR = (BlockOfIconImagesPtr)attemptckalloc(size);
4347	4360	if (lpIR == NULL) {
4348	4361	return TCL_ERROR;
4349	4362	}

4448	4461	lpIR->IconImages[i-startObj].hIcon = hIcon;
4449	4462	}
4450	4463
4451		titlebaricon = ckalloc(sizeof(WinIconInstance));
	4464	titlebaricon = (WinIconPtr)ckalloc(sizeof(WinIconInstance));
4452	4465	titlebaricon->iconBlock = lpIR;
4453	4466	titlebaricon->refCount = 1;
4454	4467	if (WinSetIcon(interp, titlebaricon, (Tk_Window) useWinPtr) != TCL_OK) {

4487	4500	int objc, /* Number of arguments. */
4488	4501	Tcl_Obj const objv[]) / Argument objects. */
4489	4502	{
4490		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	4503	WmInfo *wmPtr = winPtr->wmInfoPtr;
4491	4504	int x, y;
	4505	(void)tkwin;
4492	4506
4493	4507	if ((objc != 3) && (objc != 5)) {
4494	4508	Tcl_WrongNumArgs(interp, 2, objv, "window ?x y?");

4543	4557	int objc, /* Number of arguments. */
4544	4558	Tcl_Obj const objv[]) / Argument objects. */
4545	4559	{
4546		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	4560	WmInfo *wmPtr = winPtr->wmInfoPtr;
4547	4561	Tk_Window tkwin2;
4548	4562	WmInfo *wmPtr2;
4549	4563	XSetWindowAttributes atts;

4653	4667	int objc, /* Number of arguments. */
4654	4668	Tcl_Obj const objv[]) / Argument objects. */
4655	4669	{
4656		register Tk_Window frameWin = (Tk_Window) winPtr;
4657		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	4670	Tk_Window frameWin = (Tk_Window) winPtr;
	4671	WmInfo *wmPtr = winPtr->wmInfoPtr;
	4672	(void)tkwin;
	4673	(void)objc;
	4674	(void)objv;
4658	4675
4659	4676	if (!Tk_IsTopLevel(frameWin)) {
4660	4677	if (!Tk_IsManageable(frameWin)) {

4707	4724	int objc, /* Number of arguments. */
4708	4725	Tcl_Obj const objv[]) / Argument objects. */
4709	4726	{
4710		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	4727	WmInfo *wmPtr = winPtr->wmInfoPtr;
4711	4728	int width, height;
	4729	(void)tkwin;
4712	4730
4713	4731	if ((objc != 3) && (objc != 5)) {
4714	4732	Tcl_WrongNumArgs(interp, 2, objv, "window ?width height?");

4758	4776	int objc, /* Number of arguments. */
4759	4777	Tcl_Obj const objv[]) / Argument objects. */
4760	4778	{
4761		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	4779	WmInfo *wmPtr = winPtr->wmInfoPtr;
4762	4780	int width, height;
	4781	(void)tkwin;
4763	4782
4764	4783	if ((objc != 3) && (objc != 5)) {
4765	4784	Tcl_WrongNumArgs(interp, 2, objv, "window ?width height?");

4809	4828	int objc, /* Number of arguments. */
4810	4829	Tcl_Obj const objv[]) / Argument objects. */
4811	4830	{
4812		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	4831	WmInfo *wmPtr = winPtr->wmInfoPtr;
4813	4832	int boolean, curValue;
4814	4833	XSetWindowAttributes atts;
	4834	(void)tkwin;
4815	4835
4816	4836	if ((objc != 3) && (objc != 4)) {
4817	4837	Tcl_WrongNumArgs(interp, 2, objv, "window ?boolean?");

4881	4901	int objc, /* Number of arguments. */
4882	4902	Tcl_Obj const objv[]) / Argument objects. */
4883	4903	{
4884		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	4904	WmInfo *wmPtr = winPtr->wmInfoPtr;
4885	4905	static const char *const optionStrings[] = {
4886	4906	"program", "user", NULL
4887	4907	};

4889	4909	OPT_PROGRAM, OPT_USER
4890	4910	};
4891	4911	int index;
	4912	(void)tkwin;
4892	4913
4893	4914	if ((objc != 3) && (objc != 4)) {
4894	4915	Tcl_WrongNumArgs(interp, 2, objv, "window ?user/program?");

4949	4970	int objc, /* Number of arguments. */
4950	4971	Tcl_Obj const objv[]) / Argument objects. */
4951	4972	{
4952		register WmInfo *wmPtr = winPtr->wmInfoPtr;
4953		register ProtocolHandler protPtr, prevPtr;
	4973	WmInfo *wmPtr = winPtr->wmInfoPtr;
	4974	ProtocolHandler protPtr, prevPtr;
4954	4975	Atom protocol;
4955	4976	const char *cmd;
4956		size_t cmdLength;
	4977	int cmdLength;
4957	4978	Tcl_Obj *resultObj;
	4979	(void)tkwin;
4958	4980
4959	4981	if ((objc < 3) \|\| (objc > 5)) {
4960	4982	Tcl_WrongNumArgs(interp, 2, objv, "window ?name? ?command?");

5008	5030	break;
5009	5031	}
5010	5032	}
5011		cmd = Tcl_GetString(objv[4]);
5012		cmdLength = objv[4]->length;
	5033	cmd = Tcl_GetStringFromObj(objv[4], &cmdLength);
5013	5034	if (cmdLength > 0) {
5014		protPtr = ckalloc(HANDLER_SIZE(cmdLength));
	5035	protPtr = (ProtocolHandler *)ckalloc(HANDLER_SIZE(cmdLength));
5015	5036	protPtr->protocol = protocol;
5016	5037	protPtr->nextPtr = wmPtr->protPtr;
5017	5038	wmPtr->protPtr = protPtr;

5046	5067	int objc, /* Number of arguments. */
5047	5068	Tcl_Obj const objv[]) / Argument objects. */
5048	5069	{
5049		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	5070	WmInfo *wmPtr = winPtr->wmInfoPtr;
5050	5071	int width, height;
	5072	(void)tkwin;
5051	5073
5052	5074	if ((objc != 3) && (objc != 5)) {
5053	5075	Tcl_WrongNumArgs(interp, 2, objv, "window ?width height?");

5108	5130	int objc, /* Number of arguments. */
5109	5131	Tcl_Obj const objv[]) / Argument objects. */
5110	5132	{
5111		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	5133	WmInfo *wmPtr = winPtr->wmInfoPtr;
5112	5134	static const char *const optionStrings[] = {
5113	5135	"program", "user", NULL
5114	5136	};

5116	5138	OPT_PROGRAM, OPT_USER
5117	5139	};
5118	5140	int index;
	5141	(void)tkwin;
5119	5142
5120	5143	if ((objc != 3) && (objc != 4)) {
5121	5144	Tcl_WrongNumArgs(interp, 2, objv, "window ?user\|program?");

5305	5328	int objc, /* Number of arguments. */
5306	5329	Tcl_Obj const objv[]) / Argument objects. */
5307	5330	{
5308		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	5331	WmInfo *wmPtr = winPtr->wmInfoPtr;
5309	5332	static const char *const optionStrings[] = {
5310	5333	"normal", "iconic", "withdrawn", "zoomed", NULL
5311	5334	};

5313	5336	OPT_NORMAL, OPT_ICONIC, OPT_WITHDRAWN, OPT_ZOOMED
5314	5337	};
5315	5338	int index;
	5339	(void)tkwin;
5316	5340
5317	5341	if ((objc < 3) \|\| (objc > 4)) {
5318	5342	Tcl_WrongNumArgs(interp, 2, objv, "window ?state?");

5378	5402	"OVERRIDE_REDIRECT", NULL);
5379	5403	return TCL_ERROR;
5380	5404	}
5381		if (wmPtr->masterPtr != NULL) {
	5405	if (wmPtr->containerPtr != NULL) {
5382	5406	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
5383	5407	"can't iconify \"%s\": it is a transient",
5384	5408	winPtr->pathName));

5445	5469	int objc, /* Number of arguments. */
5446	5470	Tcl_Obj const objv[]) / Argument objects. */
5447	5471	{
5448		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	5472	WmInfo *wmPtr = winPtr->wmInfoPtr;
5449	5473	const char *argv3;
5450		size_t length;
	5474	int length;
5451	5475	HWND wrapper;
	5476	(void)tkwin;
5452	5477
5453	5478	if (objc > 4) {
5454	5479	Tcl_WrongNumArgs(interp, 2, objv, "window ?newTitle?");

5467	5492	int size = 256;
5468	5493
5469	5494	GetWindowTextW(wrapper, buf, size);
5470		Tcl_WinTCharToUtf((LPCTSTR)buf, -1, &titleString);
	5495	Tcl_DStringInit(&titleString);
	5496	Tcl_WCharToUtfDString(buf, wcslen(buf), &titleString);
5471	5497	Tcl_SetObjResult(interp, Tcl_NewStringObj(
5472	5498	Tcl_DStringValue(&titleString),
5473	5499	Tcl_DStringLength(&titleString)));

5480	5506	if (wmPtr->title != NULL) {
5481	5507	ckfree(wmPtr->title);
5482	5508	}
5483		argv3 = Tcl_GetString(objv[3]);
5484		length = objv[3]->length;
5485		wmPtr->title = ckalloc(length + 1);
	5509	argv3 = Tcl_GetStringFromObj(objv[3], &length);
	5510	wmPtr->title = (char *)ckalloc(length + 1);
5486	5511	memcpy(wmPtr->title, argv3, length + 1);
5487	5512
5488	5513	if (!(wmPtr->flags & WM_NEVER_MAPPED) && wmPtr->wrapper != NULL) {
5489	5514	Tcl_DString titleString;
5490	5515
5491		Tcl_WinUtfToTChar(wmPtr->title, -1, &titleString);
	5516	Tcl_DStringInit(&titleString);
	5517	Tcl_UtfToWCharDString(wmPtr->title, -1, &titleString);
5492	5518	SetWindowTextW(wrapper, (LPCWSTR) Tcl_DStringValue(&titleString));
5493	5519	Tcl_DStringFree(&titleString);
5494	5520	}

5521	5547	int objc, /* Number of arguments. */
5522	5548	Tcl_Obj const objv[]) / Argument objects. */
5523	5549	{
5524		register WmInfo *wmPtr = winPtr->wmInfoPtr;
5525		TkWindow masterPtr = wmPtr->masterPtr, masterPtrPtr = &masterPtr, w;
	5550	WmInfo *wmPtr = winPtr->wmInfoPtr;
	5551	TkWindow containerPtr = wmPtr->containerPtr, containerPtrPtr = &containerPtr, w;
5526	5552	WmInfo *wmPtr2;
5527	5553
5528	5554	if ((objc != 3) && (objc != 4)) {

5530	5556	return TCL_ERROR;
5531	5557	}
5532	5558	if (objc == 3) {
5533		if (masterPtr != NULL) {
5534		Tcl_SetObjResult(interp, TkNewWindowObj((Tk_Window) masterPtr));
	5559	if (containerPtr != NULL) {
	5560	Tcl_SetObjResult(interp, TkNewWindowObj((Tk_Window) containerPtr));
5535	5561	}
5536	5562	return TCL_OK;
5537	5563	}
5538	5564	if (Tcl_GetString(objv[3])[0] == '\0') {
5539		if (masterPtr != NULL) {
	5565	if (containerPtr != NULL) {
5540	5566	/*
5541		* If we had a master, tell them that we aren't tied to them
	5567	* If we had a container, tell them that we aren't tied to them
5542	5568	* anymore.
5543	5569	*/
5544	5570
5545		masterPtr->wmInfoPtr->numTransients--;
5546		Tk_DeleteEventHandler((Tk_Window) masterPtr,
	5571	containerPtr->wmInfoPtr->numTransients--;
	5572	Tk_DeleteEventHandler((Tk_Window) containerPtr,
5547	5573	VisibilityChangeMask\|StructureNotifyMask,
5548	5574	WmWaitVisibilityOrMapProc, winPtr);
5549	5575	}
5550	5576
5551		wmPtr->masterPtr = NULL;
	5577	wmPtr->containerPtr = NULL;
5552	5578	} else {
5553	5579	if (TkGetWindowFromObj(interp, tkwin, objv[3],
5554		(Tk_Window *) masterPtrPtr) != TCL_OK) {
	5580	(Tk_Window *) containerPtrPtr) != TCL_OK) {
5555	5581	return TCL_ERROR;
5556	5582	}
5557		while (!Tk_TopWinHierarchy(masterPtr)) {
	5583	while (!Tk_TopWinHierarchy(containerPtr)) {
5558	5584	/*
5559		* Ensure that the master window is actually a Tk toplevel.
	5585	* Ensure that the container window is actually a Tk toplevel.
5560	5586	*/
5561	5587
5562		masterPtr = masterPtr->parentPtr;
5563		}
5564		Tk_MakeWindowExist((Tk_Window) masterPtr);
	5588	containerPtr = containerPtr->parentPtr;
	5589	}
	5590	Tk_MakeWindowExist((Tk_Window) containerPtr);
5565	5591
5566	5592	if (wmPtr->iconFor != NULL) {
5567	5593	Tcl_SetObjResult(interp, Tcl_ObjPrintf(

5571	5597	return TCL_ERROR;
5572	5598	}
5573	5599
5574		wmPtr2 = masterPtr->wmInfoPtr;
	5600	wmPtr2 = containerPtr->wmInfoPtr;
5575	5601
5576	5602	if (wmPtr2->iconFor != NULL) {
5577	5603	Tcl_SetObjResult(interp, Tcl_ObjPrintf(

5580	5606	Tcl_SetErrorCode(interp, "TK", "WM", "TRANSIENT", "ICON", NULL);
5581	5607	return TCL_ERROR;
5582	5608	}
5583		for (w = masterPtr; w != NULL && w->wmInfoPtr != NULL;
5584		w = (TkWindow *)w->wmInfoPtr->masterPtr) {
	5609	for (w = containerPtr; w != NULL && w->wmInfoPtr != NULL;
	5610	w = (TkWindow *)w->wmInfoPtr->containerPtr) {
5585	5611	if (w == winPtr) {
5586	5612	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
5587	5613	"setting \"%s\" as master creates a transient/master cycle",
5588		Tk_PathName(masterPtr)));
	5614	Tk_PathName(containerPtr)));
5589	5615	Tcl_SetErrorCode(interp, "TK", "WM", "TRANSIENT", "SELF", NULL);
5590	5616	return TCL_ERROR;
5591	5617	}
5592	5618	}
5593		if (masterPtr != wmPtr->masterPtr) {
	5619	if (containerPtr != wmPtr->containerPtr) {
5594	5620	/*
5595		* Remove old master map/unmap binding before setting the new
5596		* master. The event handler will ensure that transient states
5597		* reflect the state of the master.
	5621	* Remove old container map/unmap binding before setting the new
	5622	* container. The event handler will ensure that transient states
	5623	* reflect the state of the container.
5598	5624	*/
5599	5625
5600		if (wmPtr->masterPtr != NULL) {
5601		wmPtr->masterPtr->wmInfoPtr->numTransients--;
5602		Tk_DeleteEventHandler((Tk_Window) wmPtr->masterPtr,
	5626	if (wmPtr->containerPtr != NULL) {
	5627	wmPtr->containerPtr->wmInfoPtr->numTransients--;
	5628	Tk_DeleteEventHandler((Tk_Window) wmPtr->containerPtr,
5603	5629	VisibilityChangeMask\|StructureNotifyMask,
5604	5630	WmWaitVisibilityOrMapProc, winPtr);
5605	5631	}
5606	5632
5607		masterPtr->wmInfoPtr->numTransients++;
5608		Tk_CreateEventHandler((Tk_Window) masterPtr,
	5633	containerPtr->wmInfoPtr->numTransients++;
	5634	Tk_CreateEventHandler((Tk_Window) containerPtr,
5609	5635	VisibilityChangeMask\|StructureNotifyMask,
5610	5636	WmWaitVisibilityOrMapProc, winPtr);
5611	5637
5612		wmPtr->masterPtr = masterPtr;
	5638	wmPtr->containerPtr = containerPtr;
5613	5639	}
5614	5640	}
5615	5641	if (!((wmPtr->flags & WM_NEVER_MAPPED)
5616	5642	&& !(winPtr->flags & TK_EMBEDDED))) {
5617		if (wmPtr->masterPtr != NULL
5618		&& !Tk_IsMapped(wmPtr->masterPtr)) {
	5643	if (wmPtr->containerPtr != NULL
	5644	&& !Tk_IsMapped(wmPtr->containerPtr)) {
5619	5645	TkpWmSetState(winPtr, WithdrawnState);
5620	5646	} else {
5621	5647	UpdateWrapper(winPtr);

5649	5675	int objc, /* Number of arguments. */
5650	5676	Tcl_Obj const objv[]) / Argument objects. */
5651	5677	{
5652		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	5678	WmInfo *wmPtr = winPtr->wmInfoPtr;
	5679	(void)tkwin;
5653	5680
5654	5681	if (objc != 3) {
5655	5682	Tcl_WrongNumArgs(interp, 2, objv, "window");

5694	5721	}
5695	5722	}
5696	5723
5697		/ARGSUSED/
5698	5724	static void
5699	5725	WmWaitVisibilityOrMapProc(
5700	5726	ClientData clientData, /* Pointer to window. */
5701	5727	XEvent eventPtr) / Information about event. */
5702	5728	{
5703		TkWindow *winPtr = clientData;
5704		TkWindow *masterPtr = winPtr->wmInfoPtr->masterPtr;
5705
5706		if (masterPtr == NULL)
	5729	TkWindow winPtr = (TkWindow )clientData;
	5730	TkWindow *containerPtr = winPtr->wmInfoPtr->containerPtr;
	5731
	5732	if (containerPtr == NULL)
5707	5733	return;
5708	5734
5709	5735	if (eventPtr->type == MapNotify) {

5715	5741	}
5716	5742
5717	5743	if (eventPtr->type == VisibilityNotify) {
5718		int state = masterPtr->wmInfoPtr->hints.initial_state;
	5744	int state = containerPtr->wmInfoPtr->hints.initial_state;
5719	5745
5720	5746	if ((state == NormalState) \|\| (state == ZoomState)) {
5721	5747	state = winPtr->wmInfoPtr->hints.initial_state;

5761	5787	* of one grid unit. */
5762	5788	{
5763	5789	TkWindow winPtr = (TkWindow ) tkwin;
5764		register WmInfo *wmPtr;
	5790	WmInfo *wmPtr;
5765	5791
5766	5792	/*
5767	5793	* Ensure widthInc and heightInc are greater than 0

5858	5884	* controlling gridding. */
5859	5885	{
5860	5886	TkWindow winPtr = (TkWindow ) tkwin;
5861		register WmInfo *wmPtr;
	5887	WmInfo *wmPtr;
5862	5888
5863	5889	/*
5864	5890	* Find the top-level window for tkwin, plus the window manager

5917	5943	ClientData clientData, /* Window for which event occurred. */
5918	5944	XEvent eventPtr) / Event that just happened. */
5919	5945	{
5920		register TkWindow *winPtr = clientData;
	5946	TkWindow winPtr = (TkWindow )clientData;
5921	5947
5922	5948	if (eventPtr->type == DestroyNotify) {
5923	5949	Tk_ErrorHandler handler;

5957	5983	*----------------------------------------------------------------------
5958	5984	*/
5959	5985
5960		/* ARGSUSED */
5961	5986	static void
5962	5987	TopLevelReqProc(
5963	5988	ClientData dummy, /* Not used. */

5965	5990	{
5966	5991	TkWindow winPtr = (TkWindow ) tkwin;
5967	5992	WmInfo *wmPtr;
	5993	(void)dummy;
5968	5994
5969	5995	wmPtr = winPtr->wmInfoPtr;
5970	5996	if (wmPtr) {

6008	6034	int width, height; /* Size of client area. */
6009	6035	int min, max;
6010	6036	RECT rect;
6011		register TkWindow *winPtr = clientData;
6012		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	6037	TkWindow winPtr = (TkWindow )clientData;
	6038	WmInfo *wmPtr = winPtr->wmInfoPtr;
6013	6039
6014	6040	wmPtr->flags &= ~WM_UPDATE_PENDING;
6015	6041

6289	6315	TkWindow winPtr) / Pointer to top-level window whose geometry
6290	6316	* is to be changed. */
6291	6317	{
6292		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	6318	WmInfo *wmPtr = winPtr->wmInfoPtr;
6293	6319	int x, y, width, height, flags;
6294	6320	char *end;
6295		register const char *p = string;
	6321	const char *p = string;
6296	6322
6297	6323	/*
6298	6324	* The leading "=" is optional.

6421	6447	int xPtr, / Where to store x-displacement of (0,0). */
6422	6448	int yPtr) / Where to store y-displacement of (0,0). */
6423	6449	{
6424		register TkWindow winPtr = (TkWindow ) tkwin;
	6450	TkWindow winPtr = (TkWindow ) tkwin;
6425	6451
6426	6452	/*
6427	6453	* If the window is mapped, let Windows figure out the translation.

6518	6544	int widthPtr, int heightPtr)
6519	6545	/* Store dimensions of virtual root here. */
6520	6546	{
	6547	(void)tkwin;
	6548
6521	6549	*xPtr = GetSystemMetrics(SM_XVIRTUALSCREEN);
6522	6550	*yPtr = GetSystemMetrics(SM_YVIRTUALSCREEN);
6523	6551	*widthPtr = GetSystemMetrics(SM_CXVIRTUALSCREEN);

6550	6578	int x, int y) /* New location for window (within parent). */
6551	6579	{
6552	6580	TkWindow winPtr = (TkWindow ) tkwin;
6553		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	6581	WmInfo *wmPtr = winPtr->wmInfoPtr;
6554	6582
6555	6583	if (!(winPtr->flags & TK_TOP_LEVEL)) {
6556	6584	Tcl_Panic("Tk_MoveToplevelWindow called with non-toplevel window");

6601	6629	XEvent eventPtr) / X event. */
6602	6630	{
6603	6631	WmInfo *wmPtr;
6604		register ProtocolHandler *protPtr;
	6632	ProtocolHandler *protPtr;
6605	6633	Atom protocol;
6606	6634	int result;
6607	6635	Tcl_Interp *interp;

6679	6707
6680	6708	hPtr = Tcl_FindHashEntry(pair->table, (char *) hwnd);
6681	6709	if (hPtr != NULL) {
6682		childWinPtr = Tcl_GetHashValue(hPtr);
	6710	childWinPtr = (TkWindow *)Tcl_GetHashValue(hPtr);
6683	6711
6684	6712	/*
6685	6713	* Double check that same HWND does not get passed twice.

6779	6807	Tcl_InitHashTable(&table, TCL_ONE_WORD_KEYS);
6780	6808	TkWmStackorderToplevelWrapperMap(parentPtr, parentPtr->display, &table);
6781	6809
6782		windows = ckalloc((table.numEntries+1) * sizeof(TkWindow *));
	6810	windows = (TkWindow *)ckalloc((table.numEntries+1) sizeof(TkWindow *));
6783	6811
6784	6812	/*
6785	6813	* Special cases: If zero or one toplevels were mapped there is no need to

6792	6820	goto done;
6793	6821	case 1:
6794	6822	hPtr = Tcl_FirstHashEntry(&table, &search);
6795		windows[0] = Tcl_GetHashValue(hPtr);
	6823	windows[0] = (TkWindow *)Tcl_GetHashValue(hPtr);
6796	6824	windows[1] = NULL;
6797	6825	goto done;
6798	6826	}

6955	6983	* Automatically add the toplevel itself as the last element of the list.
6956	6984	*/
6957	6985
6958		newPtr = ckalloc((count+2) * sizeof(TkWindow *));
	6986	newPtr = (TkWindow *)ckalloc((count+2) sizeof(TkWindow *));
6959	6987	if (count > 0) {
6960	6988	memcpy(newPtr, oldPtr, count * sizeof(TkWindow*));
6961	6989	}

8251	8279	static void
8252	8280	GenerateActivateEvent(TkWindow * winPtr, const int *flagPtr)
8253	8281	{
8254		ActivateEvent *eventPtr = ckalloc(sizeof(ActivateEvent));
	8282	ActivateEvent eventPtr = (ActivateEvent )ckalloc(sizeof(ActivateEvent));
8255	8283
8256	8284	eventPtr->ev.proc = ActivateWindow;
8257	8285	eventPtr->winPtr = winPtr;

8354	8382	TkWinSetForegroundWindow(
8355	8383	TkWindow *winPtr)
8356	8384	{
8357		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	8385	WmInfo *wmPtr = winPtr->wmInfoPtr;
8358	8386
8359	8387	if (wmPtr->wrapper != NULL) {
8360	8388	SetForegroundWindow(wmPtr->wrapper);

8384	8412	TkpWinToplevelWithDraw(
8385	8413	TkWindow *winPtr)
8386	8414	{
8387		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	8415	WmInfo *wmPtr = winPtr->wmInfoPtr;
8388	8416
8389	8417	wmPtr->flags \|= WM_WITHDRAWN;
8390	8418	TkpWmSetState(winPtr, WithdrawnState);

8435	8463	TkpWinToplevelDeiconify(
8436	8464	TkWindow *winPtr)
8437	8465	{
8438		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	8466	WmInfo *wmPtr = winPtr->wmInfoPtr;
8439	8467
8440	8468	wmPtr->flags &= ~WM_WITHDRAWN;
8441	8469

8503	8531	TkpWinToplevelIsControlledByWm(
8504	8532	TkWindow *winPtr)
8505	8533	{
8506		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	8534	WmInfo *wmPtr = winPtr->wmInfoPtr;
8507	8535
8508	8536	if (!wmPtr) {
8509	8537	return 0;

8533	8561	TkWindow *winPtr,
8534	8562	int x, int y)
8535	8563	{
8536		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	8564	WmInfo *wmPtr = winPtr->wmInfoPtr;
8537	8565
8538	8566	if (wmPtr && x >= 0 && y >= 0 && !TkpWinToplevelIsControlledByWm(winPtr)) {
8539	8567	Tk_MoveToplevelWindow((Tk_Window) winPtr, x, y);

8565	8593	int reqValue)
8566	8594	{
8567	8595	int curValue;
8568		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	8596	WmInfo *wmPtr = winPtr->wmInfoPtr;
8569	8597
8570	8598	curValue = Tk_Attributes((Tk_Window) winPtr)->override_redirect;
8571	8599	if (reqValue < 0) {

8612	8640	TkpWinToplevelDetachWindow(
8613	8641	TkWindow *winPtr)
8614	8642	{
8615		register WmInfo *wmPtr = winPtr->wmInfoPtr;
	8643	WmInfo *wmPtr = winPtr->wmInfoPtr;
8616	8644
8617	8645	if (winPtr->flags & TK_EMBEDDED) {
8618	8646	int state = SendMessageW(wmPtr->wrapper, TK_STATE, -1, -1) - 1;

+121

-124

win/tkWinX.c less more

69	69	static HINSTANCE tkInstance = NULL; /* Application instance handle. */
70	70	static int childClassInitialized; /* Registered child class? */
71	71	static WNDCLASSW childClass; /* Window class for child windows. */
72		static int tkPlatformId = 0; /* version of Windows platform */
73	72	static int tkWinTheme = 0; /* See TkWinGetPlatformTheme */
74	73	static Tcl_Encoding keyInputEncoding = NULL;
75	74	/* The current character encoding for

104	103	static void GenerateXEvent(HWND hwnd, UINT message,
105	104	WPARAM wParam, LPARAM lParam);
106	105	static unsigned int GetState(UINT message, WPARAM wParam, LPARAM lParam);
107		static void GetTranslatedKey(XKeyEvent *xkey, UINT type);
	106	static void GetTranslatedKey(TkKeyEvent *xkey, UINT type);
108	107	static void UpdateInputLanguage(int charset);
109	108	static int HandleIMEComposition(HWND hwnd, LPARAM lParam);
110	109

138	137
139	138	if (!buffer[0]) {
140	139	HANDLE handle = GetModuleHandleW(L"NTDLL");
141		int(__stdcall getversion)(void ) =
142		(int(__stdcall )(void ))GetProcAddress(handle, "RtlGetVersion");
	140	int(__stdcall getversion)(void ) = (int(__stdcall )(void ))
	141	(void *)GetProcAddress(handle, "RtlGetVersion");
143	142	os.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW);
144	143	if (!getversion \|\| getversion(&os)) {
145	144	GetVersionExW(&os);

327	326	/*
328	327	*----------------------------------------------------------------------
329	328	*
330		* TkWinGetPlatformId --
331		*
332		* Determines whether running under NT, 95, or Win32s, to allow runtime
333		* conditional code. Win32s is no longer supported.
	329	* TkWinGetPlatformTheme --
	330	*
	331	* Return the Windows drawing style we should be using.
334	332	*
335	333	* Results:
336	334	* The return value is one of:
337		* VER_PLATFORM_WIN32s Win32s on Windows 3.1 (not supported)
338		* VER_PLATFORM_WIN32_WINDOWS Win32 on Windows 95, 98, ME (not supported)
339		* VER_PLATFORM_WIN32_NT Win32 on Windows XP, Vista, Windows 7, Windows 8
340		* VER_PLATFORM_WIN32_CE Win32 on Windows CE
341		*
342		* Side effects:
343		* None.
	335	* TK_THEME_WIN_CLASSIC 95/98/NT or XP in classic mode
	336	* TK_THEME_WIN_XP XP not in classic mode
	337	* TK_THEME_WIN_VISTA Vista or higher
344	338	*
345	339	*----------------------------------------------------------------------
346	340	*/
347	341
348	342	int
349		TkWinGetPlatformId(void)
350		{
351		if (tkPlatformId == 0) {
	343	TkWinGetPlatformTheme(void)
	344	{
	345	if (tkWinTheme == 0) {
352	346	OSVERSIONINFOW os;
353	347
354	348	os.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW);
355	349	GetVersionExW(&os);
356		tkPlatformId = os.dwPlatformId;
	350
	351	if (os.dwPlatformId != VER_PLATFORM_WIN32_NT) {
	352	Tcl_Panic("Windows NT is the only supported platform");
	353	}
357	354
358	355	/*
359		* Set tkWinTheme to be TK_THEME_WIN_XP or TK_THEME_WIN_CLASSIC. The
	356	* Set tkWinTheme to be TK_THEME_WIN_(CLASSIC\|XP\|VISTA). The
360	357	* TK_THEME_WIN_CLASSIC could be set even when running under XP if the
361	358	* windows classic theme was selected.
362	359	*/
363
364		if ((os.dwPlatformId == VER_PLATFORM_WIN32_NT) &&
365		(os.dwMajorVersion == 5 && os.dwMinorVersion == 1)) {
	360	if (os.dwMajorVersion == 5 && os.dwMinorVersion >= 1) {
366	361	HKEY hKey;
367	362	LPCWSTR szSubKey = L"Control Panel\\Appearance";
368	363	LPCWSTR szCurrent = L"Current";
369	364	DWORD dwSize = 200;
370		char pBuffer[200];
	365	WCHAR pBuffer[200];
371	366
372	367	memset(pBuffer, 0, dwSize);
373	368	if (RegOpenKeyExW(HKEY_CURRENT_USER, szSubKey, 0L,

376	371	} else {
377	372	RegQueryValueExW(hKey, szCurrent, NULL, NULL, (LPBYTE) pBuffer, &dwSize);
378	373	RegCloseKey(hKey);
379		if (strcmp(pBuffer, "Windows Standard") == 0) {
	374	if (wcscmp(pBuffer, L"Windows Standard") == 0) {
380	375	tkWinTheme = TK_THEME_WIN_CLASSIC;
381	376	} else {
382	377	tkWinTheme = TK_THEME_WIN_XP;
383	378	}
384	379	}
	380	} else if (os.dwMajorVersion > 5) {
	381	tkWinTheme = TK_THEME_WIN_VISTA;
385	382	} else {
386	383	tkWinTheme = TK_THEME_WIN_CLASSIC;
387	384	}
388	385	}
389		return tkPlatformId;
390		}
391
392		/*
393		*----------------------------------------------------------------------
394		*
395		* TkWinGetPlatformTheme --
396		*
397		* Return the Windows drawing style we should be using.
398		*
399		* Results:
400		* The return value is one of:
401		* TK_THEME_WIN_CLASSIC 95/98/NT or XP in classic mode
402		* TK_THEME_WIN_XP XP not in classic mode
403		*
404		* Side effects:
405		* Could invoke TkWinGetPlatformId.
	386	return tkWinTheme;
	387	}
	388
	389	/*
	390	*----------------------------------------------------------------------
	391	*
	392	* TkWinGetPlatformId --
	393	*
	394	* Determines whether running under NT, 95, or Win32s, to allow runtime
	395	* conditional code. Win32s is no longer supported.
	396	*
	397	* Results:
	398	* The return value is always:
	399	* VER_PLATFORM_WIN32_NT Win32 on Windows XP, Vista, Windows 7, Windows 8
	400	*
	401	* Side effects:
	402	* None.
406	403	*
407	404	*----------------------------------------------------------------------
408	405	*/
409	406
410	407	int
411		TkWinGetPlatformTheme(void)
412		{
413		if (tkPlatformId == 0) {
414		TkWinGetPlatformId();
415		}
416		return tkWinTheme;
417		}
418
	408	TkWinGetPlatformId(void)
	409	{
	410	return VER_PLATFORM_WIN32_NT;
	411	}
	412
419	413	/*
420	414	*----------------------------------------------------------------------
421	415	*

999	993	WPARAM wParam,
1000	994	LPARAM lParam)
1001	995	{
1002		XEvent event;
	996	union {XEvent x; TkKeyEvent key;} event;
1003	997	TkWindow *winPtr;
1004	998	ThreadSpecificData tsdPtr = (ThreadSpecificData )
1005	999	Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));

1025	1019	return;
1026	1020	}
1027	1021
1028		memset(&event, 0, sizeof(XEvent));
1029		event.xany.serial = winPtr->display->request++;
1030		event.xany.send_event = False;
1031		event.xany.display = winPtr->display;
1032		event.xany.window = winPtr->window;
	1022	memset(&event.x, 0, sizeof(XEvent));
	1023	event.x.xany.serial = winPtr->display->request++;
	1024	event.x.xany.send_event = False;
	1025	event.x.xany.display = winPtr->display;
	1026	event.x.xany.window = winPtr->window;
1033	1027
1034	1028	switch (message) {
1035	1029	case WM_PAINT: {
1036	1030	PAINTSTRUCT ps;
1037	1031
1038		event.type = Expose;
	1032	event.x.type = Expose;
1039	1033	BeginPaint(hwnd, &ps);
1040		event.xexpose.x = ps.rcPaint.left;
1041		event.xexpose.y = ps.rcPaint.top;
1042		event.xexpose.width = ps.rcPaint.right - ps.rcPaint.left;
1043		event.xexpose.height = ps.rcPaint.bottom - ps.rcPaint.top;
	1034	event.x.xexpose.x = ps.rcPaint.left;
	1035	event.x.xexpose.y = ps.rcPaint.top;
	1036	event.x.xexpose.width = ps.rcPaint.right - ps.rcPaint.left;
	1037	event.x.xexpose.height = ps.rcPaint.bottom - ps.rcPaint.top;
1044	1038	EndPaint(hwnd, &ps);
1045		event.xexpose.count = 0;
	1039	event.x.xexpose.count = 0;
1046	1040	break;
1047	1041	}
1048	1042
1049	1043	case WM_CLOSE:
1050		event.type = ClientMessage;
1051		event.xclient.message_type =
	1044	event.x.type = ClientMessage;
	1045	event.x.xclient.message_type =
1052	1046	Tk_InternAtom((Tk_Window) winPtr, "WM_PROTOCOLS");
1053		event.xclient.format = 32;
1054		event.xclient.data.l[0] =
	1047	event.x.xclient.format = 32;
	1048	event.x.xclient.data.l[0] =
1055	1049	Tk_InternAtom((Tk_Window) winPtr, "WM_DELETE_WINDOW");
1056	1050	break;
1057	1051

1087	1081	return;
1088	1082	}
1089	1083
1090		event.xany.window = winPtr->window;
1091		event.type = (message == WM_SETFOCUS) ? FocusIn : FocusOut;
1092		event.xfocus.mode = NotifyNormal;
1093		event.xfocus.detail = NotifyNonlinear;
	1084	event.x.xany.window = winPtr->window;
	1085	event.x.type = (message == WM_SETFOCUS) ? FocusIn : FocusOut;
	1086	event.x.xfocus.mode = NotifyNormal;
	1087	event.x.xfocus.detail = NotifyNonlinear;
1094	1088
1095	1089	/*
1096	1090	* Destroy the caret if we own it. If we are moving to another Tk

1112	1106
1113	1107	return;
1114	1108	}
1115		event.type = SelectionClear;
1116		event.xselectionclear.selection =
	1109	event.x.type = SelectionClear;
	1110	event.x.xselectionclear.selection =
1117	1111	Tk_InternAtom((Tk_Window)winPtr, "CLIPBOARD");
1118		event.xselectionclear.time = TkpGetMS();
	1112	event.x.xselectionclear.time = TkpGetMS();
1119	1113	break;
1120	1114
1121	1115	case WM_MOUSEWHEEL:

1144	1138	* Set up the common event fields.
1145	1139	*/
1146	1140
1147		event.xbutton.root = RootWindow(winPtr->display, winPtr->screenNum);
1148		event.xbutton.subwindow = None;
1149		event.xbutton.x = clientPoint.x;
1150		event.xbutton.y = clientPoint.y;
1151		event.xbutton.x_root = root.point.x;
1152		event.xbutton.y_root = root.point.y;
1153		event.xbutton.state = state;
1154		event.xbutton.time = time;
1155		event.xbutton.same_screen = True;
	1141	event.x.xbutton.root = RootWindow(winPtr->display, winPtr->screenNum);
	1142	event.x.xbutton.subwindow = None;
	1143	event.x.xbutton.x = clientPoint.x;
	1144	event.x.xbutton.y = clientPoint.y;
	1145	event.x.xbutton.x_root = root.point.x;
	1146	event.x.xbutton.y_root = root.point.y;
	1147	event.x.xbutton.state = state;
	1148	event.x.xbutton.time = time;
	1149	event.x.xbutton.same_screen = True;
1156	1150
1157	1151	/*
1158	1152	* Now set up event specific fields.

1184	1178	* TkpGetString. [Bug 1118340].
1185	1179	*/
1186	1180
1187		event.type = MouseWheelEvent;
1188		event.xany.send_event = -1;
1189		event.xkey.nbytes = 0;
1190		event.xkey.keycode = tsdPtr->vWheelAcc / WHEEL_DELTA * WHEEL_DELTA;
	1181	event.x.type = MouseWheelEvent;
	1182	event.x.xany.send_event = -1;
	1183	event.key.nbytes = 0;
	1184	event.x.xkey.keycode = tsdPtr->vWheelAcc / WHEEL_DELTA * WHEEL_DELTA;
1191	1185	tsdPtr->vWheelAcc = tsdPtr->vWheelAcc % WHEEL_DELTA;
1192	1186	break;
1193	1187	}

1216	1210	* TkpGetString. [Bug 1118340].
1217	1211	*/
1218	1212
1219		event.type = MouseWheelEvent;
1220		event.xany.send_event = -1;
1221		event.xkey.nbytes = 0;
1222		event.xkey.state \|= ShiftMask;
1223		event.xkey.keycode = tsdPtr->hWheelAcc / WHEEL_DELTA * WHEEL_DELTA;
	1213	event.x.type = MouseWheelEvent;
	1214	event.x.xany.send_event = -1;
	1215	event.key.nbytes = 0;
	1216	event.x.xkey.state \|= ShiftMask;
	1217	event.x.xkey.keycode = tsdPtr->hWheelAcc / WHEEL_DELTA * WHEEL_DELTA;
1224	1218	tsdPtr->hWheelAcc = tsdPtr->hWheelAcc % WHEEL_DELTA;
1225	1219	break;
1226	1220	}

1234	1228	* MBCS characters that came from the TranslateMessage call.
1235	1229	*/
1236	1230
1237		event.type = KeyPress;
1238		event.xany.send_event = -1;
1239		event.xkey.keycode = wParam;
1240		GetTranslatedKey(&event.xkey, (message == WM_KEYDOWN) ? WM_CHAR :
	1231	event.x.type = KeyPress;
	1232	event.x.xany.send_event = -1;
	1233	event.x.xkey.keycode = wParam;
	1234	GetTranslatedKey(&event.key, (message == WM_KEYDOWN) ? WM_CHAR :
1241	1235	WM_SYSCHAR);
1242	1236	break;
1243	1237

1249	1243	* WM_CHAR messages which will follow.
1250	1244	*/
1251	1245
1252		event.type = KeyRelease;
1253		event.xkey.keycode = wParam;
1254		event.xkey.nbytes = 0;
	1246	event.x.type = KeyRelease;
	1247	event.x.xkey.keycode = wParam;
	1248	event.key.nbytes = 0;
1255	1249	break;
1256	1250
1257	1251	case WM_CHAR:

1285	1279	* character.
1286	1280	*/
1287	1281
1288		event.type = KeyPress;
1289		event.xany.send_event = -1;
1290		event.xkey.keycode = 0;
	1282	event.x.type = KeyPress;
	1283	event.x.xany.send_event = -1;
	1284	event.x.xkey.keycode = 0;
1291	1285	if ((int)wParam & 0xff00) {
1292	1286	int ch1 = wParam & 0xffff;
1293	1287

1300	1294	(ch1 & 0x3ff) \| 0x10000;
1301	1295	tsdPtr->surrogateBuffer = 0;
1302	1296	}
1303		event.xany.send_event = -3;
1304		event.xkey.nbytes = 0;
1305		event.xkey.keycode = ch1;
	1297	event.x.xany.send_event = -3;
	1298	event.key.nbytes = 0;
	1299	event.x.xkey.keycode = ch1;
1306	1300	} else {
1307		event.xkey.nbytes = 1;
1308		event.xkey.trans_chars[0] = (char) wParam;
	1301	event.key.nbytes = 1;
	1302	event.key.trans_chars[0] = (char) wParam;
1309	1303
1310	1304	if (IsDBCSLeadByte((BYTE) wParam)) {
1311	1305	MSG msg;

1314	1308	PM_NOREMOVE) != 0)
1315	1309	&& (msg.message == WM_CHAR)) {
1316	1310	GetMessageW(&msg, NULL, WM_CHAR, WM_CHAR);
1317		event.xkey.nbytes = 2;
1318		event.xkey.trans_chars[1] = (char) msg.wParam;
	1311	event.key.nbytes = 2;
	1312	event.key.trans_chars[1] = (char) msg.wParam;
1319	1313	}
1320	1314	}
1321	1315	}
1322		Tk_QueueWindowEvent(&event, TCL_QUEUE_TAIL);
1323		event.type = KeyRelease;
	1316	Tk_QueueWindowEvent(&event.x, TCL_QUEUE_TAIL);
	1317	event.x.type = KeyRelease;
1324	1318	break;
1325	1319
1326	1320	case WM_UNICHAR: {
1327		event.type = KeyPress;
1328		event.xany.send_event = -3;
1329		event.xkey.keycode = wParam;
1330		event.xkey.nbytes = 0;
1331		Tk_QueueWindowEvent(&event, TCL_QUEUE_TAIL);
1332		event.type = KeyRelease;
	1321	event.x.type = KeyPress;
	1322	event.x.xany.send_event = -3;
	1323	event.x.xkey.keycode = wParam;
	1324	event.key.nbytes = 0;
	1325	Tk_QueueWindowEvent(&event.x, TCL_QUEUE_TAIL);
	1326	event.x.type = KeyRelease;
1333	1327	break;
1334	1328	}
1335	1329

1350	1344	* Post the translated event to the main Tk event queue.
1351	1345	*/
1352	1346
1353		Tk_QueueWindowEvent(&event, TCL_QUEUE_TAIL);
	1347	Tk_QueueWindowEvent(&event.x, TCL_QUEUE_TAIL);
1354	1348	}
1355	1349
1356	1350	/*

1359	1353	* GetState --
1360	1354	*
1361	1355	* This function constructs a state mask for the mouse buttons and
1362		* modifier keys as they were before the event occured.
	1356	* modifier keys as they were before the event occurred.
1363	1357	*
1364	1358	* Results:
1365	1359	* Returns a composite value of all the modifier and button state flags

1452	1446
1453	1447	static void
1454	1448	GetTranslatedKey(
1455		XKeyEvent *xkey,
	1449	TkKeyEvent *xkey,
1456	1450	UINT type)
1457	1451	{
1458	1452	MSG msg;

1475	1469	*/
1476	1470
1477	1471	if ((msg.message == WM_CHAR) && (msg.lParam & 0x20000000)) {
1478		xkey->state = 0;
1479		}
1480		xkey->trans_chars[xkey->nbytes] = (char) msg.wParam;
1481		xkey->nbytes++;
	1472	xkey->keyEvent.state = 0;
	1473	}
	1474	xkey->trans_chars[xkey->nbytes++] = (char) msg.wParam;
1482	1475
1483	1476	if (((unsigned short) msg.wParam) > ((unsigned short) 0xff)) {
1484	1477	/*

1535	1528	return;
1536	1529	}
1537	1530
1538		sprintf(codepage, "cp%d", charsetInfo.ciACP);
	1531	if (charsetInfo.ciACP == CP_UTF8) {
	1532	strcpy(codepage, "utf-8");
	1533	} else {
	1534	sprintf(codepage, "cp%d", charsetInfo.ciACP);
	1535	}
1539	1536
1540	1537	if ((encoding = Tcl_GetEncoding(NULL, codepage)) == NULL) {
1541	1538	/*

+3

-3

win/ttkWinTheme.c less more

6	6
7	7	#include <tkWinInt.h>
8	8
9		#ifndef DFCS_HOT /* Windows 98/Me, Windows 200/XP only */
	9	#ifndef DFCS_HOT /* Windows 98/Me, Windows 2000/XP only */
10	10	#define DFCS_HOT 0
11	11	#endif
12	12

685	685	TTK_LAYOUT("TCombobox",
686	686	TTK_GROUP("Combobox.field", TTK_FILL_BOTH,
687	687	TTK_NODE("Combobox.downarrow", TTK_PACK_RIGHT\|TTK_FILL_Y)
688		TTK_GROUP("Combobox.padding", TTK_PACK_LEFT\|TTK_EXPAND\|TTK_FILL_BOTH,
689		TTK_GROUP("Combobox.focus", TTK_PACK_LEFT\|TTK_EXPAND\|TTK_FILL_BOTH,
	688	TTK_GROUP("Combobox.padding", TTK_FILL_BOTH,
	689	TTK_GROUP("Combobox.focus", TTK_FILL_BOTH,
690	690	TTK_NODE("Combobox.textarea", TTK_FILL_BOTH)))))
691	691
692	692	TTK_END_LAYOUT_TABLE

+65

-66

win/ttkWinXPTheme.c less more

14	14	* shellcc/platform/commctls/userex/refentry.asp >
15	15	*/
16	16
	17	#define WINVER 0x0501 /* Requires Windows XP APIs */
	18
	19	#include <tkWinInt.h>
17	20	#ifndef HAVE_UXTHEME_H
18	21	/* Stub for platforms that lack the XP theme API headers: */
19		#include <tkWinInt.h>
20	22	int TtkXPTheme_Init(Tcl_Interp *interp, HWND hwnd) { return TCL_OK; }
21	23	#else
22
23		#define WINVER 0x0501 /* Requires Windows XP APIs */
24	24
25	25	#include <windows.h>
26	26	#include <uxtheme.h>

29	29	#else
30	30	# include <tmschema.h>
31	31	#endif
32
33		#include <tkWinInt.h>
34	32
35	33	#include "ttk/ttkTheme.h"
36	34

105	103	* We have successfully loaded the library. Proceed in storing the
106	104	* addresses of the functions we want to use.
107	105	*/
108		XPThemeProcs *procs = ckalloc(sizeof(XPThemeProcs));
	106	XPThemeProcs procs = (XPThemeProcs )ckalloc(sizeof(XPThemeProcs));
109	107	#define LOADPROC(name) \
110		(0 != (procs->name = (name ## Proc *)GetProcAddress(handle, #name) ))
	108	(0 != (procs->name = (name ## Proc )(void )GetProcAddress(handle, #name) ))
111	109
112	110	if ( LOADPROC(OpenThemeData)
113	111	&& LOADPROC(CloseThemeData)

137	135	static void
138	136	XPThemeDeleteProc(void *clientData)
139	137	{
140		XPThemeData *themeData = clientData;
	138	XPThemeData themeData = (XPThemeData )clientData;
141	139	FreeLibrary(themeData->hlibrary);
142	140	ckfree(clientData);
143	141	}

145	143	static int
146	144	XPThemeEnabled(Ttk_Theme theme, void *clientData)
147	145	{
148		XPThemeData *themeData = clientData;
	146	XPThemeData themeData = (XPThemeData )clientData;
149	147	int active = themeData->procs->IsThemeActive();
150	148	int themed = themeData->procs->IsAppThemed();
	149	(void)theme;
	150
151	151	return (active && themed);
152	152	}
153	153

381	381	int partId; /* BP_PUSHBUTTON, BP_CHECKBUTTON, etc. */
382	382	Ttk_StateTable statemap; / Map Tk states to XP states */
383	383	Ttk_Padding padding; /* See NOTE-GetThemeMargins */
384		int flags;
385		# define IGNORE_THEMESIZE 0x80000000 /* See NOTE-GetThemePartSize */
386		# define PAD_MARGINS 0x40000000 /* See NOTE-GetThemeMargins */
387		# define HEAP_ELEMENT 0x20000000 /* ElementInfo is on heap */
388		# define HALF_HEIGHT 0x10000000 /* Used by GenericSizedElements */
389		# define HALF_WIDTH 0x08000000 /* Used by GenericSizedElements */
	384	unsigned flags;
	385	# define IGNORE_THEMESIZE 0x80000000U /* See NOTE-GetThemePartSize */
	386	# define PAD_MARGINS 0x40000000U /* See NOTE-GetThemeMargins */
	387	# define HEAP_ELEMENT 0x20000000U /* ElementInfo is on heap */
	388	# define HALF_HEIGHT 0x10000000U /* Used by GenericSizedElements */
	389	# define HALF_WIDTH 0x08000000U /* Used by GenericSizedElements */
390	390	} ElementInfo;
391	391
392	392	typedef struct

394	394	/*
395	395	* Static data, initialized when element is registered:
396	396	*/
397		ElementInfo *info;
	397	const ElementInfo *info;
398	398	XPThemeProcs procs; / Pointer to theme procedure table */
399	399
400	400	/*

410	410	} ElementData;
411	411
412	412	static ElementData *
413		NewElementData(XPThemeProcs procs, ElementInfo info)
414		{
415		ElementData *elementData = ckalloc(sizeof(ElementData));
	413	NewElementData(XPThemeProcs procs, const ElementInfo info)
	414	{
	415	ElementData elementData = (ElementData )ckalloc(sizeof(ElementData));
416	416
417	417	elementData->procs = procs;
418	418	elementData->info = info;

428	428	*/
429	429	static void DestroyElementData(void *clientData)
430	430	{
431		ElementData *elementData = clientData;
	431	ElementData elementData = (ElementData )clientData;
432	432	if (elementData->info->flags & HEAP_ELEMENT) {
433		ckfree(elementData->info->statemap);
434		ckfree(elementData->info->className);
435		ckfree(elementData->info->elementName);
436		ckfree(elementData->info);
	433	ckfree((char *)elementData->info->statemap);
	434	ckfree((char *)elementData->info->className);
	435	ckfree((char *)elementData->info->elementName);
	436	ckfree((char *)elementData->info);
437	437	}
438	438	ckfree(clientData);
439	439	}

496	496	void clientData, void elementRecord, Tk_Window tkwin,
497	497	int widthPtr, int heightPtr, Ttk_Padding *paddingPtr)
498	498	{
499		ElementData *elementData = clientData;
	499	ElementData elementData = (ElementData )clientData;
500	500	HRESULT result;
501	501	SIZE size;
	502	(void)elementRecord;
502	503
503	504	if (!InitElementData(elementData, tkwin, 0))
504	505	return;

506	507	if (!(elementData->info->flags & IGNORE_THEMESIZE)) {
507	508	result = elementData->procs->GetThemePartSize(
508	509	elementData->hTheme,
509		elementData->hDC,
	510	NULL,
510	511	elementData->info->partId,
511	512	Ttk_StateTableLookup(elementData->info->statemap, 0),
512	513	NULL /RECT prc*/,

532	533	void clientData, void elementRecord, Tk_Window tkwin,
533	534	Drawable d, Ttk_Box b, unsigned int state)
534	535	{
535		ElementData *elementData = clientData;
	536	ElementData elementData = (ElementData )clientData;
536	537	RECT rc;
	538	(void)elementRecord;
537	539
538	540	if (!InitElementData(elementData, tkwin, d)) {
539	541	return;

577	579	void clientData, void elementRecord, Tk_Window tkwin,
578	580	int widthPtr, int heightPtr, Ttk_Padding *paddingPtr)
579	581	{
580		ElementData *elementData = clientData;
	582	ElementData elementData = (ElementData )clientData;
581	583
582	584	if (!InitElementData(elementData, tkwin, 0))
583	585	return;

613	615	void clientData, void elementRecord, Tk_Window tkwin,
614	616	int widthPtr, int heightPtr, Ttk_Padding *paddingPtr)
615	617	{
616		ElementData *elementData = clientData;
	618	ElementData elementData = (ElementData )clientData;
617	619
618	620	if (!InitElementData(elementData, tkwin, 0))
619	621	return;

642	644	void clientData, void elementRecord, Tk_Window tkwin,
643	645	Drawable d, Ttk_Box b, unsigned int state)
644	646	{
645		ElementData *elementData = clientData;
	647	ElementData elementData = (ElementData )clientData;
646	648	unsigned stateId = Ttk_StateTableLookup(elementData->info->statemap, state);
647	649	RECT rc = BoxToRect(b);
	650	(void)elementRecord;
648	651
649	652	/*
650	653	* Don't draw the thumb if we are disabled.

681	684	void clientData, void elementRecord, Tk_Window tkwin,
682	685	int widthPtr, int heightPtr, Ttk_Padding *paddingPtr)
683	686	{
684		ElementData *elementData = clientData;
	687	ElementData elementData = (ElementData )clientData;
685	688	int nBars = 3;
686	689
687	690	GenericElementSize(clientData, elementRecord, tkwin,

721	724	void clientData, void elementRecord, Tk_Window tkwin,
722	725	Drawable d, Ttk_Box b, unsigned int state)
723	726	{
724		ElementData *elementData = clientData;
	727	ElementData elementData = (ElementData )clientData;
725	728	int partId = elementData->info->partId;
726	729	RECT rc = BoxToRect(b);
	730	(void)elementRecord;
727	731
728	732	if (!InitElementData(elementData, tkwin, d))
729	733	return;

792	796	TreeIndicatorElementDraw
793	797	};
794	798
795		#if BROKEN_TEXT_ELEMENT
	799	#ifdef BROKEN_TEXT_ELEMENT
796	800
797	801	/*
798	802	*----------------------------------------------------------------------

811	815	Tcl_Obj *fontObj;
812	816	} TextElement;
813	817
814		static Ttk_ElementOptionSpec TextElementOptions[] =
	818	static const Ttk_ElementOptionSpec TextElementOptions[] =
815	819	{
816	820	{ "-text", TK_OPTION_STRING,
817	821	Tk_Offset(TextElement,textObj), "" },

836	840	return;
837	841
838	842	src = Tcl_GetStringFromObj(element->textObj, &len);
839		Tcl_WinUtfToTChar(src, len, &ds);
	843	Tcl_DStringInit(&ds);
840	844	hr = elementData->procs->GetThemeTextExtent(
841	845	elementData->hTheme,
842	846	elementData->hDC,
843	847	elementData->info->partId,
844	848	Ttk_StateTableLookup(elementData->info->statemap, 0),
845		(WCHAR *) Tcl_DStringValue(&ds),
	849	Tcl_UtfToWCharDString(src, len, &ds),
846	850	-1,
847		DT_LEFT,// \| DT_BOTTOM \| DT_NOPREFIX,
	851	DT_LEFT /* \| DT_BOTTOM \| DT_NOPREFIX */,
848	852	NULL,
849	853	&rc);
850	854

875	879	return;
876	880
877	881	src = Tcl_GetStringFromObj(element->textObj, &len);
878		Tcl_WinUtfToTChar(src, len, &ds);
	882	Tcl_DStringInit(&ds);
879	883	hr = elementData->procs->DrawThemeText(
880	884	elementData->hTheme,
881	885	elementData->hDC,
882	886	elementData->info->partId,
883	887	Ttk_StateTableLookup(elementData->info->statemap, state),
884		(WCHAR *) Tcl_DStringValue(&ds),
	888	Tcl_UtfToWCharDString(src, len, &ds),
885	889	-1,
886		DT_LEFT,// \| DT_BOTTOM \| DT_NOPREFIX,
	890	DT_LEFT /* \| DT_BOTTOM \| DT_NOPREFIX */,
887	891	(state & TTK_STATE_DISABLED) ? DTT_GRAYED : 0,
888	892	&rc);
889	893

916	920
917	921	TTK_LAYOUT("TMenubutton",
918	922	TTK_NODE("Menubutton.dropdown", TTK_PACK_RIGHT\|TTK_FILL_Y)
919		TTK_GROUP("Menubutton.button", TTK_PACK_RIGHT\|TTK_EXPAND\|TTK_FILL_BOTH,
920		TTK_GROUP("Menubutton.padding", TTK_PACK_LEFT\|TTK_EXPAND\|TTK_FILL_X,
	923	TTK_GROUP("Menubutton.button", TTK_FILL_BOTH,
	924	TTK_GROUP("Menubutton.padding", TTK_FILL_X,
921	925	TTK_NODE("Menubutton.label", 0))))
922	926
923	927	TTK_LAYOUT("Horizontal.TScrollbar",

935	939	TTK_NODE("Vertical.Scrollbar.grip", 0))))
936	940
937	941	TTK_LAYOUT("Horizontal.TScale",
938		TTK_GROUP("Scale.focus", TTK_EXPAND\|TTK_FILL_BOTH,
939		TTK_GROUP("Horizontal.Scale.trough", TTK_EXPAND\|TTK_FILL_BOTH,
	942	TTK_GROUP("Scale.focus", TTK_FILL_BOTH,
	943	TTK_GROUP("Horizontal.Scale.trough", TTK_FILL_BOTH,
940	944	TTK_NODE("Horizontal.Scale.track", TTK_FILL_X)
941	945	TTK_NODE("Horizontal.Scale.slider", TTK_PACK_LEFT) )))
942	946
943	947	TTK_LAYOUT("Vertical.TScale",
944		TTK_GROUP("Scale.focus", TTK_EXPAND\|TTK_FILL_BOTH,
945		TTK_GROUP("Vertical.Scale.trough", TTK_EXPAND\|TTK_FILL_BOTH,
	948	TTK_GROUP("Scale.focus", TTK_FILL_BOTH,
	949	TTK_GROUP("Vertical.Scale.trough", TTK_FILL_BOTH,
946	950	TTK_NODE("Vertical.Scale.track", TTK_FILL_Y)
947	951	TTK_NODE("Vertical.Scale.slider", TTK_PACK_TOP) )))
948	952

1028	1032	{ "Menubutton.dropdown", &GenericElementSpec, L"TOOLBAR",
1029	1033	TP_SPLITBUTTONDROPDOWN,toolbutton_statemap, NOPAD,0 },
1030	1034	{ "Treeview.field", &GenericElementSpec, L"TREEVIEW",
1031		TVP_TREEITEM, treeview_statemap, PAD(1, 1, 1, 1), 0 },
	1035	TVP_TREEITEM, treeview_statemap, PAD(1, 1, 1, 1), IGNORE_THEMESIZE },
1032	1036	{ "Treeitem.indicator", &TreeIndicatorElementSpec, L"TREEVIEW",
1033	1037	TVP_GLYPH, tvpglyph_statemap, PAD(1,1,6,0), PAD_MARGINS },
1034	1038	{ "Treeheading.border", &GenericElementSpec, L"HEADER",

1043	1047	{ "Spinbox.downarrow", &SpinboxArrowElementSpec, L"SPIN",
1044	1048	SPNP_DOWN, spinbutton_statemap, NOPAD,
1045	1049	PAD_MARGINS \| ((SM_CXVSCROLL << 8) \| SM_CYVSCROLL) },
1046
1047		#if BROKEN_TEXT_ELEMENT
	1050	#ifdef BROKEN_TEXT_ELEMENT
1048	1051	{ "Labelframe.text", &TextElementSpec, L"BUTTON",
1049	1052	BP_GROUPBOX, groupbox_statemap, NOPAD,0 },
1050	1053	#endif
1051
1052	1054	{ 0,0,0,0,0,NOPAD,0 }
1053	1055	};
1054	1056	#undef PAD

1057	1059	static int
1058	1060	GetSysFlagFromObj(Tcl_Interp interp, Tcl_Obj objPtr, int *resultPtr)
1059	1061	{
1060		static const char *names[] = {
	1062	static const char *const names[] = {
1061	1063	"SM_CXBORDER", "SM_CYBORDER", "SM_CXVSCROLL", "SM_CYVSCROLL",
1062	1064	"SM_CXHSCROLL", "SM_CYHSCROLL", "SM_CXMENUCHECK", "SM_CYMENUCHECK",
1063	1065	"SM_CXMENUSIZE", "SM_CYMENUSIZE", "SM_CXSIZE", "SM_CYSIZE", "SM_CXSMSIZE",

1111	1113	int objc,
1112	1114	Tcl_Obj *const objv[])
1113	1115	{
1114		XPThemeData *themeData = clientData;
	1116	XPThemeData themeData = (XPThemeData )clientData;
1115	1117	ElementInfo *elementPtr = NULL;
1116	1118	ClientData elementData;
1117	1119	LPCWSTR className;

1125	1127	Ttk_ElementSpec *elementSpec = &GenericElementSpec;
1126	1128	Tcl_DString classBuf;
1127	1129
1128		static const char *optionStrings[] =
	1130	static const char *const optionStrings[] =
1129	1131	{ "-padding","-width","-height","-margins", "-syssize",
1130	1132	"-halfheight", "-halfwidth", NULL };
1131	1133	enum { O_PADDING, O_WIDTH, O_HEIGHT, O_MARGINS, O_SYSSIZE,

1142	1144	return TCL_ERROR;
1143	1145	}
1144	1146	name = Tcl_GetStringFromObj(objv[0], &length);
1145		className = (LPCWSTR) Tcl_WinUtfToTChar(name, length, &classBuf);
	1147	Tcl_DStringInit(&classBuf);
	1148	className = Tcl_UtfToWCharDString(name, length, &classBuf);
1146	1149
1147	1150	/* flags or padding */
1148	1151	if (objc > 3) {

1217	1220	if (Tcl_ListObjGetElements(interp, objv[2], &count, &specs) != TCL_OK)
1218	1221	goto retErr;
1219	1222	/* we over-allocate to ensure there is a terminating entry */
1220		stateTable = ckalloc(sizeof(Ttk_StateTable) * (count + 1));
	1223	stateTable = (Ttk_StateTable )ckalloc(sizeof(Ttk_StateTable) (count + 1));
1221	1224	memset(stateTable, 0, sizeof(Ttk_StateTable) * (count + 1));
1222	1225	for (n = 0, j = 0; status == TCL_OK && n < count; n += 2, ++j) {
1223	1226	Ttk_StateSpec spec = {0,0};

1235	1238	return status;
1236	1239	}
1237	1240	} else {
1238		stateTable = ckalloc(sizeof(Ttk_StateTable));
	1241	stateTable = (Ttk_StateTable *)ckalloc(sizeof(Ttk_StateTable));
1239	1242	memset(stateTable, 0, sizeof(Ttk_StateTable));
1240	1243	}
1241	1244
1242		elementPtr = ckalloc(sizeof(ElementInfo));
	1245	elementPtr = (ElementInfo *)ckalloc(sizeof(ElementInfo));
1243	1246	elementPtr->elementSpec = elementSpec;
1244	1247	elementPtr->partId = partId;
1245	1248	elementPtr->statemap = stateTable;

1247	1250	elementPtr->flags = HEAP_ELEMENT \| flags;
1248	1251
1249	1252	/* set the element name to an allocated copy */
1250		name = ckalloc(strlen(elementName) + 1);
	1253	name = (char *)ckalloc(strlen(elementName) + 1);
1251	1254	strcpy(name, elementName);
1252	1255	elementPtr->elementName = name;
1253	1256
1254	1257	/* set the class name to an allocated copy */
1255		wname = ckalloc(Tcl_DStringLength(&classBuf) + sizeof(WCHAR));
	1258	wname = (LPWSTR)ckalloc(Tcl_DStringLength(&classBuf) + sizeof(WCHAR));
1256	1259	wcscpy(wname, className);
1257	1260	elementPtr->className = wname;
1258	1261

1280	1283	XPThemeProcs *procs;
1281	1284	HINSTANCE hlibrary;
1282	1285	Ttk_Theme themePtr, parentPtr, vistaPtr;
1283		ElementInfo *infoPtr;
1284		OSVERSIONINFOW os;
1285
1286		os.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW);
1287		GetVersionExW(&os);
	1286	const ElementInfo *infoPtr;
1288	1287
1289	1288	procs = LoadXPThemeProcs(&hlibrary);
1290	1289	if (!procs)

1304	1303	* Set theme data and cleanup proc
1305	1304	*/
1306	1305
1307		themeData = ckalloc(sizeof(XPThemeData));
	1306	themeData = (XPThemeData *)ckalloc(sizeof(XPThemeData));
1308	1307	themeData->procs = procs;
1309	1308	themeData->hlibrary = hlibrary;
1310	1309

1317	1316	* enable function. The theme itself is defined in script.
1318	1317	*/
1319	1318
1320		if (os.dwPlatformId == VER_PLATFORM_WIN32_NT && os.dwMajorVersion > 5) {
	1319	if (TkWinGetPlatformTheme() == TK_THEME_WIN_VISTA) {
1321	1320	vistaPtr = Ttk_CreateTheme(interp, "vista", themePtr);
1322	1321	if (vistaPtr) {
1323	1322	Ttk_SetThemeEnabledProc(vistaPtr, XPThemeEnabled, themeData);

+27

-4

win/winMain.c less more

24	24	#endif /* __GNUC__ */
25	25
26	26	#ifdef TK_TEST
	27	#ifdef __cplusplus
	28	extern "C" {
	29	#endif
27	30	extern Tcl_PackageInitProc Tktest_Init;
28	31	#endif /* TK_TEST */
	32
	33	#if !defined(TCL_USE_STATIC_PACKAGES)
	34	# if TCL_MAJOR_VERSION > 8 \|\| TCL_MINOR_VERSION > 6
	35	# define TCL_USE_STATIC_PACKAGES 1
	36	# else
	37	# define TCL_USE_STATIC_PACKAGES 0
	38	# endif
	39	#endif
29	40
30	41	#if defined(STATIC_BUILD) && TCL_USE_STATIC_PACKAGES
31	42	extern Tcl_PackageInitProc Registry_Init;

33	44	extern Tcl_PackageInitProc Dde_SafeInit;
34	45	#endif
35	46
	47	#ifdef __cplusplus
	48	}
	49	#endif
36	50	#ifdef TCL_BROKEN_MAINARGS
37	51	static void setargv(int argcPtr, TCHAR **argvPtr);
38	52	#endif

53	67	#define TK_LOCAL_APPINIT Tcl_AppInit
54	68	#endif
55	69	#ifndef MODULE_SCOPE
56		# define MODULE_SCOPE extern
	70	# ifdef __cplusplus
	71	# define MODULE_SCOPE extern "C"
	72	# else
	73	# define MODULE_SCOPE extern
	74	# endif
57	75	#endif
58	76	MODULE_SCOPE int TK_LOCAL_APPINIT(Tcl_Interp *interp);
59	77

105	123	TCHAR **argv;
106	124	int argc;
107	125	TCHAR *p;
	126	(void)hInstance;
	127	(void)hPrevInstance;
	128	(void)lpszCmdLine;
	129	(void)nCmdShow;
108	130
109	131	/*
110	132	* Create the console channels and install them as the standard channels.

195	217	if (Registry_Init(interp) == TCL_ERROR) {
196	218	return TCL_ERROR;
197	219	}
198		Tcl_StaticPackage(interp, "registry", Registry_Init, 0);
	220	Tcl_StaticPackage(interp, "Registry", Registry_Init, 0);
199	221
200	222	if (Dde_Init(interp) == TCL_ERROR) {
201	223	return TCL_ERROR;
202	224	}
203		Tcl_StaticPackage(interp, "dde", Dde_Init, Dde_SafeInit);
	225	Tcl_StaticPackage(interp, "Dde", Dde_Init, Dde_SafeInit);
204	226	#endif
205	227
206	228	#ifdef TK_TEST

264	286	char **dummy)
265	287	{
266	288	TCHAR **argv;
	289	(void)dummy;
267	290	#else
268	291	int
269	292	_tmain(

363	386	#undef Tcl_Alloc
364	387	#undef Tcl_DbCkalloc
365	388
366		argSpace = ckalloc(size * sizeof(char *)
	389	argSpace = (TCHAR )ckalloc(size sizeof(char *)
367	390	+ (_tcslen(cmdLine) * sizeof(TCHAR)) + sizeof(TCHAR));
368	391	argv = (TCHAR **) argSpace;
369	392	argSpace += size * (sizeof(char *)/sizeof(TCHAR));

+6

-9

xlib/X11/Xlib.h less more

330	330	unsigned long blue_mask;
331	331	XPointer obdata; /* hook for the object routines to hang on */
332	332	#if defined(MAC_OSX_TK)
333		int pixelpower; /* n such that pixels are 2^n x 2^n blocks*/
	333	int pixelpower; /* No longer used. */
334	334	#endif
335	335	struct funcs { /* image manipulation routines */
336	336	struct _XImage (create_image)();

540	540	Bool send_event; /* true if this came from a SendEvent request */
541	541	Display display; / Display the event was read from */
542	542	Window window; /* "event" window it is reported relative to */
543		Window root; /* root window that the event occured on */
	543	Window root; /* root window that the event occurred on */
544	544	Window subwindow; /* child window */
545	545	Time time; /* milliseconds */
546	546	int x, y; /* pointer x, y coordinates in event window */

548	548	unsigned int state; /* key or button mask */
549	549	unsigned int keycode; /* detail */
550	550	Bool same_screen; /* same screen flag */
551		char trans_chars[XMaxTransChars];
552		/* translated characters */
553		unsigned char nbytes;
554	551	} XKeyEvent;
555	552	typedef XKeyEvent XKeyPressedEvent;
556	553	typedef XKeyEvent XKeyReleasedEvent;

561	558	Bool send_event; /* true if this came from a SendEvent request */
562	559	Display display; / Display the event was read from */
563	560	Window window; /* "event" window it is reported relative to */
564		Window root; /* root window that the event occured on */
	561	Window root; /* root window that the event occurred on */
565	562	Window subwindow; /* child window */
566	563	Time time; /* milliseconds */
567	564	int x, y; /* pointer x, y coordinates in event window */

579	576	Bool send_event; /* true if this came from a SendEvent request */
580	577	Display display; / Display the event was read from */
581	578	Window window; /* "event" window reported relative to */
582		Window root; /* root window that the event occured on */
	579	Window root; /* root window that the event occurred on */
583	580	Window subwindow; /* child window */
584	581	Time time; /* milliseconds */
585	582	int x, y; /* pointer x, y coordinates in event window */

596	593	Bool send_event; /* true if this came from a SendEvent request */
597	594	Display display; / Display the event was read from */
598	595	Window window; /* "event" window reported relative to */
599		Window root; /* root window that the event occured on */
	596	Window root; /* root window that the event occurred on */
600	597	Window subwindow; /* child window */
601	598	Time time; /* milliseconds */
602	599	int x, y; /* pointer x, y coordinates in event window */

958	955	XMappingEvent xmapping;
959	956	XErrorEvent xerror;
960	957	XKeymapEvent xkeymap;
961		long pad[24];
	958	XID pad[24];
962	959	} XEvent;
963	960	#endif
964	961

+1

-1

xlib/X11/keysymdef.h less more

29	29	/*
30	30	* TTY Functions, cleverly chosen to map to ascii, for convenience of
31	31	* programming, but could have been arbitrary (at the cost of lookup
32		* tables in client code.
	32	* tables in client code).
33	33	*/
34	34
35	35	#define XK_BackSpace 0xFF08 /* back space, back char */

+1

-1

xlib/xcolors.c less more

346	346
347	347	/*
348	348	* If *p does not point to the end of the string, there were invalid
349		* digits in the spec. Ergo, it is not a vailid color string.
	349	* digits in the spec. Ergo, it is not a valid color string.
350	350	* (Bug f0188aca9e)
351	351	*/
352	352

+369

-96

xlib/xgc.c less more

12	12	*/
13	13
14	14	#include "tkInt.h"
15
16		#if !defined(MAC_OSX_TK)
17		# include <X11/Xlib.h>
18		# define gcCacheSize 0
19		# define TkpInitGCCache(gc)
20		# define TkpFreeGCCache(gc)
21		# define TkpGetGCCache(gc)
22		#else
23		# include <tkMacOSXInt.h>
24		# include <X11/Xlib.h>
25		# include <X11/X.h>
	15	#include <X11/Xlib.h>
	16	#if defined(MAC_OSX_TK)
26	17	# define Cursor XCursor
27	18	# define Region XRegion
28		# define gcCacheSize sizeof(TkpGCCache)
29	19	#endif
30	20
31	21	#undef TkSetRegion
32	22
	23	#define MAX_DASH_LIST_SIZE 10
	24	typedef struct {
	25	XGCValues gc;
	26	char dash[MAX_DASH_LIST_SIZE];
	27	} XGCValuesWithDash;
	28
33	29	/*
34	30	*----------------------------------------------------------------------
35	31	*

50	46	TkpClipMask clip_mask = (TkpClipMask) gc->clip_mask;
51	47
52	48	if (clip_mask == NULL) {
53		clip_mask = ckalloc(sizeof(TkpClipMask));
	49	clip_mask = (TkpClipMask *)ckalloc(sizeof(TkpClipMask));
54	50	gc->clip_mask = (Pixmap) clip_mask;
55		#ifdef MAC_OSX_TK
56		} else if (clip_mask->type == TKP_CLIP_REGION) {
57		TkpReleaseRegion(clip_mask->value.region);
58		#endif
59	51	}
60	52	return clip_mask;
61	53	}

78	70
79	71	static void FreeClipMask(GC gc) {
80	72	if (gc->clip_mask != None) {
81		#ifdef MAC_OSX_TK
82		if (((TkpClipMask*) gc->clip_mask)->type == TKP_CLIP_REGION) {
83		TkpReleaseRegion(((TkpClipMask*) gc->clip_mask)->value.region);
84		}
85		#endif
86		ckfree(gc->clip_mask);
	73	ckfree((char *)gc->clip_mask);
87	74	gc->clip_mask = None;
88	75	}
89	76	}

112	99	XGCValues *values)
113	100	{
114	101	GC gp;
	102	(void)d;
115	103
116	104	/*
117	105	* In order to have room for a dash list, MAX_DASH_LIST_SIZE extra chars

120	108	* initialization.
121	109	*/
122	110
123		#define MAX_DASH_LIST_SIZE 10
124
125		gp = ckalloc(sizeof(XGCValues) + MAX_DASH_LIST_SIZE + gcCacheSize);
	111	gp = (GC)ckalloc(sizeof(XGCValuesWithDash));
126	112	if (!gp) {
127	113	return NULL;
128	114	}

143	129	InitField(fill_style, GCFillStyle, FillSolid);
144	130	InitField(fill_rule, GCFillRule, WindingRule);
145	131	InitField(arc_mode, GCArcMode, ArcPieSlice);
146		InitField(tile, GCTile, None);
147		InitField(stipple, GCStipple, None);
	132	InitField(tile, GCTile, 0);
	133	InitField(stipple, GCStipple, 0);
148	134	InitField(ts_x_origin, GCTileStipXOrigin, 0);
149	135	InitField(ts_y_origin, GCTileStipYOrigin, 0);
150		InitField(font, GCFont, None);
	136	InitField(font, GCFont, 0);
151	137	InitField(subwindow_mode, GCSubwindowMode, ClipByChildren);
152	138	InitField(graphics_exposures, GCGraphicsExposures, True);
153	139	InitField(clip_x_origin, GCClipXOrigin, 0);

163	149	clip_mask->type = TKP_CLIP_PIXMAP;
164	150	clip_mask->value.pixmap = values->clip_mask;
165	151	}
166		TkpInitGCCache(gp);
167
168	152	return gp;
169	153	}
170
171		#ifdef MAC_OSX_TK
172		/*
173		*----------------------------------------------------------------------
174		*
175		* TkpGetGCCache --
176		*
177		* Results:
178		* Pointer to the TkpGCCache at the end of the GC.
179		*
180		* Side effects:
181		* None.
182		*
183		*----------------------------------------------------------------------
184		*/
185
186		TkpGCCache*
187		TkpGetGCCache(GC gc) {
188		return (gc ? (TkpGCCache)(((char) gc) + sizeof(XGCValues) +
189		MAX_DASH_LIST_SIZE) : NULL);
190		}
191		#endif
192	154
193	155	/*
194	156	*----------------------------------------------------------------------

267	229	Display *d,
268	230	GC gc)
269	231	{
	232	(void)d;
	233
270	234	if (gc != NULL) {
271	235	FreeClipMask(gc);
272		TkpFreeGCCache(gc);
273	236	ckfree(gc);
274	237	}
275	238	return Success;

298	261	GC gc,
299	262	unsigned long foreground)
300	263	{
	264	(void)display;
	265
301	266	gc->foreground = foreground;
302	267	return Success;
303	268	}

308	273	GC gc,
309	274	unsigned long background)
310	275	{
	276	(void)display;
	277
311	278	gc->background = background;
312	279	return Success;
313	280	}

321	288	int n)
322	289	{
323	290	char *p = &(gc->dashes);
	291	(void)display;
324	292
325	293	#ifdef TkWinDeleteBrush
326	294	TkWinDeleteBrush(gc->fgBrush);

343	311	GC gc,
344	312	int function)
345	313	{
	314	(void)display;
	315
346	316	gc->function = function;
347	317	return Success;
348	318	}

353	323	GC gc,
354	324	int fill_rule)
355	325	{
	326	(void)display;
	327
356	328	gc->fill_rule = fill_rule;
357	329	return Success;
358	330	}

363	335	GC gc,
364	336	int fill_style)
365	337	{
	338	(void)display;
	339
366	340	gc->fill_style = fill_style;
367	341	return Success;
368	342	}

373	347	GC gc,
374	348	int x, int y)
375	349	{
	350	(void)display;
	351
376	352	gc->ts_x_origin = x;
377	353	gc->ts_y_origin = y;
378	354	return Success;

384	360	GC gc,
385	361	Font font)
386	362	{
	363	(void)display;
	364
387	365	gc->font = font;
388	366	return Success;
389	367	}

394	372	GC gc,
395	373	int arc_mode)
396	374	{
	375	(void)display;
	376
397	377	gc->arc_mode = arc_mode;
398	378	return Success;
399	379	}

404	384	GC gc,
405	385	Pixmap stipple)
406	386	{
	387	(void)display;
	388
407	389	gc->stipple = stipple;
408	390	return Success;
409	391	}

417	399	int cap_style,
418	400	int join_style)
419	401	{
	402	(void)display;
	403
420	404	gc->line_width = line_width;
421	405	gc->line_style = line_style;
422	406	gc->cap_style = cap_style;

431	415	int clip_x_origin,
432	416	int clip_y_origin)
433	417	{
	418	(void)display;
	419
434	420	gc->clip_x_origin = clip_x_origin;
435	421	gc->clip_y_origin = clip_y_origin;
436	422	return Success;

463	449	GC gc,
464	450	TkRegion r)
465	451	{
	452	(void)display;
	453
466	454	if (r == NULL) {
467	455	Tcl_Panic("must not pass NULL to TkSetRegion for compatibility with X11; use XSetClipMask instead");
468	456	} else {

470	458
471	459	clip_mask->type = TKP_CLIP_REGION;
472	460	clip_mask->value.region = r;
473		#ifdef MAC_OSX_TK
474		TkpRetainRegion(r);
475		#endif
476	461	}
477	462	return Success;
478	463	}

483	468	GC gc,
484	469	Pixmap pixmap)
485	470	{
	471	(void)display;
	472
486	473	if (pixmap == None) {
487	474	FreeClipMask(gc);
488	475	} else {

541	528	int mode)
542	529	{
543	530	int res = Success;
	531	(void)mode;
544	532
545	533	while (npoints-- > 0) {
546	534	res = XDrawLine(display, d, gc,

560	548	XSegment *segments,
561	549	int nsegments)
562	550	{
	551	(void)display;
	552	(void)d;
	553	(void)gc;
	554	(void)segments;
	555	(void)nsegments;
	556
563	557	return BadDrawable;
564	558	}
565	559	#endif

571	565	int *nbytes_return,
572	566	int buffer)
573	567	{
	568	(void)display;
	569	(void)nbytes_return;
	570	(void)buffer;
	571
574	572	return (char *) 0;
575	573	}
576	574

580	578	Window w,
581	579	char **window_name_return)
582	580	{
583		return (Status) 0;
	581	(void)display;
	582	(void)w;
	583	(void)window_name_return;
	584
	585	return Success;
584	586	}
585	587
586	588	Atom *

589	591	Window w,
590	592	int *num_prop_return)
591	593	{
	594	(void)display;
	595	(void)w;
	596	(void)num_prop_return;
	597
592	598	return (Atom *) 0;
593	599	}
594	600
595		void
	601	int
596	602	XMapRaised(
597	603	Display *display,
598	604	Window w)
599	605	{
600		}
601
602		void
603		XPutImage(
604		Display *display,
605		Drawable d,
606		GC gc,
607		XImage *image,
608		int src_x,
609		int src_y,
610		int dest_x,
611		int dest_y,
612		unsigned int width,
613		unsigned int height)
614		{
615		}
616
617		void
	606	(void)display;
	607	(void)w;
	608
	609	return Success;
	610	}
	611
	612	int
618	613	XQueryTextExtents(
619	614	Display *display,
620	615	XID font_ID,

625	620	int *font_descent_return,
626	621	XCharStruct *overall_return)
627	622	{
628		}
629
630		void
	623	(void)display;
	624	(void)font_ID;
	625	(void)string;
	626	(void)nchars;
	627	(void)direction_return;
	628	(void)font_ascent_return;
	629	(void)font_descent_return;
	630	(void)overall_return;
	631
	632	return Success;
	633	}
	634
	635	int
631	636	XReparentWindow(
632	637	Display *display,
633	638	Window w,

635	640	int x,
636	641	int y)
637	642	{
	643	(void)display;
	644	(void)w;
	645	(void)parent;
	646	(void)x;
	647	(void)y;
	648
	649	return BadWindow;
	650	}
	651
	652	int
	653	XUndefineCursor(
	654	Display *display,
	655	Window w)
	656	{
	657	(void)display;
	658	(void)w;
	659
	660	return Success;
	661	}
	662
	663	XVaNestedList
	664	XVaCreateNestedList(
	665	int unused, ...)
	666	{
	667	(void)unused;
	668	return NULL;
	669	}
	670
	671	char *
	672	XSetICValues(
	673	XIC xic, ...)
	674	{
	675	(void)xic;
	676	return NULL;
	677	}
	678
	679	char *
	680	XGetICValues(
	681	XIC xic, ...)
	682	{
	683	(void)xic;
	684	return NULL;
638	685	}
639	686
640	687	void
641		XRotateBuffers(
642		Display *display,
643		int rotate)
644		{
645		}
646
	688	XSetICFocus(
	689	XIC xic)
	690	{
	691	(void)xic;
	692	}
	693
	694	Window
	695	XCreateWindow(
	696	Display *display,
	697	Window parent,
	698	int x,
	699	int y,
	700	unsigned int width,
	701	unsigned int height,
	702	unsigned int border_width,
	703	int depth,
	704	unsigned int clazz,
	705	Visual *visual,
	706	unsigned long value_mask,
	707	XSetWindowAttributes *attributes)
	708	{
	709	(void)display;
	710	(void)parent;
	711	(void)x;
	712	(void)y;
	713	(void)width;
	714	(void)height;
	715	(void)border_width;
	716	(void)depth;
	717	(void)clazz;
	718	(void)visual;
	719	(void)value_mask;
	720	(void)attributes;
	721
	722	return 0;
	723	}
	724
	725	int
	726	XPointInRegion(
	727	Region rgn,
	728	int x,
	729	int y)
	730	{
	731	(void)rgn;
	732	(void)x;
	733	(void)y;
	734
	735	return 0;
	736	}
	737
	738	int
	739	XUnionRegion(
	740	Region srca,
	741	Region srcb,
	742	Region dr_return)
	743	{
	744	(void)srca;
	745	(void)srcb;
	746	(void)dr_return;
	747
	748	return 0;
	749	}
	750
	751	Region
	752	XPolygonRegion(
	753	XPoint *pts,
	754	int n,
	755	int rule)
	756	{
	757	(void)pts;
	758	(void)n;
	759	(void)rule;
	760
	761	return 0;
	762	}
	763	#endif
	764
647	765	void
648		XStoreBuffer(
649		Display *display,
650		_Xconst char *bytes,
651		int nbytes,
652		int buffer)
653		{
	766	XDestroyIC(
	767	XIC ic)
	768	{
	769	(void)ic;
	770	}
	771
	772	Cursor
	773	XCreatePixmapCursor(
	774	Display *display,
	775	Pixmap source,
	776	Pixmap mask,
	777	XColor *foreground_color,
	778	XColor *background_color,
	779	unsigned int x,
	780	unsigned int y)
	781	{
	782	(void)display;
	783	(void)source;
	784	(void)mask;
	785	(void)foreground_color;
	786	(void)background_color;
	787	(void)x;
	788	(void)y;
	789
	790	return (Cursor) NULL;
	791	}
	792
	793	Cursor
	794	XCreateGlyphCursor(
	795	Display *display,
	796	Font source_font,
	797	Font mask_font,
	798	unsigned int source_char,
	799	unsigned int mask_char,
	800	XColor _Xconst *foreground_color,
	801	XColor _Xconst *background_color)
	802	{
	803	(void)display;
	804	(void)source_font;
	805	(void)mask_font;
	806	(void)source_char;
	807	(void)mask_char;
	808	(void)foreground_color;
	809	(void)background_color;
	810
	811	return (Cursor) NULL;
	812	}
	813
	814	#if 0
	815	XFontSet
	816	XCreateFontSet(
	817	Display display / display */,
	818	_Xconst char base_font_name_list / base_font_name_list */,
	819	char **missing_charset_list / missing_charset_list */,
	820	int missing_charset_count / missing_charset_count */,
	821	char *def_string / def_string */
	822	) {
	823	(void)display;
	824	(void)base_font_name_list;
	825	(void)missing_charset_list;
	826	(void)missing_charset_count;
	827	(void)def_string;
	828
	829	return (XFontSet)0;
654	830	}
655	831
656	832	void
657		XUndefineCursor(
658		Display *display,
659		Window w)
660		{
	833	XFreeFontSet(
	834	Display display, / display */
	835	XFontSet fontset /* font_set */
	836	) {
	837	(void)display;
	838	(void)fontset;
	839	}
	840
	841	void
	842	XFreeStringList(
	843	char *list / list */
	844	) {
	845	(void)list;
	846	}
	847
	848	Status
	849	XCloseIM(
	850	XIM im /* im */
	851	) {
	852	(void)im;
	853
	854	return Success;
	855	}
	856
	857	Bool
	858	XRegisterIMInstantiateCallback(
	859	Display dpy / dpy */,
	860	struct _XrmHashBucketRec rdb / rdb */,
	861	char res_name / res_name */,
	862	char res_class / res_class */,
	863	XIDProc callback /* callback */,
	864	XPointer client_data /* client_data */
	865	) {
	866	(void)dpy;
	867	(void)rdb;
	868	(void)res_name;
	869	(void)res_class;
	870	(void)callback;
	871	(void)client_data;
	872
	873	return False;
	874	}
	875
	876	Bool
	877	XUnregisterIMInstantiateCallback(
	878	Display dpy / dpy */,
	879	struct _XrmHashBucketRec rdb / rdb */,
	880	char res_name / res_name */,
	881	char res_class / res_class */,
	882	XIDProc callback /* callback */,
	883	XPointer client_data /* client_data */
	884	) {
	885	(void)dpy;
	886	(void)rdb;
	887	(void)res_name;
	888	(void)res_class;
	889	(void)callback;
	890	(void)client_data;
	891
	892	return False;
	893	}
	894
	895	char *
	896	XSetLocaleModifiers(
	897	const char modifier_list / modifier_list */
	898	) {
	899	(void)modifier_list;
	900
	901	return NULL;
	902	}
	903
	904	XIM XOpenIM(
	905	Display dpy / dpy */,
	906	struct _XrmHashBucketRec rdb / rdb */,
	907	char res_name / res_name */,
	908	char res_class / res_class */
	909	) {
	910	(void)dpy;
	911	(void)rdb;
	912	(void)res_name;
	913	(void)res_class;
	914
	915	return NULL;
	916	}
	917
	918	char *
	919	XGetIMValues(
	920	XIM im /* im */, ...
	921	) {
	922	(void)im;
	923
	924	return NULL;
	925	}
	926
	927	char *
	928	XSetIMValues(
	929	XIM im /* im */, ...
	930	) {
	931	(void)im;
	932
	933	return NULL;
661	934	}
662	935	#endif
663	936