Merge trunk

Author: jan.nijtmans

doc/listbox.n

@@ -14,13 +14,13 @@ listbox \- Create and manipulate 'listbox' item list widgets
 .SH SYNOPSIS
 \fBlistbox\fI pathName \fR?\fIoptions\fR?
 .SO
-\-background	\-borderwidth	\-cursor
-\-disabledforeground	\-exportselection	\-font
-\-foreground	\-highlightbackground	\-highlightcolor
-\-highlightthickness	\-justify	\-relief
-\-selectbackground	\-selectborderwidth	\-selectforeground
-\-setgrid	\-takefocus	\-xscrollcommand
-\-yscrollcommand
+\-background	\-highlightbackground	\-selectforeground
+\-borderwidth	\-highlightcolor	\-setgrid
+\-cursor	\-highlightthickness	\-takefocus
+\-disabledforeground	\-justify	\-xscrollcommand
+\-exportselection	\-relief	\-yscrollcommand
+\-font	\-selectbackground
+\-foreground	\-selectborderwidth
 .SE
 .SH "WIDGET-SPECIFIC OPTIONS"
 .OP \-activestyle activeStyle ActiveStyle
@@ -33,6 +33,23 @@ The default is \fBunderline\fR on Windows, and \fBdotbox\fR elsewhere.
 Specifies the desired height for the window, in lines.
 If zero or less, then the desired height for the window is made just
 large enough to hold all the elements in the listbox.
+.OP \-inactiveselectbackground inactiveSelectBackground Foreground
+Specifies the background color to use for the selection when the window does
+not have the input focus.  The option's value may be an empty string or have
+any of the forms accepted by \fBTk_GetColor\fR.  If empty then the value of the
+\fB-selectbackground\fR widget or item configuration option is used when the
+window does not have the focus.  The default value depends on the windowing
+system: it is non-empty on \fBaqua\fR and \fBwin32\fR, and an empty string on
+\fBx11\fR.
+.OP \-inactiveselectforeground inactiveSelectForeground Background
+Specifies the foreground color to use for the selection when the window does
+not have the input focus.  The option's value may be an empty string or have
+any of the forms accepted by \fBTk_GetColor\fR.  This option is only relevant
+if the value of the \fB-inactiveselectbackground\fR option is non-empty, in
+which case, if the value of this option is an empty string then the value of
+the \fB-selectforeground\fR widget configuration option is used when the window
+does not have the focus.  The default value depends on the windowing system: it
+is non-empty on \fBaqua\fR and \fBwin32\fR, and an empty string on \fBx11\fR.
 .OP \-listvariable listVariable Variable
 Specifies the name of a global variable.  The value of the variable is a list to
 be displayed inside the widget; if the variable value changes then the

generic/tk.h

