Merge lp:~unity-team/unity/unity.perspective-icon into lp:unity

[Jay Taoko]

Apply perspective correction to icons in the launcher. Solves the distorted texture problem.

[Mirco Müller (macslow)]

You probably forgot to mention your branch lp:~unity-team/clutk/clutk.perspective-icon being a prerequisite for this one.

[Mirco Müller (macslow)]

Code look ok and works well with lp:~unity-team/clutk/clutk.perspective-icon. Approved!

review: Approve

=== modified file 'unity-private/launcher/scrollerchild.vala'
--- unity-private/launcher/scrollerchild.vala	2010-08-26 15:11:32 +0000
+++ unity-private/launcher/scrollerchild.vala	2010-08-27 03:00:56 +0000
@@ -457,7 +457,7 @@
           var tex = GtkClutter.texture_new_from_pixbuf (scaled_buf);
           var color = GtkClutter.texture_new_from_pixbuf (color_buf);
 
-          processed_icon = new UnityIcon (tex as Clutter.Texture, color as Clutter.Texture);
+          processed_icon = new UnityIcon (scaled_buf, color_buf);
           processed_icon.set_parent (this);
           processed_icon.rotation = rotation;
 

=== modified file 'unity/icon-postprocessor.vala'
--- unity/icon-postprocessor.vala	2010-08-18 16:09:44 +0000
+++ unity/icon-postprocessor.vala	2010-08-27 03:00:56 +0000
@@ -16,8 +16,6 @@
  *
  * Authored by Gordon Allott <[e-mail]>
  */
