merge trunk

tcltk · Jan 20, 2025 · f1dceae · f1dceae
2 parents a98264a + 5bde407
commit f1dceae
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 23 deletions.
diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
@@ -36,7 +36,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           path: tk
-      - name: Checkout Tcl 8.6
+      - name: Checkout Tcl 9.0
         uses: actions/checkout@v4
         with:
           repository: tcltk/tcl
@@ -140,7 +140,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           path: tk
-      - name: Checkout Tcl
+      - name: Checkout Tcl 9.0
         uses: actions/checkout@v4
         with:
           repository: tcltk/tcl

diff --git a/.github/workflows/linux-with-tcl8-build.yml b/.github/workflows/linux-with-tcl8-build.yml
@@ -35,7 +35,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           path: tk
-      - name: Checkout Tcl
+      - name: Checkout Tcl 8.7
         uses: actions/checkout@v4
         with:
           repository: tcltk/tcl
@@ -120,7 +120,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           path: tk
-      - name: Checkout Tcl
+      - name: Checkout Tcl 8.7
         uses: actions/checkout@v4
         with:
           repository: tcltk/tcl

diff --git a/.github/workflows/linux-with-tcl91-build.yml b/.github/workflows/linux-with-tcl91-build.yml
@@ -36,7 +36,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           path: tk
-      - name: Checkout Tcl
+      - name: Checkout Tcl 9.1
         uses: actions/checkout@v4
         with:
           repository: tcltk/tcl
@@ -121,7 +121,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           path: tk
-      - name: Checkout Tcl
+      - name: Checkout Tcl 9.1
         uses: actions/checkout@v4
         with:
           repository: tcltk/tcl

diff --git a/doc/wish.1 b/doc/wish.1
@@ -12,7 +12,7 @@
 .SH NAME
 wish \- Simple windowing shell
 .SH SYNOPSIS
-\fBwish\fR ?\fB\-encoding \fIname\fR? ?\fIfileName arg ...\fR?
+\fBwish\fR ?\fBoptions\fR? ?\fIfileName arg ...\fR?
 .SH OPTIONS
 .\" OPTION: -encoding
 .IP "\fB\-encoding \fIname\fR" 20

diff --git a/generic/tkWindow.c b/generic/tkWindow.c
@@ -1024,6 +1024,9 @@ TkCreateMainWindow(
 #ifndef TCL_CFG_OPTIMIZED
 		".no-optimize"
 #endif
+#if !defined(_WIN32) && !defined(MAC_OSX_TK) && !defined(HAVE_XFT)
+		".no-xft"
+#endif
 #ifdef __OBJC__
 		".objective-c"
 #if defined(__cplusplus)
@@ -1045,9 +1048,6 @@ TkCreateMainWindow(
 #endif
 #if !defined(_WIN32) && !defined(MAC_OSX_TK)
 		".x11"
-#if !defined(HAVE_XFT)
-		".no-xft"
-#endif
 #endif
 		;
 #if TCL_MAJOR_VERSION > 8

diff --git a/generic/ttk/ttkElements.c b/generic/ttk/ttkElements.c
@@ -1445,12 +1445,14 @@ static void SliderElementDraw(
 	    case TTK_ORIENT_HORIZONTAL:
 		XFillRectangle(disp, d, gc,
 			mainInfoPtr->troughInnerX, mainInfoPtr->troughInnerY,
-			b.x + dim/2 - 1, mainInfoPtr->troughInnerHeight);
+			b.x + dim/2 - mainInfoPtr->troughInnerX,
+			mainInfoPtr->troughInnerHeight);
 		break;
 	    case TTK_ORIENT_VERTICAL:
 		XFillRectangle(disp, d, gc,
 			mainInfoPtr->troughInnerX, mainInfoPtr->troughInnerY,
-			mainInfoPtr->troughInnerWidth, b.y + dim/2 - 1);
+			mainInfoPtr->troughInnerWidth,
+			b.y + dim/2 - mainInfoPtr->troughInnerY);
 		break;
 	}
     }

diff --git a/tests/constraints.tcl b/tests/constraints.tcl
@@ -246,21 +246,21 @@ namespace eval tk {
 	# got moved to the requested location should use a y coordinate larger than the
 	# height of the menubar (normally 23 pixels) and an x coordinate larger than the
 	# width of the dock, if it happens to be on the left.
-	# menubarheight deals with this issue but may not be available from the test
+	# testmenubarheight deals with this issue but may not be available from the test
 	# environment, therefore provide a fallback here
-	if {[llength [info procs menubarheight]] == 0} {
+	if {[llength [info procs testmenubarheight]] == 0} {
 	    if {[tk windowingsystem] ne "aqua"} {
 		# Windows may overlap the menubar
-		proc menubarheight {} {
+		proc testmenubarheight {} {
 		    return 0
 		}
 	    } else {
 		# Windows may not overlap the menubar
-		proc menubarheight {} {
+		proc testmenubarheight {} {
 		    return 30 ;  # arbitrary value known to be larger than the menubar height
 		}
 	    }
-	    namespace export menubarheight
+	    namespace export testmenubarheight
 	}
     }
 }

diff --git a/tests/font.test b/tests/font.test
@@ -938,9 +938,9 @@ test font-21.6 {Tk_PostscriptFontName procedure: spaces} -constraints {
 } -body {
     set name {{new century schoolbook} 10}
     if {[font actual {{new century schoolbook} 10} -family] == "new century schoolbook"} {
-        set x [psfontname "{new century schoolbook} 10"]
+	set x [psfontname "{new century schoolbook} 10"]
     } else {
-        set x NewCenturySchlbk-Roman
+	set x NewCenturySchlbk-Roman
     }
 } -result {NewCenturySchlbk-Roman}
 test font-21.7 {Tk_PostscriptFontName procedure: exhaustive} -constraints {

diff --git a/tests/unixFont.test b/tests/unixFont.test
@@ -18,9 +18,9 @@ tcltest::loadTestedCommands
 
 if {[tk windowingsystem] eq "x11"} {
     if {[testConstraint withXft]} {
-        set fontsystemcmd [auto_execok fc-list]
+	set fontsystemcmd [auto_execok fc-list]
     } else {
-        set fontsystemcmd [auto_execok xlsfonts]
+	set fontsystemcmd [auto_execok xlsfonts]
     }
 }
 foreach {constraint font} {

diff --git a/unix/Makefile.in b/unix/Makefile.in
@@ -776,8 +776,8 @@ INSTALL_DOC_TARGETS = install-doc
 INSTALL_DEV_TARGETS = install-headers
 INSTALL_DEMO_TARGETS = install-demos
 INSTALL_EXTRA_TARGETS = @EXTRA_INSTALL@
-INSTALL_TARGETS = $(INSTALL_BASE_TARGETS) $(INSTALL_DOC_TARGETS) $(INSTALL_DEV_TARGETS) \
-		$(INSTALL_DEMO_TARGETS) $(INSTALL_EXTRA_TARGETS)
+INSTALL_TARGETS = $(INSTALL_BASE_TARGETS) $(INSTALL_DEV_TARGETS) \
+		$(INSTALL_DEMO_TARGETS) $(INSTALL_DOC_TARGETS) $(INSTALL_EXTRA_TARGETS)
 
 install: $(INSTALL_TARGETS)