Merge lp:~vanvugt/mir/render-focus into lp:mir

[Daniel van Vugt]

demo-shell: Visibly highlight the focussed surface

There's a TODO around how to accurately get the focus information. This started out as an activity to enable and enrich Renderable with that kind of state, but now I realize focus is not a piece of state stored in any Renderable/Surface. So it's turned into more of a hack than expected. But it's one worth building upon...

[Daniel van Vugt (vanvugt)]

On second thoughts, leave this work in progress. A nicer solution would be to simply augment each surface with an "int stacking_depth" which the render could use for other things too.

[lp:~vanvugt/mir/render-focus]

1533. By Daniel van Vugt on 2014-05-05

Merge latest development-branch, resolve conflicts and port to the new
interfaces.

1534. By Daniel van Vugt on 2014-05-05

Tweak focussed/unfocussed colour differences to be less dramatic

Unmerged revisions

1534. By Daniel van Vugt on 2014-05-05

Tweak focussed/unfocussed colour differences to be less dramatic

1533. By Daniel van Vugt on 2014-05-05

Merge latest development-branch, resolve conflicts and port to the new
interfaces.

1532. By Daniel van Vugt on 2014-04-04

Make use of Renderable::ID

1531. By Daniel van Vugt on 2014-04-04

Merge branch renderable-id

1530. By Daniel van Vugt on 2014-04-04

Merge latest development-branch and fix a conflict

1529. By Daniel van Vugt on 2014-04-03

Merge branch "renderable-id"

1528. By Daniel van Vugt on 2014-04-03

And vary the titlebar itself based on focus

1527. By Daniel van Vugt on 2014-04-03

Initial prototype of varying shadow size based on focus

=== modified file 'examples/demo-shell/demo_renderer.cpp'
--- examples/demo-shell/demo_renderer.cpp	2014-05-02 03:56:16 +0000
+++ examples/demo-shell/demo_renderer.cpp	2014-05-05 07:49:30 +0000
@@ -139,17 +139,20 @@
     geometry::Rectangle const& display_area)
     : GLRenderer(program_factory, display_area)
     , corner_radius(0.5f)
+    , focus(0)
 {
     shadow_corner_tex = generate_shadow_corner_texture(0.4f);
-    titlebar_corner_tex = generate_frame_corner_texture(corner_radius,
-                                                        {128,128,128,255},
-                                                        255);
+    normal_titlebar_corner_tex =
+        generate_frame_corner_texture(corner_radius, {160,160,160,255}, 220);
+    focussed_titlebar_corner_tex =
+        generate_frame_corner_texture(corner_radius, {180,180,180,255}, 255);
 }
 
 DemoRenderer::~DemoRenderer()
 {
     glDeleteTextures(1, &shadow_corner_tex);
-    glDeleteTextures(1, &titlebar_corner_tex);
+    glDeleteTextures(1, &normal_titlebar_corner_tex);
+    glDeleteTextures(1, &focussed_titlebar_corner_tex);
 }
 
 void DemoRenderer::begin() const
@@ -162,19 +165,33 @@
     glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_FALSE);
 }
 
+void DemoRenderer::render(graphics::RenderableList const& renderables) const
+{
+    // At the moment, top-of-the-stack and focus are the same thing in Mir.
+    // But maybe in future they won't be...
+
+    focus = 0;
+    if (!renderables.empty())
+        focus = renderables.back()->id();
+
+    GLRenderer::render(renderables);
+}
+
 void DemoRenderer::tessellate(std::vector<Primitive>& primitives,
                               graphics::Renderable const& renderable,
                               geometry::Size const& buf_size) const
 {
     GLRenderer::tessellate(primitives, renderable, buf_size);
-    tessellate_shadow(primitives, renderable, 80.0f);
+    tessellate_shadow(primitives, renderable, 30.0f, 80.0f);
     tessellate_frame(primitives, renderable, 30.0f);
 }
 
 void DemoRenderer::tessellate_shadow(std::vector<Primitive>& primitives,
                                      graphics::Renderable const& renderable,
-                                     float radius) const
+                                     float normal_radius,
+                                     float focussed_radius) const
 {
+
     auto const& rect = renderable.screen_position();
     GLfloat left = rect.top_left.x.as_int();
     GLfloat right = left + rect.size.width.as_int();
@@ -184,6 +201,8 @@
     auto n = primitives.size();
     primitives.resize(n + 8);
 
+    GLfloat radius = renderable.id() == focus ? focussed_radius :
+                                                 normal_radius;
     GLfloat rightr = right + radius;
     GLfloat leftr = left - radius;
     GLfloat topr = top - radius;
@@ -287,6 +306,10 @@
     if (inleft > mid) inleft = mid;
     if (inright < mid) inright = mid;
 
+    GLuint titlebar_corner_tex = renderable.id() == focus ?
+                                     focussed_titlebar_corner_tex : 
+                                     normal_titlebar_corner_tex;
+
     auto& top_left_corner = primitives[n++];
     top_left_corner.tex_id = titlebar_corner_tex;
     top_left_corner.type = GL_TRIANGLE_FAN;

=== modified file 'examples/demo-shell/demo_renderer.h'
--- examples/demo-shell/demo_renderer.h	2014-04-24 08:42:12 +0000
+++ examples/demo-shell/demo_renderer.h	2014-05-05 07:49:30 +0000
@@ -33,12 +33,13 @@
     ~DemoRenderer();
 
     void begin() const override;
+    void render(graphics::RenderableList const&) const override;
     void tessellate(std::vector<Primitive>& primitives,
                     graphics::Renderable const& renderable,
                     geometry::Size const& buf_size) const override;
     void tessellate_shadow(std::vector<Primitive>& primitives,
                     graphics::Renderable const& renderable,
-                    float radius) const;
+                    float normal_radius, float focussed_radius) const;
     void tessellate_frame(std::vector<Primitive>& primitives,
                     graphics::Renderable const& renderable,
                     float titlebar_height) const;
@@ -46,7 +47,9 @@
 private:
     float const corner_radius;
     GLuint shadow_corner_tex;
-    GLuint titlebar_corner_tex;
+    GLuint normal_titlebar_corner_tex;
+    GLuint focussed_titlebar_corner_tex;
+    mutable graphics::Renderable::ID focus;
 };
 
 } // namespace examples