-using Cairo;
-
 namespace Unity
 {
   /* General colour theory utility functions, could maybe be somewhere else
@@ -288,68 +286,71 @@
 
   public class UnityIcon : Ctk.Actor
   {
-    public Clutter.Texture? icon {get; construct;}
-    public Clutter.Texture? bg_color {get; construct;}
+    public Gdk.Pixbuf icon {get; construct;}
+    public Gdk.Pixbuf bg_color {get; construct;}
 
-    private Cogl.Material bg_mat;
-    private Cogl.Material fg_mat;
-    private Cogl.Material icon_material;
-    private Cogl.Material bgcol_material;
+    private uint tex_id_bg = 0; // the background
+    private uint tex_id_mask = 0; // the mask
+    private uint tex_id_fg = 0; // the foreground
+    private uint tex_id_content = 0 ;//the icon graphic
+    private uint tex_id_color = 0; // the colour of our background
 
     public float rotation {get; set;}
     public float stored_height = 0;
     public float stored_ymod = 0;
 
-    public UnityIcon (Clutter.Texture? icon, Clutter.Texture? bg_tex)
+    public UnityIcon (Gdk.Pixbuf? icon, Gdk.Pixbuf? bg_color)
     {
-      Object (icon: icon, bg_color: bg_tex);
+      Object (icon: icon, bg_color: bg_color);
     }
 
     construct
     {
-      icon_material = new Cogl.Material ();
-      bgcol_material = new Cogl.Material ();
-
-      if (!(unity_icon_bg_layer is Clutter.Texture))
-        {
-          unity_icon_bg_layer = new ThemeImage ("prism_icon_background");
-          unity_icon_fg_layer = new ThemeImage ("prism_icon_foreground");
-          unity_icon_mk_layer = new ThemeImage ("prism_icon_mask");
-        }
-
-      if (icon is Clutter.Texture)
-        {
-          icon.set_parent (this);
-          var icon_mat = new Cogl.Material ();
-          Cogl.Texture icon_tex = (Cogl.Texture)(icon.get_cogl_texture ());
-          Cogl.Texture mask_tex = (Cogl.Texture)(unity_icon_mk_layer.get_cogl_texture ());
-          icon_mat.set_layer (0, icon_tex);
-          icon_mat.set_layer_filters (1, Cogl.MaterialFilter.LINEAR, Cogl.MaterialFilter.LINEAR);
-          icon_mat.set_layer (1, mask_tex);
-          icon_material = icon_mat;
-        }
-      if (bg_color is Clutter.Texture)
-        {
-          bg_color.set_parent (this);
-          bgcol_material = new Cogl.Material ();
-          Cogl.Texture color = (Cogl.Texture)(bg_color.get_cogl_texture ());
-          Cogl.Texture mask_tex = (Cogl.Texture)(unity_icon_mk_layer.get_cogl_texture ());
-          bgcol_material.set_layer (0, color);
-          bgcol_material.set_layer_filters (1, Cogl.MaterialFilter.LINEAR, Cogl.MaterialFilter.LINEAR);
-          bgcol_material.set_layer (1, mask_tex);
-        }
-
-        var mat = new Cogl.Material ();
-        Cogl.Texture tex = (Cogl.Texture)(unity_icon_bg_layer.get_cogl_texture ());
-        mat.set_layer (0, tex);
-        bg_mat = mat;
-
-        mat = new Cogl.Material ();
-        tex = (Cogl.Texture)(unity_icon_fg_layer.get_cogl_texture ());
-        mat.set_layer (0, tex);
-        fg_mat = mat;
-        notify["rotation"].connect (() => { queue_relayout (); });
-        stored_height = 48;
+      // try and find the bg
+      string basefilepath = Path.build_filename (Config.PKGDATADIR, "prism_icon_background.png");
+      string absolutefilepath = Path.build_filename ("/usr/share/unity/themes", "prism_icon_background.png");
+      if (FileUtils.test (basefilepath, FileTest.EXISTS))
+        {
+          tex_id_bg = Ctk.create_opengl_texture_from_file (basefilepath);
+        }
+      else if (FileUtils.test (absolutefilepath, FileTest.EXISTS))
+        {
+          tex_id_bg = Ctk.create_opengl_texture_from_file (absolutefilepath);
+        }
+
+      // now the mask
+      basefilepath = Path.build_filename (Config.PKGDATADIR, "prism_icon_mask.png");
+      absolutefilepath = Path.build_filename ("/usr/share/unity/themes", "prism_icon_mask.png");
+      if (FileUtils.test (basefilepath, FileTest.EXISTS))
+        {
+          tex_id_mask = Ctk.create_opengl_texture_from_file (basefilepath);
+        }
+      else if (FileUtils.test (absolutefilepath, FileTest.EXISTS))
+        {
+          tex_id_mask = Ctk.create_opengl_texture_from_file (absolutefilepath);
+        }
+
+      //now the fg
+      basefilepath = Path.build_filename (Config.PKGDATADIR, "prism_icon_foreground.png");
+      absolutefilepath = Path.build_filename ("/usr/share/unity/themes", "prism_icon_foreground.png");
+      if (FileUtils.test (basefilepath, FileTest.EXISTS))
+        {
+          tex_id_fg = Ctk.create_opengl_texture_from_file (basefilepath);
+        }
+      else if (FileUtils.test (absolutefilepath, FileTest.EXISTS))
+        {
+          tex_id_fg = Ctk.create_opengl_texture_from_file (absolutefilepath);
+        }
+
+      if (icon is Gdk.Pixbuf)
+        {
+          tex_id_content = Ctk.create_opengl_texture_from_pixbuf (icon);
+        }
+
+      if (bg_color is Gdk.Pixbuf)
+        {
+          tex_id_color = Ctk.create_opengl_texture_from_pixbuf (bg_color);
+        }
     }
 
     public override void get_preferred_width (float for_height,
@@ -369,10 +370,6 @@
     public override void allocate (Clutter.ActorBox box, Clutter.AllocationFlags flags)
     {
       base.allocate (box, flags);
-      if (icon is Clutter.Texture)
-        icon.allocate (box, flags);
-      if (bg_color is Clutter.Texture)
-        bg_color.allocate (box, flags);
     }
 
     public override void pick (Clutter.Color color)
@@ -395,8 +392,11 @@
       float p2_x, p2_y;
       float p3_x, p3_y;
       float p4_x, p4_y;
-      float z, w;
+      float z;
+      float w1, w2, w3, w4;
 
+      Cogl.flush ();
+      
       Clutter.ActorBox box = Clutter.ActorBox ();
       self.get_stored_allocation (out box);
 
@@ -414,14 +414,16 @@
       p2_x =  25.0f; p2_y = -25.0f;
       p3_x =  25.0f; p3_y =  25.0f;
       p4_x = -25.0f; p4_y =  25.0f;
-      z = base_z;
-      w = 1.0f;
-
-      viewmatrix.transform_point (out p1_x, out p1_y, out z, out w); p1_x /= w; p1_y /= w; z = base_z; w = 1.0f;
-      viewmatrix.transform_point (out p2_x, out p2_y, out z, out w); p2_x /= w; p2_y /= w; z = base_z; w = 1.0f;
-      viewmatrix.transform_point (out p3_x, out p3_y, out z, out w); p3_x /= w; p3_y /= w; z = base_z; w = 1.0f;
-      viewmatrix.transform_point (out p4_x, out p4_y, out z, out w); p4_x /= w; p4_y /= w; z = base_z; w = 1.0f;
-
+      z = 0.0f;
+      w1 = 1.0f;
+      w2 = 1.0f;
+      w3 = 1.0f;
+      w4 = 1.0f;
+
+      viewmatrix.transform_point (out p1_x, out p1_y, out z, out w1); p1_x /= w1; p1_y /= w1; z = 0.0f;
+      viewmatrix.transform_point (out p2_x, out p2_y, out z, out w2); p2_x /= w2; p2_y /= w2; z = 0.0f;
+      viewmatrix.transform_point (out p3_x, out p3_y, out z, out w3); p3_x /= w3; p3_y /= w3; z = 0.0f;
+      viewmatrix.transform_point (out p4_x, out p4_y, out z, out w4); p4_x /= w4; p4_y /= w4; z = 0.0f;
 
       //transform into screen co-ordinates
       p1_x = (50 * (p1_x + 1) / 2);
@@ -446,61 +448,79 @@
           p4_x = Math.ceilf (p4_x); p4_y = Math.floorf (p4_y);
         }
 
-      self.stored_height = p3_y - p1_y;
-      self.stored_ymod = (50 - self.stored_height) / 2.0f;
-/*
-      p1_y += self.stored_ymod;
-      p2_y += self.stored_ymod;
-      p3_y += self.stored_ymod;
-      p4_y += self.stored_ymod;
-*/
+      float pos_x = 0;
+      float pos_y = 0;
 
-      Cogl.TextureVertex[4] points = {
-        Cogl.TextureVertex () {
-          x = p1_x,
-          y = p1_y,
-          z = 0.0f,
-          tx = 0.0f,
-          ty = 0.0f,
-          color = Cogl.Color () {
-            red = 0xff,
-            green = 0xff,
-            blue = 0xff,
-            alpha = 0xff
-          }
-        },
-        Cogl.TextureVertex () {
-          x = p2_x,
-          y = p2_y,
-          z = 0.0f,
-          tx = 1.0f,
-          ty = 0.0f,
-          color = Cogl.Color () {
-            red = 0xff,
-            green = 0xff,
-            blue = 0xff,
-            alpha = 0xff
-          }
-        },
-        Cogl.TextureVertex () {
-          x = p3_x,
-          y = p3_y,
-          z = 0.0f,
-          tx = 1.0f,
-          ty = 1.0f,
-          color = Cogl.Color () {
-            red = 0xff,
-            green = 0xff,
-            blue = 0xff,
-            alpha = 0xff
-          }
-        },
-        Cogl.TextureVertex () {
-          x = p4_x,
-          y = p4_y,
-          z = 0.0f,
-          tx = 0.0f,
-          ty = 1.0f,
+      float actor_x = 0;
+      float actor_y = 0;
+      float actor_width = 0;
+      float actor_height = 0;
+      Ctk.get_actor_screen_coord (self as Ctk.Actor, out actor_x, out actor_y, out actor_width, out actor_height);
+      
+/*      self.get_transformed_position(out pos_x, out pos_y);
+      pos_x = pos_x -4;
+      pos_y = pos_y / 2;*/
+      pos_x = actor_x;
+      pos_y = actor_y;
+      
+      Ctk.ProjectedTextureVertex[4] vertex0 = {
+        Ctk.ProjectedTextureVertex () {
+          x = p1_x + pos_x,
+          y = p1_y + pos_y,
+          z = 0.0f,
+          w = w1,
+          s = 0.0f,
+          t = 0.0f,
+          r = 0.0f,
+          q = 1.0f,
+          color = Cogl.Color () {
+            red = 0xff,
+            green = 0xff,
+            blue = 0xff,
+            alpha = 0xff
+          }
+        },
+        Ctk.ProjectedTextureVertex () {
+          x = p2_x + pos_x,
+          y = p2_y + pos_y,
+          z = 0.0f,
+          w = w2,
+          s = 1.0f,
+          t = 0.0f,
+          r = 0.0f,
+          q = 1.0f,
+          color = Cogl.Color () {
+            red = 0xff,
+            green = 0xff,
+            blue = 0xff,
+            alpha = 0xff
+          }
+        },
+        Ctk.ProjectedTextureVertex () {
+          x = p3_x + pos_x,
+          y = p3_y + pos_y,
+          z = 0.0f,
+          w = w3,
+          s = 1.0f,
+          t = 1.0f,
+          r = 0.0f,
+          q = 1.0f,
+          color = Cogl.Color () {
+            red = 0xff,
+            green = 0xff,
+            blue = 0xff,
+            alpha = 0xff
+          }
+        },
+        Ctk.ProjectedTextureVertex () {
+          x = p4_x + pos_x,
+          y = p4_y + pos_y,
+          z = 0.0f,
+          w = w4,
+          s = 0.0f,
+          t = 1.0f,
+          r = 0.0f,
+          q = 1.0f,
           color = Cogl.Color () {
             red = 0xff,
             green = 0xff,
@@ -511,30 +531,103 @@
       };
 
       uchar opacity = self.get_opacity ();
-
       //debug (@"opacity is set to $opacity");
-
-      self.bg_mat.set_color4ub (opacity, opacity, opacity, opacity);
-      self.bgcol_material.set_color4ub (opacity, opacity, opacity, opacity);
-      self.icon_material.set_color4ub (opacity, opacity, opacity, opacity);
-      self.fg_mat.set_color4ub (opacity, opacity, opacity, opacity);
-
-      if (self.bg_color is Clutter.Texture)
-        {
-          Cogl.set_source (self.bgcol_material);
-          Cogl.polygon (points, true);
-        }
-      else
-        {
-          Cogl.set_source (self.bg_mat);
-          Cogl.polygon (points, true);
-        }
-      if (self.icon is Clutter.Texture)
-        {
+      
+//       stdout.printf("******Vertex \n");
+//       stdout.printf("*BOX: %f, %f, %f, %f \n", box.x1, box.x2, box.y1, box.y2);
+//       stdout.printf("*Position: %f, %f \n", pos_x, pos_y);
+//       stdout.printf("*V0: %f, %f, %f, %f \n", vertex[0].x, vertex[0].y, vertex[0].z, vertex[0].w);
+//       stdout.printf("*V1: %f, %f, %f, %f \n", vertex[1].x, vertex[1].y, vertex[1].z, vertex[1].w);
+//       stdout.printf("*V2: %f, %f, %f, %f \n", vertex[2].x, vertex[2].y, vertex[2].z, vertex[2].w);
+//       stdout.printf("*V3: %f, %f, %f, %f \n", vertex[3].x, vertex[3].y, vertex[3].z, vertex[3].w);
+//       stdout.printf("******Point \n");
+//       stdout.printf("*V0: %f, %f, %f \n", points[0].x, points[0].y, points[0].z);
+//       stdout.printf("*V1: %f, %f, %f \n", points[1].x, points[1].y, points[1].z);
+//       stdout.printf("*V2: %f, %f, %f \n", points[2].x, points[2].y, points[2].z);
+//       stdout.printf("*V3: %f, %f, %f \n", points[3].x, points[3].y, points[3].z);
+
+
+      Clutter.Stage stage = global_shell.get_stage ();
+      int stage_width = (int) stage.get_width ();
+      int stage_height = (int) stage.get_height ();
+      
+      Ctk.render_projected_polygon_2Tex (vertex0[0], self.tex_id_bg, self.tex_id_color, stage_width, stage_height);
+
+      Ctk.ProjectedTextureVertex[4] vertex1 = {
+        Ctk.ProjectedTextureVertex () {
+          x = p1_x + pos_x,
+          y = p1_y + pos_y,
+          z = 0.0f,
+          w = w1,
+          s = 0.0f,
+          t = 0.0f,
+          r = 0.0f,
+          q = 1.0f,
+          color = Cogl.Color () {
+            red = 0xC0,
+            green = 0xC0,
+            blue = 0xC0,
+            alpha = 0xC0
+          }
+        },
+        Ctk.ProjectedTextureVertex () {
+          x = p2_x + pos_x,
+          y = p2_y + pos_y,
+          z = 0.0f,
+          w = w2,
+          s = 1.0f,
+          t = 0.0f,
+          r = 0.0f,
+          q = 1.0f,
+          color = Cogl.Color () {
+            red = 0xC0,
+            green = 0xC0,
+            blue = 0xC0,
+            alpha = 0xC0
+          }
+        },
+        Ctk.ProjectedTextureVertex () {
+          x = p3_x + pos_x,
+          y = p3_y + pos_y,
+          z = 0.0f,
+          w = w3,
+          s = 1.0f,
+          t = 1.0f,
+          r = 0.0f,
+          q = 1.0f,
+          color = Cogl.Color () {
+            red = 0xC0,
+            green = 0xC0,
+            blue = 0xC0,
+            alpha = 0xC0
+          }
+        },
+        Ctk.ProjectedTextureVertex () {
+          x = p4_x + pos_x,
+          y = p4_y + pos_y,
+          z = 0.0f,
+          w = w4,
+          s = 0.0f,
+          t = 1.0f,
+          r = 0.0f,
+          q = 1.0f,
+          color = Cogl.Color () {
+            red = 0xC0,
+            green = 0xC0,
+            blue = 0xC0,
+            alpha = 0xC0
+          }
+        }
+      };
+      
+      if (self.icon is Gdk.Pixbuf)
+        {
+//       
           // we also need to transform the smaller (potentially) icon
           int base_width, base_height;
           float xpad, ypad;
-          self.icon.get_base_size (out base_width, out base_height);
+          base_width = self.icon.get_width ();
+          base_height = self.icon.get_height ();
           xpad = 1 + (box.get_width () - base_width) / 2.0f;
           ypad = ((box.get_height () - base_height) / 2.0f) - 1;
 
@@ -542,13 +635,16 @@
           p2_x =  25.0f; p2_y = -25.0f;
           p3_x =  25.0f; p3_y =  25.0f;
           p4_x = -25.0f; p4_y =  25.0f;
-          z = base_z;
-          w = 1.0f;
+          z = 0.0f;
+          w1 = 1.0f;
+          w2 = 1.0f;
+          w3 = 1.0f;
+          w4 = 1.0f;
 
-          viewmatrix.transform_point (out p1_x, out p1_y, out z, out w); p1_x /= w; p1_y /= w; z = base_z; w = 1.0f;
-          viewmatrix.transform_point (out p2_x, out p2_y, out z, out w); p2_x /= w; p2_y /= w; z = base_z; w = 1.0f;
-          viewmatrix.transform_point (out p3_x, out p3_y, out z, out w); p3_x /= w; p3_y /= w; z = base_z; w = 1.0f;
-          viewmatrix.transform_point (out p4_x, out p4_y, out z, out w); p4_x /= w; p4_y /= w; z = base_z; w = 1.0f;
+          viewmatrix.transform_point (out p1_x, out p1_y, out z, out w1); p1_x /= w1; p1_y /= w1; z = 0.0f;
+          viewmatrix.transform_point (out p2_x, out p2_y, out z, out w2); p2_x /= w2; p2_y /= w2; z = 0.0f;
+          viewmatrix.transform_point (out p3_x, out p3_y, out z, out w3); p3_x /= w3; p3_y /= w3; z = 0.0f;
+          viewmatrix.transform_point (out p4_x, out p4_y, out z, out w4); p4_x /= w4; p4_y /= w4; z = 0.0f;
 
           //transform into screen co-ordinates
           p1_x = xpad + (base_width * (p1_x + 1) / 2);
@@ -573,59 +669,64 @@
               p4_x = Math.ceilf (p4_x); p4_y = Math.floorf (p4_y);
             }
 
-/*
-          p1_y += self.stored_ymod;
-          p2_y += self.stored_ymod;
-          p3_y += self.stored_ymod;
-          p4_y += self.stored_ymod;
-*/
-
-          Cogl.TextureVertex[4] icon_points = {
-            Cogl.TextureVertex () {
-              x = p1_x,
-              y = p1_y,
-              z = 0.0f,
-              tx = 0.0f,
-              ty = 0.0f,
-              color = Cogl.Color () {
-                red = 0xff,
-                green = 0xff,
-                blue = 0xff,
-                alpha = 0xff
-              }
-            },
-            Cogl.TextureVertex () {
-              x = p2_x,
-              y = p2_y,
-              z = 0.0f,
-              tx = 1.0f,
-              ty = 0.0f,
-              color = Cogl.Color () {
-                red = 0xff,
-                green = 0xff,
-                blue = 0xff,
-                alpha = 0xff
-              }
-            },
-            Cogl.TextureVertex () {
-              x = p3_x,
-              y = p3_y,
-              z = 0.0f,
-              tx = 1.0f,
-              ty = 1.0f,
-              color = Cogl.Color () {
-                red = 0xff,
-                green = 0xff,
-                blue = 0xff,
-                alpha = 0xff
-              }
-            },
-            Cogl.TextureVertex () {
-              x = p4_x,
-              y = p4_y,
-              z = 0.0f,
-              tx = 0.0f,
-              ty = 1.0f,
+          Ctk.ProjectedTextureVertex[4] vertex2 = {
+            Ctk.ProjectedTextureVertex () {
+              x = p1_x + pos_x,
+              y = p1_y + pos_y,
+              z = 0.0f,
+              w = w1,
+              s = 0.0f,
+              t = 0.0f,
+              r = 0.0f,
+              q = 1.0f,
+              color = Cogl.Color () {
+                red = 0xff,
+                green = 0xff,
+                blue = 0xff,
+                alpha = 0xff
+              }
+            },
+            Ctk.ProjectedTextureVertex () {
+              x = p2_x + pos_x,
+              y = p2_y + pos_y,
+              z = 0.0f,
+              w = w2,
+              s = 1.0f,
+              t = 0.0f,
+              r = 0.0f,
+              q = 1.0f,
+              color = Cogl.Color () {
+                red = 0xff,
+                green = 0xff,
+                blue = 0xff,
+                alpha = 0xff
+              }
+            },
+            Ctk.ProjectedTextureVertex () {
+              x = p3_x + pos_x,
+              y = p3_y + pos_y,
+              z = 0.0f,
+              w = w3,
+              s = 1.0f,
+              t = 1.0f,
+              r = 0.0f,
+              q = 1.0f,
+              color = Cogl.Color () {
+                red = 0xff,
+                green = 0xff,
+                blue = 0xff,
+                alpha = 0xff
+              }
+            },
+            Ctk.ProjectedTextureVertex () {
+              x = p4_x + pos_x,
+              y = p4_y + pos_y,
+              z = 0.0f,
+              w = w4,
+              s = 0.0f,
+              t = 1.0f,
+              r = 0.0f,
+              q = 1.0f,
               color = Cogl.Color () {
                 red = 0xff,
                 green = 0xff,
@@ -635,18 +736,11 @@
             }
           };
 
-          int width, height;
-          self.icon.get_base_size (out width, out height);
-
-          xpad = (box.get_width () - width) / 2.0f;
-          ypad = (box.get_height () - height) / 2.0f;
-
-          Cogl.set_source (self.icon_material);
-          Cogl.polygon (icon_points, true);
+          Ctk.render_projected_polygon_2Tex (vertex2[0], self.tex_id_bg, self.tex_id_content, stage_width, stage_height);
         }
-
-      Cogl.set_source (self.fg_mat);
-      Cogl.polygon (points, true);
+        
+     
+      Ctk.render_projected_polygon (vertex1[0], self.tex_id_fg, stage_width, stage_height);         
     }
 
     public override void paint ()
@@ -677,14 +771,11 @@
     public override void map ()
     {
       base.map ();
-      if (icon is Clutter.Actor)
-        icon.map ();
     }
 
     public override void unmap ()
     {
       base.unmap ();
-      icon.unmap ();
     }
   }
 }

=== modified file 'vapi/clutk-0.3.vapi'
--- vapi/clutk-0.3.vapi	2010-08-02 08:24:04 +0000
+++ vapi/clutk-0.3.vapi	2010-08-27 03:00:56 +0000
@@ -18,8 +18,8 @@
 		public void recurse_get_stored_allocation_box (out Clutter.ActorBox box);
 		public void remove_all_effects ();
 		public void remove_effect (Ctk.Effect effect);
-		public void set_background (Clutter.Actor? bg);
-		public void set_background_for_state (Ctk.ActorState state, Clutter.Actor? bg);
+		public void set_background (Clutter.Actor bg);
+		public void set_background_for_state (Ctk.ActorState state, Clutter.Actor bg);
 		public void set_damaged (bool damaged);
 		public static void set_default_direction (Gtk.TextDirection dir);
 		public void set_effects_painting (bool painting);
@@ -391,6 +391,19 @@
 		[CCode (has_construct_function = false)]
 		public MenuSeperator ();
 	}
+	[Compact]
+	[CCode (cheader_filename = "clutk/clutk.h")]
+	public struct ProjectedTextureVertex {
+		public Cogl.Color color;
+		public float q;
+		public float r;
+		public float s;
+		public float t;
+		public float w;
+		public float x;
+		public float y;
+		public float z;
+	}
 	[CCode (cheader_filename = "clutk/clutk.h")]
 	public class RadioMenuItem : Ctk.CheckMenuItem, Clutter.Scriptable, Ctk.Focusable, Clutter.Container {
 		[CCode (has_construct_function = false)]
@@ -583,6 +596,12 @@
 	[CCode (cheader_filename = "clutk/clutk.h")]
 	public static void cleanup ();
 	[CCode (cheader_filename = "clutk/clutk.h")]
+	public static uint create_opengl_texture_from_file (string filename);
+	[CCode (cheader_filename = "clutk/clutk.h")]
+	public static uint create_opengl_texture_from_pixbuf (Gdk.Pixbuf pixbuf);
+	[CCode (cheader_filename = "clutk/clutk.h")]
+	public static void delete_opengl_texture (uint opengl_texture_id);
+	[CCode (cheader_filename = "clutk/clutk.h")]
 	public static void dnd_init (Gtk.Widget widget, Gtk.TargetEntry[] targets);
 	[CCode (cheader_filename = "clutk/clutk.h")]
 	public static Gdk.Atom drag_dest_find_target (Gdk.DragContext context, Gtk.TargetList target_list);
@@ -595,11 +614,17 @@
 	[CCode (cheader_filename = "clutk/clutk.h")]
 	public static double em_to_pixel (double em_value);
 	[CCode (cheader_filename = "clutk/clutk.h")]
+	public static void get_actor_screen_coord (Ctk.Actor actor, out float x, out float y, out float width, out float height);
+	[CCode (cheader_filename = "clutk/clutk.h")]
 	public static void init ([CCode (array_length_pos = 0.9)] ref unowned string[] argv);
 	[CCode (cheader_filename = "clutk/clutk.h")]
 	public static void init_after ([CCode (array_length_pos = 0.9)] ref unowned string[] argv);
 	[CCode (cheader_filename = "clutk/clutk.h")]
 	public static double pixel_to_em (int pixel_value);
 	[CCode (cheader_filename = "clutk/clutk.h")]
+	public static void render_projected_polygon (Ctk.ProjectedTextureVertex V, uint tex_mask_id, int window_w, int window_h);
+	[CCode (cheader_filename = "clutk/clutk.h")]
+	public static void render_projected_polygon_2Tex (Ctk.ProjectedTextureVertex V, uint tex_mask_id, uint tex_id, int window_w, int window_h);
+	[CCode (cheader_filename = "clutk/clutk.h")]
 	public static void surface_blur (Cairo.Surface surface, uint radius);
 }

=== modified file 'vapi/cogl-1.0.vapi'
--- vapi/cogl-1.0.vapi	2010-06-16 12:42:46 +0000
+++ vapi/cogl-1.0.vapi	2010-08-27 03:00:56 +0000
@@ -136,6 +136,7 @@
 		public bool is_sliced ();
 		public bool set_region (int src_x, int src_y, int dst_x, int dst_y, uint dst_width, uint dst_height, int width, int height, Cogl.PixelFormat format, uint rowstride, uchar[] data);
 		public Texture.with_size (uint width, uint height, Cogl.TextureFlags flags, Cogl.PixelFormat internal_format);
+		public bool get_gl_texture (out uint out_gl_handle, out uint out_gl_target);
 	}
 	[Compact]
 	[CCode (ref_function = "cogl_handle_buffer_ref", unref_function = "cogl_handle_buffer_unref", cname = "CoglHandle", cheader_filename = "cogl/cogl.h")]