@@ -93,6 +93,7 @@ extern "C" {
 #if defined(__GNUC__) && !defined(__cplusplus)
 #   pragma GCC diagnostic ignored "-Wc++-compat"
 #endif
+#   define NeedWidePrototypes 1
 #   include <X11/Xlib.h>
 #   ifdef MAC_OSX_TK
 #	include <X11/X.h>

generic/tkCmds.c

@@ -1407,6 +1407,8 @@ WindowingsystemCmd(
     windowingsystem = "win32";
 #elif defined(MAC_OSX_TK)
     windowingsystem = "aqua";
+#elif defined(TK_USE_WAYLAND)
+    windowingsystem = "wayland";
 #else
     windowingsystem = "x11";
 #endif

generic/tkEntry.c

@@ -1991,7 +1991,7 @@ EntryComputeGeometry(
     if (entryPtr->showCharObj != NULL) {
 	int ch;
 	char buf[6];
-	int size;
+	Tcl_Size size;
 
 	/*
 	 * Normalize the special character so we can safely duplicate it in
@@ -2021,7 +2021,7 @@ EntryComputeGeometry(
 
     Tk_FreeTextLayout(entryPtr->placeholderLayout);
     if (entryPtr->placeholderObj) {
-	entryPtr->placeholderChars = strlen(Tcl_GetString(entryPtr->placeholderObj));
+	entryPtr->placeholderChars = Tcl_GetCharLength(entryPtr->placeholderObj);
 	entryPtr->placeholderLayout = Tk_ComputeTextLayout(entryPtr->tkfont,
 		Tcl_GetString(entryPtr->placeholderObj), entryPtr->placeholderChars, 0,
 		entryPtr->justify, TK_IGNORE_NEWLINES, &totalLength, NULL);

generic/tkListbox.c

@@ -77,8 +77,14 @@ typedef struct {
     GC textGC;			/* For drawing normal text. */
     Tk_3DBorder selBorder;	/* Borders and backgrounds for selected
 				 * elements. */
+    Tk_3DBorder inactiveSelBorder;
+				/* Borders and backgrounds for selected
+				 * elements when they don't have the focus. */
     Tcl_Obj *selBorderWidthObj;	/* Width of border around selection. */
     XColor *selFgColorPtr;	/* Foreground color for selected elements. */
+    XColor *inactiveSelFgColorPtr;
+				/* Foreground color for selected elements when
+				 * they don't have the focus. */
     GC selTextGC;		/* For drawing selected text. */
     int width;			/* Desired width of window, in characters. */
     int height;			/* Desired height of window, in lines. */
@@ -269,8 +275,17 @@ static const Tk_OptionSpec optionSpecs[] = {
     {TK_OPTION_PIXELS, "-highlightthickness", "highlightThickness",
 	 "HighlightThickness", DEF_LISTBOX_HIGHLIGHT_WIDTH,
 	 offsetof(Listbox, highlightWidthObj), TCL_INDEX_NONE, 0, 0, 0},
+    {TK_OPTION_BORDER, "-inactiveselectbackground", "inactiveSelectBackground",
+	"Foreground", DEF_LISTBOX_INACTIVE_SELECT_COLOR,
+	TCL_INDEX_NONE, offsetof(Listbox, inactiveSelBorder),
+	TK_OPTION_NULL_OK, DEF_LISTBOX_SELECT_MONO, 0},
+    {TK_OPTION_COLOR, "-inactiveselectforeground", "inactiveSelectForeground",
+	"Background", DEF_LISTBOX_INACTIVE_SELECT_FG_COLOR,
+	TCL_INDEX_NONE, offsetof(Listbox, inactiveSelFgColorPtr),
+	TK_OPTION_NULL_OK, DEF_LISTBOX_SELECT_FG_MONO, 0},
     {TK_OPTION_JUSTIFY, "-justify", "justify", "Justify",
-	DEF_LISTBOX_JUSTIFY, TCL_INDEX_NONE, offsetof(Listbox, justify), TK_OPTION_ENUM_VAR, 0, 0},
+	DEF_LISTBOX_JUSTIFY, TCL_INDEX_NONE, offsetof(Listbox, justify),
+	TK_OPTION_ENUM_VAR, 0, 0},
     {TK_OPTION_RELIEF, "-relief", "relief", "Relief",
 	 DEF_LISTBOX_RELIEF, TCL_INDEX_NONE, offsetof(Listbox, relief), 0, 0, 0},
     {TK_OPTION_BORDER, "-selectbackground", "selectBackground", "Foreground",
@@ -516,29 +531,31 @@ Tk_ListboxObjCmd(
     listPtr			 = (Listbox *)Tcl_Alloc(sizeof(Listbox));
     memset(listPtr, 0, sizeof(Listbox));
 
-    listPtr->tkwin		 = tkwin;
-    listPtr->display		 = Tk_Display(tkwin);
-    listPtr->interp		 = interp;
-    listPtr->widgetCmd		 = Tcl_CreateObjCommand2(interp,
+    listPtr->tkwin		   = tkwin;
+    listPtr->display		   = Tk_Display(tkwin);
+    listPtr->interp		   = interp;
+    listPtr->widgetCmd		   = Tcl_CreateObjCommand2(interp,
 	    Tk_PathName(listPtr->tkwin), ListboxWidgetObjCmd, listPtr,
 	    ListboxCmdDeletedProc);
-    listPtr->optionTable	 = optionTables->listboxOptionTable;
-    listPtr->itemAttrOptionTable = optionTables->itemAttrOptionTable;
-    listPtr->selection		 = (Tcl_HashTable *)Tcl_Alloc(sizeof(Tcl_HashTable));
+    listPtr->optionTable	   = optionTables->listboxOptionTable;
+    listPtr->itemAttrOptionTable   = optionTables->itemAttrOptionTable;
+    listPtr->selection		   = (Tcl_HashTable *)Tcl_Alloc(sizeof(Tcl_HashTable));
     Tcl_InitHashTable(listPtr->selection, TCL_ONE_WORD_KEYS);
-    listPtr->itemAttrTable	 = (Tcl_HashTable *)Tcl_Alloc(sizeof(Tcl_HashTable));
+    listPtr->itemAttrTable	   = (Tcl_HashTable *)Tcl_Alloc(sizeof(Tcl_HashTable));
     Tcl_InitHashTable(listPtr->itemAttrTable, TCL_ONE_WORD_KEYS);
-    listPtr->relief		 = TK_RELIEF_RAISED;
-    listPtr->textGC		 = NULL;
-    listPtr->selFgColorPtr	 = NULL;
-    listPtr->selTextGC		 = NULL;
-    listPtr->fullLines		 = 1;
-    listPtr->xScrollUnit	 = 1;
-    listPtr->exportSelection	 = 1;
-    listPtr->cursor		 = NULL;
-    listPtr->state		 = STATE_NORMAL;
-    listPtr->gray		 = None;
-    listPtr->justify             = TK_JUSTIFY_LEFT;
+    listPtr->relief		   = TK_RELIEF_RAISED;
+    listPtr->textGC		   = NULL;
+    listPtr->inactiveSelBorder	   = NULL;
+    listPtr->selFgColorPtr	   = NULL;
+    listPtr->inactiveSelFgColorPtr = NULL;
+    listPtr->selTextGC		   = NULL;
+    listPtr->fullLines		   = 1;
+    listPtr->xScrollUnit	   = 1;
+    listPtr->exportSelection	   = 1;
+    listPtr->cursor		   = NULL;
+    listPtr->state		   = STATE_NORMAL;
+    listPtr->gray		   = None;
+    listPtr->justify               = TK_JUSTIFY_LEFT;
 
     /*
      * Keep a hold of the associated tkwin until we destroy the listbox,
@@ -1934,8 +1951,8 @@ DisplayListbox(
 
 	/*
 	 * If the listbox is enabled, items may be drawn differently; they may
-	 * be drawn selected, or they may have special foreground or
-	 * background colors.
+	 * be drawn selected, or they may have special foreground or background
+	 * colors.
 	 */
 
 	if (listPtr->state & STATE_NORMAL) {
@@ -1944,37 +1961,42 @@ DisplayListbox(
 		 * Selected items are drawn differently.
 		 */
 
-		gc = listPtr->selTextGC;
 		width = Tk_Width(tkwin) - 2 * listPtr->inset;
 		selectedBg = listPtr->selBorder;
+		gc = listPtr->selTextGC;
 
 		/*
-		 * If there is attribute information for this item, adjust the
-		 * drawing accordingly.
+		 * If the widget doesn't have the focus and the value of the
+		 * -inactiveselectbackground option is not empty then use this
+		 * value.  Otherwise, if there is attribute information for
+		 * this item, then adjust the drawing accordingly.
 		 */
 
-		if (entry != NULL) {
-		    attrs = (ItemAttr *)Tcl_GetHashValue(entry);
+		if (!(listPtr->flags & GOT_FOCUS) &&
+			listPtr->inactiveSelBorder) {
+		    selectedBg = listPtr->inactiveSelBorder;
 
-		    /*
-		     * Default GC has the values from the widget at large.
-		     */
-
-		    if (listPtr->selFgColorPtr) {
-			gcValues.foreground = listPtr->selFgColorPtr->pixel;
-		    } else {
-			gcValues.foreground = listPtr->fgColorPtr->pixel;
+		    if (listPtr->inactiveSelFgColorPtr) {
+			gcValues.foreground =
+				listPtr->inactiveSelFgColorPtr->pixel;
+			gcValues.font = Tk_FontId(listPtr->tkfont);
+			gcValues.graphics_exposures = False;
+			mask = GCForeground | GCFont | GCGraphicsExposures;
+			gc = Tk_GetGC(listPtr->tkwin, mask, &gcValues);
+			freeGC = 1;
 		    }
-		    gcValues.font = Tk_FontId(listPtr->tkfont);
-		    gcValues.graphics_exposures = False;
-		    mask = GCForeground | GCFont | GCGraphicsExposures;
+		} else if (entry != NULL) {
+		    attrs = (ItemAttr *)Tcl_GetHashValue(entry);
 
 		    if (attrs->selBorder != NULL) {
 			selectedBg = attrs->selBorder;
 		    }
 
 		    if (attrs->selFgColor != NULL) {
 			gcValues.foreground = attrs->selFgColor->pixel;
+			gcValues.font = Tk_FontId(listPtr->tkfont);
+			gcValues.graphics_exposures = False;
+			mask = GCForeground | GCFont | GCGraphicsExposures;
 			gc = Tk_GetGC(listPtr->tkwin, mask, &gcValues);
 			freeGC = 1;
 		    }
@@ -2036,10 +2058,6 @@ DisplayListbox(
 
 		if (entry != NULL) {
 		    attrs = (ItemAttr *)Tcl_GetHashValue(entry);
-		    gcValues.foreground = listPtr->fgColorPtr->pixel;
-		    gcValues.font = Tk_FontId(listPtr->tkfont);
-		    gcValues.graphics_exposures = False;
-		    mask = GCForeground | GCFont | GCGraphicsExposures;
 
 		    /*
 		     * If the item has its own background color, draw it now.
@@ -2059,6 +2077,9 @@ DisplayListbox(
 		    if ((listPtr->state & STATE_NORMAL)
 			    && attrs->fgColor != NULL) {
 			gcValues.foreground = attrs->fgColor->pixel;
+			gcValues.font = Tk_FontId(listPtr->tkfont);
+			gcValues.graphics_exposures = False;
+			mask = GCForeground | GCFont | GCGraphicsExposures;
 			gc = Tk_GetGC(listPtr->tkwin, mask, &gcValues);
 			freeGC = 1;
 		    }
@@ -2138,7 +2159,7 @@ DisplayListbox(
      */
 
     Tk_GetPixelsFromObj(NULL, listPtr->tkwin, listPtr->borderWidthObj, &borderWidth);
-	Tk_GetPixelsFromObj(NULL, listPtr->tkwin, listPtr->highlightWidthObj, &highlightWidth);
+    Tk_GetPixelsFromObj(NULL, listPtr->tkwin, listPtr->highlightWidthObj, &highlightWidth);
     Tk_Draw3DRectangle(tkwin, pixmap, listPtr->normalBorder,
 	    highlightWidth, highlightWidth,
 	    Tk_Width(tkwin) - 2 * highlightWidth,

generic/ttk/ttkEntry.c

@@ -319,8 +319,6 @@ static char *EntryDisplayString(const char *showChar, int numChars)
  */
 static void EntryUpdateTextLayout(Entry *entryPtr)
 {
-    Tcl_Size length;
-    char *text;
     Tk_FreeTextLayout(entryPtr->entry.textLayout);
     if ((entryPtr->entry.numChars != 0) || (entryPtr->entry.placeholderObj == NULL)) {
 	entryPtr->entry.textLayout = Tk_ComputeTextLayout(
@@ -329,10 +327,10 @@ static void EntryUpdateTextLayout(Entry *entryPtr)
 	    0/*wraplength*/, entryPtr->entry.justify, TK_IGNORE_NEWLINES,
 	    &entryPtr->entry.layoutWidth, &entryPtr->entry.layoutHeight);
     } else {
-	text = Tcl_GetStringFromObj(entryPtr->entry.placeholderObj, &length);
+	Tcl_Size length = Tcl_GetCharLength(entryPtr->entry.placeholderObj);
 	entryPtr->entry.textLayout = Tk_ComputeTextLayout(
 	    Tk_GetFontFromObj(entryPtr->core.tkwin, entryPtr->entry.fontObj),
-	    text, length,
+	    Tcl_GetString(entryPtr->entry.placeholderObj), length,
 	    0/*wraplength*/, entryPtr->entry.justify, TK_IGNORE_NEWLINES,
 	    &entryPtr->entry.layoutWidth, &entryPtr->entry.layoutHeight);
     }
@@ -1339,7 +1337,7 @@ static void EntryDisplay(void *clientData, Drawable d)
 	}
 	/* Use placeholder text width */
 	leftIndex = 0;
-	(void)Tcl_GetStringFromObj(entryPtr->entry.placeholderObj, &rightIndex);
+	rightIndex = Tcl_GetCharLength(entryPtr->entry.placeholderObj);
     } else {
 	foregroundObj = es.foregroundObj;
     }

generic/ttk/ttkLayout.c

@@ -31,7 +31,7 @@ Ttk_BoxContains(Ttk_Box box, int x, int y)
 	&& box.y <= y && y < box.y + box.height;
 }
 
-int
+bool
 TtkBoxEqual(Ttk_Box box1, Ttk_Box box2)
 {
     return box1.x == box2.x && box1.y == box2.y

generic/ttk/ttkTagSet.c

@@ -172,72 +172,68 @@ void Ttk_FreeTagSet(Ttk_TagSet tagset)
 
 /* Ttk_TagSetContains -- test if tag set contains a tag.
  */
-int Ttk_TagSetContains(Ttk_TagSet tagset, Ttk_Tag tag)
+bool Ttk_TagSetContains(Ttk_TagSet tagset, Ttk_Tag tag)
 {
     Tcl_Size i;
     for (i = 0; i < tagset->nTags; ++i) {
 	if (tagset->tags[i] == tag) {
-	    return 1;
+	    return true;
 	}
     }
-    return 0;
+    return false;
 }
 
 /* Ttk_TagSetAdd -- add a tag to a tag set.
  *
- * Returns: 0 if tagset already contained tag,
- * 1 if tagset was modified.
+ * Returns: false if tagset already contained tag,
+ * true if tagset was modified.
  */
-int Ttk_TagSetAdd(Ttk_TagSet tagset, Ttk_Tag tag)
+bool Ttk_TagSetAdd(Ttk_TagSet tagset, Ttk_Tag tag)
 {
     Tcl_Size i;
     for (i = 0; i < tagset->nTags; ++i) {
 	if (tagset->tags[i] == tag) {
-	    return 0;
+	    return false;
 	}
     }
     tagset->tags = (Ttk_Tag *)Tcl_Realloc(tagset->tags,
 	    (tagset->nTags+1)*sizeof(tagset->tags[0]));
     tagset->tags[tagset->nTags++] = tag;
-    return 1;
+    return true;
 }
 
 /* Ttk_TagSetAddSet -- add a tag set to a tag set.
  *
- * Returns: 0 if tagset already contained tags,
- * 1 if tagset was modified.
  */
-int Ttk_TagSetAddSet(Ttk_TagSet tagset, Ttk_TagSet tagsetFrom)
+void Ttk_TagSetAddSet(Ttk_TagSet tagset, Ttk_TagSet tagsetFrom)
 {
     Tcl_Size i, j, total, nTags = tagset->nTags;
-    int result = 0, found;
+    bool found;
     Ttk_Tag tag;
 
     total = tagsetFrom->nTags + tagset->nTags;
     tagset->tags = (Ttk_Tag *)Tcl_Realloc(tagset->tags,
 	    (total)*sizeof(tagset->tags[0]));
     for (j = 0; j < tagsetFrom->nTags; ++j) {
 	tag = tagsetFrom->tags[j];
-	found = 0;
+	found = false;
 	for (i = 0; i < nTags; ++i) {
 	    if (tagset->tags[i] == tag) {
-		found = 1;
+		found = true;
 		break;
 	    }
 	}
 	if (found) continue;
 	tagset->tags[tagset->nTags++] = tag;
-	result = 1;
     }
-    return result;
 }
 
 /* Ttk_TagSetRemove -- remove a tag from a tag set.
  *
- * Returns: 0 if tagset did not contain tag,
- * 1 if tagset was modified.
+ * Returns: false if tagset did not contain tag,
+ * true if tagset was modified.
  */
-int Ttk_TagSetRemove(Ttk_TagSet tagset, Ttk_Tag tag)
+bool Ttk_TagSetRemove(Ttk_TagSet tagset, Ttk_Tag tag)
 {
     Tcl_Size i = 0, j = 0;
     while (i < tagset->nTags) {