Backport upstream changes into this fork

CMakeLists.txt

@@ -7,7 +7,7 @@ PROJECT ( gtkTtk )
 ## Package version information.
 SET ( PKG_NAME          ${PROJECT_NAME} )
 SET ( PKG_MAJOR_VERSION 0 )
-SET ( PKG_MINOR_VERSION 5 )
+SET ( PKG_MINOR_VERSION 9 )
 SET ( PKG_BUILD_VERSION 0 )
 SET ( PKG_VERSION
      "${PKG_MAJOR_VERSION}.${PKG_MINOR_VERSION}" )
@@ -116,7 +116,6 @@ IF ( LOAD_GTK_DYNAMICALLY )
 ENDIF ( LOAD_GTK_DYNAMICALLY )
 IF ( CMAKE_BUILD_TYPE STREQUAL Debug )
   ADD_DEFINITIONS   ( -DGTKTTK_SYNCHRONIZE )
-  ADD_DEFINITIONS   ( -DGTKTTK_VERBOSE_XERROR_HANDLER )
 ENDIF ( CMAKE_BUILD_TYPE STREQUAL Debug )
 ADD_DEFINITIONS     ( -DGTKTTK_INSTALL_XERROR_HANDLER )
 ADD_DEFINITIONS     ( -DUSE_TCL_STUBS )
@@ -191,6 +190,9 @@ MESSAGE ( STATUS "===========================================================" )
 ADD_LIBRARY ( ${PKG_TARGET_LIB_NAME} SHARED ${PKG_SOURCES} )
 TARGET_LINK_LIBRARIES ( ${PKG_TARGET_LIB_NAME} ${TCL_STUB_LIBRARY} )
 TARGET_LINK_LIBRARIES ( ${PKG_TARGET_LIB_NAME} ${TK_STUB_LIBRARY} )
+
+find_package(X11 REQUIRED)
+TARGET_LINK_LIBRARIES ( ${PKG_TARGET_LIB_NAME} ${X11_X11_LIB} )
 IF ( TTK_STUB_LIBRARY )
   TARGET_LINK_LIBRARIES ( ${PKG_TARGET_LIB_NAME} ${TTK_STUB_LIBRARY} )
 ENDIF ( TTK_STUB_LIBRARY )

demos/StyleIntrospection.tcl

@@ -3,10 +3,8 @@
 ## This demo shows information about the Gtk/GNOME style currently in use.
 ##
 ###############################################################################
-if {[catch {package require Ttk}]} {
-  package require tile
-}
-ttk::setTheme tilegtk
+package require Tk
+ttk::setTheme gtkTtk
 
 set win {}
 label $win.lbl_option   -text Option:
