[gimp/goat-invasion: 155/412] app: implement "show layer mask" in the GEGL graph

[Michael Natterer <mitch src gnome org>]

commit b281afb4245f39b1c43e1718b601d277122aa6c7
Author: Michael Natterer <mitch gimp org>
Date:   Mon Mar 19 22:22:05 2012 +0100

    app: implement "show layer mask" in the GEGL graph

 app/core/gimplayer.c |   75 ++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 67 insertions(+), 8 deletions(-)
---
diff --git a/app/core/gimplayer.c b/app/core/gimplayer.c
index 478b052..c44c03c 100644
--- a/app/core/gimplayer.c
+++ b/app/core/gimplayer.c
@@ -869,9 +869,12 @@ gimp_layer_get_node (GimpItem *item)
                                              "value",     layer->opacity,
                                              NULL);
 
-  if (! source_node_hijacked)
-    gegl_node_connect_to (source,              "output",
-                          layer->opacity_node, "input");
+  if (! source_node_hijacked &&
+      (! layer->mask || ! gimp_layer_get_show_mask (layer)))
+    {
+      gegl_node_connect_to (source,              "output",
+                            layer->opacity_node, "input");
+    }
 
   if (layer->mask)
     {
@@ -879,8 +882,16 @@ gimp_layer_get_node (GimpItem *item)
 
       mask = gimp_drawable_get_source_node (GIMP_DRAWABLE (layer->mask));
 
-      gegl_node_connect_to (mask,                "output",
-                            layer->opacity_node, "aux");
+      if (gimp_layer_get_show_mask (layer))
+        {
+          gegl_node_connect_to (mask,                "output",
+                                layer->opacity_node, "input");
+        }
+      else
+        {
+          gegl_node_connect_to (mask,                "output",
+                                layer->opacity_node, "aux");
+        }
     }
 
   offset_node = gimp_item_get_offset_node (GIMP_ITEM (layer));
@@ -1289,8 +1300,16 @@ gimp_layer_add_mask (GimpLayer      *layer,
 
       mask = gimp_drawable_get_source_node (GIMP_DRAWABLE (layer->mask));
 
-      gegl_node_connect_to (mask,                "output",
-                            layer->opacity_node, "aux");
+      if (layer->show_mask)
+        {
+          gegl_node_connect_to (mask,                "output",
+                                layer->opacity_node, "input");
+        }
+      else
+        {
+          gegl_node_connect_to (mask,                "output",
+                                layer->opacity_node, "aux");
+        }
     }
 
   if (gimp_layer_get_apply_mask (layer) ||
@@ -1625,7 +1644,21 @@ gimp_layer_apply_mask (GimpLayer         *layer,
     gimp_image_undo_group_end (image);
 
   if (layer->opacity_node)
-    gegl_node_disconnect (layer->opacity_node, "aux");
+    {
+      if (layer->show_mask)
+        {
+          GeglNode *source;
+
+          source = gimp_drawable_get_source_node (GIMP_DRAWABLE (layer));
+
+          gegl_node_connect_to (source,              "output",
+                                layer->opacity_node, "input");
+        }
+      else
+        {
+          gegl_node_disconnect (layer->opacity_node, "aux");
+        }
+    }
 
   /*  If applying actually changed the view  */
   if (view_changed)
@@ -1727,6 +1760,32 @@ gimp_layer_set_show_mask (GimpLayer *layer,
 
       layer->show_mask = show ? TRUE : FALSE;
 
+      if (layer->opacity_node)
+        {
+          GeglNode *mask;
+
+          mask = gimp_drawable_get_source_node (GIMP_DRAWABLE (layer->mask));
+
+          if (layer->show_mask)
+            {
+              gegl_node_disconnect (layer->opacity_node, "aux");
+
+              gegl_node_connect_to (mask,                "output",
+                                    layer->opacity_node, "input");
+            }
+          else
+            {
+              GeglNode *source;
+
+              source = gimp_drawable_get_source_node (GIMP_DRAWABLE (layer));
+
+              gegl_node_connect_to (source,              "output",
+                                    layer->opacity_node, "input");
+              gegl_node_connect_to (mask,                "output",
+                                    layer->opacity_node, "aux");
+            }
+        }
+
       gimp_drawable_update (GIMP_DRAWABLE (layer),
                             0, 0,
                             gimp_item_get_width  (GIMP_ITEM (layer)),