Include the Adwaita theme

This adds the resources for the Adwaita theme, and includes them
in libgtk, on all platforms.

gtk/Makefile.am

@@ -1374,7 +1374,7 @@ gtktypebuiltins.c: $(gtk_public_h_sources) $(a11y_h_sources) $(deprecated_h_sour
 	&& cp xgen-gtbc gtktypebuiltins.c  \
 	&& rm -f xgen-gtbc
 
-gtk.gresource.xml:
+gtk.gresource.xml: Makefile.am
 	$(AM_V_GEN) echo -e "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" > $@; \
 	echo -e "<gresources>" >> $@; \
 	echo -e "  <gresource prefix=\"/org/gtk/libgtk\">" >> $@; \
@@ -1382,6 +1382,12 @@ gtk.gresource.xml:
 	  n=`basename $$f`; \
 	  echo -e "    <file alias=\"theme/Raleigh.css\">theme/Raleigh/$$n</file>" >> $@; \
 	done; \
+        echo -e "    <file alias=\"theme/Adwaita.css\">theme/Adwaita/gtk.css</file>" >> $@; \
+        echo -e "    <file alias=\"theme/Adwaita-dark.css\">theme/Adwaita/gtk-dark.css</file>" >> $@; \
+        for f in $(srcdir)/resources/theme/Adwaita/assets/*; do \
+          n=`basename $$f`; \
+          echo -e "    <file preprocess=\"to-pixdata\">theme/Adwaita/assets/$$n</file>" >> $@; \
+        done; \
 	if test "$(win32_theme)" = "yes"; then \
 	  for f in $(srcdir)/resources/theme/win32/*.css; do \
 	    n=`basename $$f`; \
@@ -1399,7 +1405,21 @@ gtk.gresource.xml:
 	echo -e "  </gresource>" >> $@; \
 	echo -e "</gresources>" >> $@;
 
+adwaita_sources = \
+	resources/theme/Adwaita/assets.svg \
+	resources/theme/Adwaita/_colors.scss \
+	resources/theme/Adwaita/_common.scss \
+	resources/theme/Adwaita/_drawing.scss \
+	resources/theme/Adwaita/gtk.scss \
+	resources/theme/Adwaita/gtk-dark.scss \
+	resources/theme/Adwaita/parse-sass.sh \
+	resources/theme/Adwaita/render-assets.sh \
+	resources/theme/Adwaita/render-borders.sh \
+	resources/theme/Adwaita/assets.txt \
+	resources/theme/Adwaita/borders.txt
+
 resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/resources --generate-dependencies $(srcdir)/gtk.gresource.xml)
+
 gtkresources.h: gtk.gresource.xml
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/gtk.gresource.xml \
 		--target=$@ --sourcedir=$(srcdir)/resources --c-name _gtk --generate-header --manual-register
@@ -1977,6 +1997,7 @@ gsettings_SCHEMAS = \
 
 EXTRA_DIST +=                   \
 	$(resource_files)	\
+	$(adwaita_sources)	\
 	$(STOCK_ICONS)		\
 	$(GENERATED_ICONS)	\
 	$(gsettings_SCHEMAS)	\

gtk/resources/theme/Adwaita/_colors.scss

@@ -0,0 +1,82 @@
+// When color definition differs for dark and light variant,
+// it gets @if ed depending on $variant
+
+
+$base_color: if($variant =='light', #fff, #333);
+$bg_color: if($variant =='light', #ededed, #393f3f);
+$fg_color: if($variant =='light', #2e3436, #eeeeec);
+
+$selected_fg_color: #fff;
+$selected_bg_color: if($variant =='light', #4a90d9, darken(#4a90d9,20%));
+$selected_borders_color: if($variant == 'light', darken($selected_bg_color, 30%), darken($selected_bg_color,20%));
+                         // FIXME dark variant color
+$borders_color: if($variant =='light', darken($bg_color,30%), darken($bg_color,12%));
+$borders_edge: if($variant =='light', white, transparentize($fg_color,.9));
+$link_color: darken($selected_bg_color,10%);
+
+$warning_color: #f57900;
+$error_color: #cc0000;
+$success_color: if($variant =='light', #73d216, darken(#73d216,10%));
+$destructive_color: if($variant =='light', #ef2929, darken(#ef2929,10%));
+
+$osd_fg_color: #fff;
+$osd_bg_color: transparentize(#000,0.2);
+$osd_borders_color: transparentize(#fff,0.8);
+
+//insensitive state derived colors
+$insensitive_fg_color: mix($fg_color, $bg_color, 50%);
+$insensitive_bg_color: mix($bg_color, $base_color, 60%);
+$insensitive_borders_color: $borders_color;
+
+//colors for the backdrop state, derived from the main colors.
+$backdrop_base_color: if($variant =='light', darken($base_color,1%), darken($base_color,5%));
+$backdrop_bg_color: $bg_color;
+$backdrop_fg_color: mix($fg_color, $backdrop_bg_color, 80%);
+$backdrop_insensitive_color: if($variant =='light', darken($backdrop_bg_color,15%), lighten($backdrop_bg_color,5%));
+$backdrop_borders_color: mix($borders_color, $bg_color, 90%);
+
+//apps rely on some named colors to be exported
+/* GTK NAMED COLORS */
+@define-color theme_fg_color $fg_color;
+@define-color theme_bg_color $bg_color;
+@define-color theme_base_color $base_color;
+@define-color theme_selected_bg_color $selected_bg_color;
+@define-color theme_selected_fg_color $selected_fg_color;
+@define-color insensitive_bg_color $insensitive_bg_color;
+@define-color insensitive_fg_color $insensitive_fg_color;
+@define-color insensitive_base_color $base_color;
+@define-color theme_unfocused_fg_color $backdrop_fg_color;
+@define-color theme_unfocused_bg_color $backdrop_bg_color;
+@define-color theme_unfocused_base_color $backdrop_base_color;
+@define-color theme_unfocused_selected_bg_color $selected_bg_color;
+@define-color theme_unfocused_selected_fg_color $selected_fg_color;
+@define-color borders $borders_color;
+@define-color unfocused_borders $backdrop_borders_color;
+
+@define-color warning_color $warning_color;
+@define-color error_color $error_color;
+@define-color success_color $success_color;
+//@define-color desctructive_color $destructive_color
+
+//WM
+@define-color wm_title shade($fg_color, 1.8);
+@define-color wm_unfocused_title $backdrop_fg_color;
+@define-color wm_highlight $borders_edge;
+@define-color wm_borders_edge $borders_edge;
+
+@define-color wm_bg_a shade($bg_color, 1.2);
+@define-color wm_bg_b $bg_color;
+
+@define-color wm_shadow alpha(black, 0.35);
+@define-color wm_border alpha(black, 0.18);
+
+@define-color wm_button_hover_color_a shade($bg_color, 1.3);
+@define-color wm_button_hover_color_b $bg_color;
+@define-color wm_button_active_color_a shade($bg_color, 0.85);
+@define-color wm_button_active_color_b shade($bg_color, 0.89);
+@define-color wm_button_active_color_c shade($bg_color, 0.9);
+
+//FIXME this is really an API
+
+@define-color content_view_bg $base_color;
+

gtk/resources/theme/Adwaita/_drawing.scss

@@ -0,0 +1,356 @@
+// Drawing mixins
+
+// generic drawing of more complex things
+
+$widget_edge: 0 1px $borders_edge; //outer hilight "used" on
+                                   //most widgets
+
+@mixin _shadows($shadow1, $shadow2:none, $shadow3:none, $shadow4:none) {
+//
+// Helper function to stack up to 4 box-shadows;
+//
+  @if $shadow4!=none { box-shadow: $shadow1, $shadow2, $shadow3, $shadow4; }
+  @else if $shadow3!=none { box-shadow: $shadow1, $shadow2, $shadow3; }
+  @else if $shadow2!=none { box-shadow: $shadow1, $shadow2; }
+  @else { box-shadow: $shadow1; }
+}
+
+// entries
+
+@mixin entry($t, $noedge:false) {
+//
+// Entries drawing function
+//
+// $t: entry type
+// $noedge: set to true not to draw the bottom edge hilight
+//
+// possible $t values:
+// normal, focus, insensitive, backdrop, backdrop-insensitive;
+//
+  background-color: transparent;
+  border-style: solid;
+  border-width: 1px;
+  background-image: linear-gradient(to bottom,
+                                    darken($base_color,3%),
+                                    $base_color 90%);
+  $_entry_edge: $widget_edge;
+  @if $noedge { $_entry_edge: none; }
+  
+  @if $t==normal {
+    border-color: $borders_color;
+    @include _shadows(inset 0 2px 2px -2px mix(black, $base_color, 50%),
+                      $_entry_edge);
+  }
+  @if $t==focus {
+    @if $variant == 'light' {
+      border-color: $selected_bg_color;
+      @include _shadows(inset 0 2px 2px -2px mix(black, $base_color, 50%),
+                      inset 0 0 2px 1px mix($selected_bg_color,$base_color,20%),
+                        $_entry_edge);
+    }
+    @else {
+      border-color: $selected_borders_color;
+      @include _shadows(inset 0 2px 2px -2px mix(black, $base_color, 50%),
+                        inset 0 0 1px 1px $selected_bg_color,
+                        $_entry_edge);
+    }
+  }
+  @if $t==insensitive {
+    color: $insensitive_fg_color;
+    border-color: $borders_color;
+    background-image: linear-gradient(to bottom, $insensitive_bg_color);
+    @include _shadows($_entry_edge);
+  }
+  @if $t==backdrop {
+    color: $backdrop_fg_color;
+    background-image: linear-gradient(to bottom, $backdrop_base_color);
+    box-shadow: 0 1px transparentize(white,1);
+  }
+  @if $t==backdrop-insensitive {
+    color: $backdrop_insensitive_color;
+    background-image: linear-gradient(to bottom, $backdrop_bg_color);
+    box-shadow: 0 1px transparentize(white,1);
+  }
+}
+
+// buttons
+
+@mixin _button_border_color ($c) { border-color: darken($c,25%); } // colored buttons want the border form the base color
+
+@mixin _button_text_shadow ($tc:$fg_color, $bg:$bg_color) {
+//
+// helper function for the text emboss effect
+//
+// $tc is the optional text color, not the shadow color
+//
+// TODO: this functions needs a way to deal with special cases
+//
+
+  $_lbg: lightness($bg)/100%;
+
+  $_dark: transparentize(black,$_lbg*0.8);
+  $_bright: transparentize(white,1-$_lbg/($_lbg*1.3));
+
+  @if lightness($tc) < 50% {
+    text-shadow: 0 1px $_bright;
+    icon-shadow: 0 1px $_bright;
+  }
+  @else {
+    text-shadow: 0 -1px $_dark;
+    icon-shadow: 0 -1px $_dark;
+  }
+}
+
+@mixin button($t, $c:$bg_color, $tc:$fg_color, $noedge:false ) {
+//
+// Button drawing function
+//
+// $t:  button type,
+// $c:  base button color for colored* types
+// $tc: optional text color for colored* types
+// $noedge: set to true not to draw the bottom edge hilight
+//
+// possible $t values:
+// normal, hover, active, insensitive, insensitive-active,
+// backdrop, backdrop-active, backdrop-insensitive, backdrop-insensitive-active
+//
+  border-width: 1px;
+  border-style: solid;
+
+  $_top_hilight: if(lightness($c)> 70%, white, transparentize(white,0.9)); //not just dark/light but colored buttons
+
+  @if $t==normal {
+  //
+  // normal button
+  //
+    color: $tc;
+    @if lightness($c) < 50% { //darker buttons need a less contrasty gradient
+      background-image: linear-gradient(to bottom,
+                                  lighten($c,5%),
+                                  $c 40%,
+                                  darken($c,5%)
+                                  );
+    }
+    @else {
+      background-image: linear-gradient(to bottom,
+                                  lighten($c,15%),
+                                  $c 40%,
+                                  darken($c,10%)
+                                  );
+    }
+
+    @if $c!=$bg_color { @include _button_border_color($c); }
+    @else { border-color: $borders_color; }
+
+    @include _button_text_shadow($tc,$c);
+    @if $noedge { box-shadow: inset 0 1px $_top_hilight; }
+    @else {
+      @include _shadows(inset 0 1px $_top_hilight, $widget_edge);
+    }
+  }
+
+  @else if $t==hover {
+  //
+  // hovered button
+  //
+    color: $tc;
+    @if $c!=$bg_color { @include _button_border_color($c); }
+    @else { border-color: $borders_color; }
+    background-image: linear-gradient(to bottom,
+                                      lighten($c,14%),
+                                      lighten($c,4%) 40%,
+                                      $c);
+
+    @include _button_text_shadow($tc,lighten($c,4%));
+    @if $noedge { box-shadow: inset 0 1px $_top_hilight; }
+    @else {
+      @include _shadows(inset 0 1px $_top_hilight, $widget_edge);
+    }
+  }
+
+  @else if $t==active {
+  //
+  // pushed button
+  //
+    color: $tc;
+    @if $c!=$bg_color { @include _button_border_color($c); }
+    @else { border-color: $borders_color; }
+    @if $variant == 'light' {
+      background-image: linear-gradient(to bottom,
+                                        darken($c,15%),
+                                        darken($c,11%) 3%,
+                                        darken($c,10%));
+    }
+    @else {
+      background-image: linear-gradient(to bottom,
+                                        darken($c,10%),
+                                        darken($c,5%) 3%);
+    }
+    @include _button_text_shadow($tc,darken($c,10%));
+    @if $noedge {
+      box-shadow: inset 0 2px 3px -1px transparentize(black,0.7);
+    }
+    @else {
+      @include _shadows(inset 0 2px 3px -1px transparentize(black,0.7),
+                        $widget_edge);
+    }
+  }
+  @else if $t==insensitive {
+  //
+  // insensitive button
+  //
+    color: $insensitive_fg_color;
+    border-color: $insensitive_borders_color;
+    background-image: linear-gradient(to bottom, $insensitive_bg_color);
+    text-shadow: none;
+    icon-shadow: none;
+    @if $noedge {
+      // white with 0 alpha to avoid an ugly transition, since no color means
+      // black with 0 alpha
+      box-shadow: inset 0 1px transparentize(white,1);
+    }
+    @else {
+      @include _shadows(inset 0 1px transparentize(white,1),
+                        $widget_edge);
+    }
+  }
+  @else if $t==insensitive-active {
+  //
+  // insensitive pushed button
+  //
+    color: $insensitive_fg_color;
+    border-color: $insensitive_borders_color;
+    background-image: linear-gradient(to bottom,
+                        mix($insensitive_borders_color,
+                            $insensitive_bg_color, 10%));
+    @if $noedge {
+      // white with 0 alpha to avoid an ugly transition, since no color means
+      // black with 0 alpha
+      box-shadow: inset 0 1px transparentize(white,1);
+    }
+    @else {
+      @include _shadows(inset 0 1px transparentize(white,1),
+                        $widget_edge);
+    }
+  }
+
+  @else if $t==backdrop {
+  //
+  // backdrop button
+  //
+    color: if($c!=$bg_color, $backdrop_bg_color, $backdrop_fg_color);
+    border-color: if($c!=$bg_color, $c, $backdrop_borders_color);
+    background-image: linear-gradient(to bottom,
+                                      if($c!=bg_color,$c,$backdrop_bg_color));
+    text-shadow: none;
+    icon-shadow: none;
+    @include _shadows(inset 0 1px transparentize(white,1),
+                      0 1px transparentize(white,1));
+  }
+
+  @else if $t==backdrop-active {
+  //
+  // backdrop pushed button
+  //
+    color: $backdrop_fg_color;
+    border-color: $backdrop_borders_color;
+    background-image: linear-gradient(to bottom,
+                        mix($backdrop_borders_color,$backdrop_bg_color, 35%));
+    @include _shadows(inset 0 1px transparentize(white,1),
+                      0 1px transparentize(white,1));
+  }
+
+  @else if $t==backdrop-insensitive {
+  //
+  // backdrop insensitive button
+  //
+    color: $backdrop_insensitive_color;
+    border-color: $backdrop_borders_color;
+    background-image: linear-gradient(to bottom, $backdrop_bg_color);
+    box-shadow: inset 0 1px transparentize(white,1);
+  }
+
+  @else if $t==backdrop-insensitive-active {
+  //
+  // backdrop insensitive pushed button
+  //
+    color: $backdrop_insensitive_color;
+    border-color: $backdrop_borders_color;
+    background-image: linear-gradient(to bottom,
+                        mix($backdrop_borders_color,$backdrop_bg_color, 8%));
+    @include _shadows(inset 0 1px transparentize(white,1),
+                      0 1px transparentize(white,1));
+  }
+  
+  @else if $t==osd {
+  //
+  // normal osd button
+  //
+    background-image: linear-gradient(to bottom,
+                                  transparentize(#fff,0.9),
+                                  transparentize(#fff,0.95),
+                                  transparentize(#000,0.99));
+    border-color: $osd_borders_color;
+    box-shadow: none;
+  }
+  @else if $t==osd-hover {
+  //
+  // active osd button
+  //
+    background-image: linear-gradient(to bottom,
+                                  transparentize(#fff,0.85),
+                                  transparentize(#fff,0.9),
+                                  transparentize(#000,0.99));
+    border-color: $osd_borders_color;
+    box-shadow: none;
+  }
+  @else if $t==osd-active {
+  //
+  // active osd button
+  //
+    background-image: linear-gradient(to bottom,
+                                  transparentize(#000,0.95),
+                                  transparentize(#fff,0.95),
+                                  transparentize(#fff,0.9));
+    border-color: $osd_borders_color;
+    box-shadow: none;
+  }
+  @else if $t==osd-insensitive {
+  //
+  // insensitive osd button
+  //
+    background-image: linear-gradient(to bottom,
+                      $osd_bg_color);
+    border-color: $osd_borders_color;
+    color: $insensitive_fg_color;
+  }
+  
+}
+
+@mixin trough($flat:false, $c:$bg_color, $tc:$fg_color, $noedge:false) {
+  color: mix($tc,$bg_color,80%);
+  @if $flat { background-image: linear-gradient(to bottom,$c); }
+  @else {
+    background-image: linear-gradient(to bottom,
+                                  mix(black,$c,15%) 5%,
+                                  mix(black,$c,10%) 20%,
+                                  mix(black,$c,10%) 90%,
+                                  $c
+                                  );
+  }
+
+  @if $c!=$bg_color { @include _button_border_color($c); }
+  @else { border-color: $borders_color; }
+  
+  @if $noedge==false { 
+    @if lightness($c) > 60% {
+      box-shadow: inset 0 -1px 0 $borders_edge,
+                  0 1px 0 $borders_edge;
+    }
+    @else {
+      box-shadow: inset 0 -1px 0 transparentize($borders_edge,0.5),
+                  0 1px 0 transparentize($borders_edge,0.5);
+    }
+  }
+
+}

gtk/resources/theme/Adwaita/assets.txt

@@ -0,0 +1,73 @@
+checkbox-checked
+checkbox-checked-hover
+checkbox-checked-active
+checkbox-checked-insensitive
+checkbox-checked-backdrop
+checkbox-checked-backdrop-insensitive
+checkbox-unchecked
+checkbox-unchecked-hover
+checkbox-unchecked-active
+checkbox-unchecked-insensitive
+checkbox-unchecked-backdrop
+checkbox-unchecked-backdrop-insensitive
+checkbox-mixed
+checkbox-mixed-hover
+checkbox-mixed-active
+checkbox-mixed-insensitive
+checkbox-mixed-backdrop
+checkbox-mixed-backdrop-insensitive
+radio-checked
+radio-checked-hover
+radio-checked-active
+radio-checked-insensitive
+radio-checked-backdrop
+radio-checked-backdrop-insensitive
+radio-unchecked
+radio-unchecked-hover
+radio-unchecked-active
+radio-unchecked-insensitive
+radio-unchecked-backdrop
+radio-unchecked-backdrop-insensitive
+radio-mixed
+radio-mixed-hover
+radio-mixed-active
+radio-mixed-insensitive
+radio-mixed-backdrop
+radio-mixed-backdrop-insensitive
+checkbox-checked-dark
+checkbox-checked-hover-dark
+checkbox-checked-active-dark
+checkbox-checked-insensitive-dark
+checkbox-checked-backdrop-dark
+checkbox-checked-backdrop-insensitive-dark
+checkbox-unchecked-dark
+checkbox-unchecked-hover-dark
+checkbox-unchecked-active-dark
+checkbox-unchecked-insensitive-dark
+checkbox-unchecked-backdrop-dark
+checkbox-unchecked-backdrop-insensitive-dark
+checkbox-mixed-dark
+checkbox-mixed-hover-dark
+checkbox-mixed-active-dark
+checkbox-mixed-insensitive-dark
+checkbox-mixed-backdrop-dark
+checkbox-mixed-backdrop-insensitive-dark
+radio-checked-dark
+radio-checked-hover-dark
+radio-checked-active-dark
+radio-checked-insensitive-dark
+radio-checked-backdrop-dark
+radio-checked-backdrop-insensitive-dark
+radio-unchecked-dark
+radio-unchecked-hover-dark
+radio-unchecked-active-dark
+radio-unchecked-insensitive-dark
+radio-unchecked-backdrop-dark
+radio-unchecked-backdrop-insensitive-dark
+radio-mixed-dark
+radio-mixed-hover-dark
+radio-mixed-active-dark
+radio-mixed-insensitive-dark
+radio-mixed-backdrop-dark
+radio-mixed-backdrop-insensitive-dark
+