@@ -23,7 +21,7 @@ foreach base {fg bg base text light mid dark text_aa} {
   label $win.$base -text "$base:" -anchor w
   grid  $win.$base -row $row -column $col
   foreach state {NORMAL PRELIGHT ACTIVE SELECTED INSENSITIVE} {
-    set colour [ttk::theme::tilegtk::currentThemeColour ${base}($state)]
+    set colour [ttk::theme::gtkTtk::currentThemeColour ${base}($state)]
     label $win.${base}_$state -background $colour \
       -relief raised -borderwidth 1
     label $win.${base}_${state}_value -text $colour

demos/autocomplete.tcl

@@ -1,7 +1,7 @@
 #
 # $Id: autocomplete.tcl,v 1.1 2008/08/03 14:52:09 petasis Exp $
 #
-# Demonstration of inline auto-completion for Tile combobox widgets.
+# Demonstration of inline auto-completion for Ttk combobox widgets.
 #
 # Usage:
 #
@@ -16,25 +16,25 @@
 #	overhead.
 #
 
-namespace eval tile::combobox {
+namespace eval ttk::combobox {
 	namespace export enableAutocomplete
 }
 
 ## enableAutocomplete
 #
 #	Enable inline auto-completion for the specified combobox widget.
 #
-proc tile::combobox::enableAutocomplete { w {presorted 1} } {
+proc ttk::combobox::enableAutocomplete { w {presorted 1} } {
 	bind $w <KeyPress> [namespace code [list DoAutoComplete %W %A $presorted]]
 }
 
 ## DoAutoComplete
 #
 #	Perform inline auto-completion of typed text in the combobox.
 #
-proc tile::combobox::DoAutoComplete { w s presorted } {
+proc ttk::combobox::DoAutoComplete { w s presorted } {
     set old [$w get]
-    tile::entry::Insert $w $s
+    ttk::entry::Insert $w $s
     set new [$w get]
 
     # Only auto-complete if the string length has changed due to insertion.

demos/demo.tcl

@@ -517,7 +517,7 @@ proc tree.pane {w} {
     grid $w.t $w.vsb -sticky nwse
     grid columnconfigure $w 0 -weight 1
     grid rowconfigure $w 0 -weight 1
-    grid propagate $w 0
+    grid propagate $w 1
 
     #
     # Add initial tree node: 
@@ -529,6 +529,10 @@ proc tree.pane {w} {
     $w.t heading Class -text "Class"
     bind $w.t <<TreeviewOpen>> [list fillTree $w.t]
 
+    lmap child {un deux trois quatre} {
+	$w.t insert {} end -text $child
+    }
+
     return $w
 }
 
@@ -544,7 +548,7 @@ proc fillTree {tv} {
     #
     # Replace tree item children with current list of child windows.
     #
-    $tv delete [$tv children $id]
+#    $tv delete [$tv children $id]
     set children [winfo children $id]
     foreach child $children {
 	$tv insert $id end -id $child -text [winfo name $child] -open 0 \

generic/gtkTtk_CheckButton.cpp

@@ -40,9 +40,12 @@ static void CheckButtonIndicatorElementGeometry(
            "indicator-spacing", &spacing,
            "focus-line-width",  &focus_width,
            "focus-padding",     &focus_pad, NULL);
-    *widthPtr = *heightPtr = size+spacing;
-    size = focus_pad + focus_width;
-    *paddingPtr = Ttk_MakePadding(spacing+size, size, spacing+size, size);
+    *widthPtr = *heightPtr = spacing*2+size+focus_width+focus_pad;
+    size = focus_width;
+    *paddingPtr = Ttk_MakePadding(*widthPtr,
+				  size,
+				  *widthPtr,
+				  size);
 }
 
 static void CheckButtonIndicatorElementDraw(

generic/gtkTtk_Combobox.cpp

@@ -70,6 +70,7 @@ static void ComboboxFieldElementDraw(
       GtkTtk_StateShadowTableLookup(NULL, state, gtkState, gtkShadow,
               GTKTTK_SECTION_ENTRY|GTKTTK_SECTION_ALL);
       GTKTTK_WIDGET_SET_FOCUS(widget);
+      // GtkTtk_StateInfo(state, gtkState, gtkShadow, tkwin, widget);
       GtkTtk_gtk_paint_shadow(style, gdkDrawable, gtkState, gtkShadow, NULL,
               widget, "combobox", 0, 0, b.width, b.height);
     }
@@ -127,6 +128,7 @@ static void ComboboxArrowElementDraw(
       GTKTTK_ENSURE_WIDGET_OK;
       GTKTTK_STYLE_FROM_WIDGET;
       GTKTTK_DRAWABLE_FROM_WIDGET;
+      // GtkTtk_StateInfo(state, gtkState, gtkShadow, tkwin, widget);
       GtkTtk_StateShadowTableLookup(NULL, state, gtkState, gtkShadow,
               GTKTTK_SECTION_BUTTONS|GTKTTK_SECTION_ALL);
       GTKTTK_WIDGET_SET_FOCUS(widget);
@@ -140,6 +142,7 @@ static void ComboboxArrowElementDraw(
       GtkTtk_StateShadowTableLookup(NULL, state, gtkState, gtkShadow,
               GTKTTK_SECTION_ENTRY|GTKTTK_SECTION_ALL);
       GTKTTK_WIDGET_SET_FOCUS(widget);
+      // GtkTtk_StateInfo(state, gtkState, gtkShadow, tkwin, widget);
       GtkTtk_gtk_paint_flat_box(style, gdkDrawable, gtkState, gtkShadow, NULL,
               widget, "combobox", 0, 0, b.width, b.height);
     }

generic/gtkTtk_Entry.cpp

@@ -70,9 +70,11 @@ static void EntryFieldElementDraw(
       GTKTTK_STYLE_FROM_WIDGET;
       GtkTtk_StateShadowTableLookup(NULL, state, gtkState, gtkShadow,
               GTKTTK_SECTION_ENTRY|GTKTTK_SECTION_ALL);
+      GtkTtk_gtk_paint_flat_box(style, gdkDrawable, gtkState, gtkShadow, NULL, widget,
+          "entry_bg", 0, 0, b.width, b.height);
       GTKTTK_WIDGET_SET_FOCUS(widget);
-      GtkTtk_gtk_paint_shadow(style, gdkDrawable, gtkState, gtkShadow, NULL,
-              widget, "entry", 0, 0, b.width, b.height);
+            GtkTtk_gtk_paint_shadow(style, gdkDrawable, gtkState, gtkShadow, NULL,
+                          widget, "entry", 0, 0, b.width, b.height);
     }
     // GtkTtk_StateInfo(state, gtkState, gtkShadow, tkwin, widget);
     GtkTtk_CopyGtkPixmapOnToDrawable(gdkDrawable, d, tkwin,

generic/gtkTtk_Progress.cpp

@@ -55,7 +55,7 @@ static void ProgressTroughElementDraw(
             GTKTTK_SECTION_TROUGH|GTKTTK_SECTION_ALL);
     // GTKTTK_SETUP_WIDGET_SIZE(b.width, b.height);
     GTKTTK_WIDGET_SET_FOCUS(widget);
-    // GTKTTK_DEFAULT_BACKGROUND;
+    GTKTTK_DEFAULT_BACKGROUND;
     // GtkTtk_StateInfo(state, gtkState, gtkShadow, tkwin, widget);
     GtkTtk_gtk_paint_box(style, gdkDrawable, gtkState, GTK_SHADOW_IN, NULL, widget,
         "trough", 0, 0, b.width, b.height);
@@ -118,6 +118,7 @@ static void ProgressBarElementDraw(
     GTKTTK_ENSURE_WIDGET_OK;
     GTKTTK_STYLE_FROM_WIDGET;
     GTKTTK_DRAWABLE_FROM_WIDGET;
+    GTKTTK_DEFAULT_BACKGROUND;
     // Tcl_GetDoubleFromObj(NULL, pbar->valueObj, &value);
     // Tcl_GetDoubleFromObj(NULL, pbar->maximumObj, &maximum);
     // if (strncmp(Tcl_GetString(pbar->modeObj), "determinate", 10) != 0) {

generic/gtkTtk_RadioButton.cpp

@@ -40,9 +40,10 @@ static void RadioButtonIndicatorElementGeometry(
            "indicator-spacing", &spacing,
            "focus-line-width",  &focus_width,
            "focus-padding",     &focus_pad, NULL);
-    *widthPtr = *heightPtr = size+spacing;
-    size = focus_pad + focus_width;
-    *paddingPtr = Ttk_MakePadding(spacing+size, size, spacing+size, size);
+    *widthPtr = size+focus_width+focus_pad;
+    *heightPtr = size+spacing*2+focus_pad;
+    size = focus_width;
+    *paddingPtr = Ttk_MakePadding(*heightPtr, size, *widthPtr, size);
 }
 
 static void RadioButtonIndicatorElementDraw(
@@ -51,29 +52,28 @@ static void RadioButtonIndicatorElementDraw(
 {
     GTKTTK_GTK_DRAWABLE_DEFINITIONS;
     gint indicator_size, x, y;
+    const gint MAGIC_HEIGHT_WIDTH_COMPLEMENT = 40;
     GTKTTK_ENSURE_GTK_STYLE_ENGINE_ACTIVE;
     GtkWidget *widget = GtkTtk_GetRadioButton(wc);
     GTKTTK_ENSURE_WIDGET_OK;
-    GTKTTK_DRAWABLE_FROM_WIDGET_SIZE(b.width+20, b.height+20);
+    GTKTTK_DRAWABLE_FROM_WIDGET_SIZE(b.width+MAGIC_HEIGHT_WIDTH_COMPLEMENT,
+				    b.height+MAGIC_HEIGHT_WIDTH_COMPLEMENT);
     GTKTTK_STYLE_BACKGROUND_DEFAULT;
-    GTKTTK_DEFAULT_BACKGROUND_SIZE(b.width+20, b.height+20);
+    GTKTTK_DEFAULT_BACKGROUND_SIZE(b.width+MAGIC_HEIGHT_WIDTH_COMPLEMENT,
+                    b.height+MAGIC_HEIGHT_WIDTH_COMPLEMENT);
     GTKTTK_STYLE_FROM_WIDGET;
     GTKTTK_WIDGET_SET_FOCUS(widget);
     GtkTtk_gtk_widget_style_get(widget,
            "indicator-size", &indicator_size, NULL);
     GtkTtk_StateShadowTableLookup(NULL, state, gtkState, gtkShadow,
             GTKTTK_SECTION_BUTTONS|GTKTTK_SECTION_ALL);
-    if (state & TTK_STATE_FOCUS) {
-      GtkTtk_gtk_paint_focus(style, gdkDrawable, gtkState, NULL, widget,
-              "radiobutton", 0, 0, b.width + 20, b.height + 20);
-    }
     // GtkTtk_StateInfo(state, gtkState, gtkShadow, tkwin, widget);
-    x = 10 + (b.width  - indicator_size) / 2;
-    y = 10 + (b.height - indicator_size) / 2;
+    x = (b.width  - indicator_size) / 2;
+    y = (b.height - indicator_size) / 2;
     GtkTtk_gtk_paint_option(style, gdkDrawable, gtkState, gtkShadow, NULL,
             widget, "radiobutton", x, y, indicator_size, indicator_size);
     GtkTtk_CopyGtkPixmapOnToDrawable(gdkDrawable, d, tkwin,
-            10, 10, b.width, b.height, b.x, b.y);
+            0, 0, b.width, b.height, b.x, b.y);
     GTKTTK_CLEANUP_GTK_DRAWABLE;
 }
 

generic/gtkTtk_Scale.cpp

@@ -39,13 +39,12 @@ static void ScaleTroughElementGeometry(
 {
     GTKTTK_WIDGET_CACHE_DEFINITION;
     gint trough_border = 0;
-    int xt = 0, yt = 0;
     GtkWidget *widget = GtkTtk_GetScale(wc);
     GTKTTK_ENSURE_GTK_STYLE_ENGINE_ACTIVE;
     GTKTTK_ENSURE_WIDGET_OK;
     GtkTtk_gtk_widget_style_get(widget, "trough-border", &trough_border, NULL);
-    // xt = widget->style->xthickness;
-    // yt = widget->style->ythickness;
+    int xt = widget->style->xthickness;
+    int yt = widget->style->ythickness;
     *paddingPtr = Ttk_MakePadding(xt + trough_border,
                                   yt + trough_border,
                                   xt + trough_border,
@@ -72,21 +71,8 @@ static void ScaleTroughElementDraw(
                                  &trough_side_details, NULL);
     // GtkTtk_StateInfo(state, gtkState, gtkShadow, tkwin, widget);
     if (trough_side_details) {
-      int trough_change_pos_x = b.width, trough_change_pos_y = b.height;
-      if (wc->gtkOrientation == GTK_ORIENTATION_HORIZONTAL)
-        trough_change_pos_x = b.width / 2;
-      else
-        trough_change_pos_y = b.height / 2;
       GtkTtk_gtk_paint_box(style, gdkDrawable, gtkState, GTK_SHADOW_IN, NULL,
-              widget, "trough-upper", 0, 0,
-              trough_change_pos_x, trough_change_pos_y);
-      if (wc->gtkOrientation == GTK_ORIENTATION_HORIZONTAL)
-        trough_change_pos_y = 0;
-      else
-        trough_change_pos_x = 0;
-      GtkTtk_gtk_paint_box(style, gdkDrawable, gtkState, GTK_SHADOW_IN, NULL,
-              widget, "trough-lower", trough_change_pos_x, trough_change_pos_y,
-              b.width-trough_change_pos_x, b.height-trough_change_pos_y);
+              widget, "trough-upper", 0, 0, b.width, b.height);
     } else {
       GtkTtk_gtk_paint_box(style, gdkDrawable, gtkState, GTK_SHADOW_IN, NULL,
               widget, "trough", 0, 0, b.width, b.height);

generic/gtkTtk_Scrollbar.cpp

@@ -44,8 +44,8 @@ static void ScrollbarTroughElementGeometry(
     GTKTTK_ENSURE_GTK_STYLE_ENGINE_ACTIVE;
     GTKTTK_ENSURE_WIDGET_OK;
     GtkTtk_gtk_widget_style_get(widget, "trough-border", &trough_border, NULL);
-    // xt = widget->style->xthickness;
-    // yt = widget->style->ythickness;
+    xt = widget->style->xthickness;
+    yt = widget->style->ythickness;
     *paddingPtr = Ttk_MakePadding(xt + trough_border,
                                   yt + trough_border,
                                   xt + trough_border,
@@ -147,7 +147,7 @@ static void ScrollbarThumbElementDraw(
     GTKTTK_WIDGET_SET_FOCUS(widget);
     adj = GtkTtk_gtk_range_get_adjustment((GtkRange *) widget);
     GtkTtk_gtk_adjustment_set_value(adj,GtkTtk_ValueFromSlider(wc, tkwin, b));
-    //    GTKTTK_DEFAULT_BACKGROUND;
+    GTKTTK_DEFAULT_BACKGROUND;
       GtkTtk_gtk_paint_box(style, gdkDrawable, gtkState, GTK_SHADOW_IN, NULL, widget,
           "trough", 0, 0, b.width, b.height);
 
@@ -198,10 +198,10 @@ static void ScrollbarUpArrowElementGeometry(
     }
     xt = widget->style->xthickness;
     yt = widget->style->ythickness;
-    *paddingPtr = Ttk_MakePadding(xt + trough_border,
-                                  yt + trough_border,
-                                  xt + trough_border,
-                                  yt + trough_border);
+    *paddingPtr = Ttk_MakePadding(trough_border - xt,
+                                  trough_border - yt,
+                                  trough_border + xt,
+                                  trough_border + yt);
 }
 
 static void ScrollbarUpArrowElementDraw(
@@ -224,7 +224,7 @@ static void ScrollbarUpArrowElementDraw(
             GTKTTK_SECTION_STEPPERS|GTKTTK_SECTION_ALL);
     // GTKTTK_SETUP_WIDGET_SIZE(b.width, b.height);
     GTKTTK_WIDGET_SET_FOCUS(widget);
-    // GTKTTK_DEFAULT_BACKGROUND;
+    GTKTTK_DEFAULT_BACKGROUND;
     // GtkTtk_StateInfo(state, gtkState, gtkShadow, tkwin, widget);
     GtkTtk_gtk_paint_box(style, gdkDrawable, gtkState, GTK_SHADOW_IN, NULL,
         widget, horizontal ? "hscrollbar":"vscrollbar",
@@ -289,7 +289,7 @@ static void ScrollbarDownArrowElementDraw(
             GTKTTK_SECTION_STEPPERS|GTKTTK_SECTION_ALL);
     // GTKTTK_SETUP_WIDGET_SIZE(b.width, b.height);
     GTKTTK_WIDGET_SET_FOCUS(widget);
-    // GTKTTK_DEFAULT_BACKGROUND;
+    GTKTTK_DEFAULT_BACKGROUND;
     // GtkTtk_StateInfo(state, gtkState, gtkShadow, tkwin, widget);
     GtkTtk_gtk_paint_box(style, gdkDrawable, gtkState, GTK_SHADOW_IN, NULL,
         widget, horizontal ? "hscrollbar":"vscrollbar",

generic/gtkTtk_Utilities.cpp

@@ -451,18 +451,22 @@ unsigned int GtkTtk_StateShadowTableLookup(GtkTtk_StateTable *map,
       }
       map = NULL; /* Do not search the table */
     } else if (section & GTKTTK_SECTION_BUTTONS ||
-               section & GTKTTK_SECTION_ENTRY ||
+	       section & GTKTTK_SECTION_ENTRY ||
                section & GTKTTK_SECTION_SCROLLBAR) {
       /* Whether the button is drawn pressed or not, is defined by shadow. */
       if (state & TTK_STATE_PRESSED || state & TTK_STATE_SELECTED) {
         gtkShadow = GTK_SHADOW_IN;
       } else {
         gtkShadow = GTK_SHADOW_OUT;
-        // if (state & TTK_STATE_DISABLED || state & TTK_STATE_READONLY)
-        //                                    gtkState  = GTK_STATE_INSENSITIVE;
+        if (state & TTK_STATE_DISABLED || state & TTK_STATE_READONLY)
+                                            gtkState  = GTK_STATE_INSENSITIVE;
         // else if (state & TTK_STATE_ACTIVE) gtkState  = GTK_STATE_PRELIGHT;
         // else if (state & TTK_STATE_FOCUS)  gtkState  = GTK_STATE_ACTIVE;
       }
+      if (section & GTKTTK_SECTION_ENTRY) {
+	if (state & TTK_STATE_FOCUS)  gtkState  = GTK_STATE_NORMAL;
+	gtkShadow = GTK_SHADOW_IN;
+      }
       if ((state & TTK_STATE_ACTIVE) &&
              (!(state & TTK_STATE_PRESSED) && !(state & TTK_STATE_SELECTED))) {
         gtkState = GTK_STATE_PRELIGHT;