Merge lp:~alan-griffiths/miral/fix-1668562 into lp:miral

[Alan Griffiths]

[libmiral] add WindowManagerTools::focus_prev_within_application(). (LP: #1668562)

[lp:~alan-griffiths/miral/fix-1668562]

526. By Alan Griffiths on 2017-03-02

merge :parent

[Gerry Boland (gerboland)]

lgtm!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2017-02-27 11:29:12 +0000
+++ debian/changelog	2017-03-02 14:37:05 +0000
@@ -13,6 +13,8 @@
         functions for handle classes
       . [libmirclientcpp] Add RAII wrapper for MirDisplayConfig.
     - Bugs fixed:
+      . [libmiral] need miral::WindowManagerTools::focus_prev_within_application
+        (LP: #1668562)
       . [miral-shell] Workaround for crash on exit (LP: #1667645)
 
  -- Alan Griffiths <[e-mail]>  Thu, 02 Feb 2017 17:26:54 +0000

=== modified file 'debian/libmiral2.symbols'
--- debian/libmiral2.symbols	2017-02-28 09:56:30 +0000
+++ debian/libmiral2.symbols	2017-03-02 14:37:05 +0000
@@ -374,6 +374,7 @@
  (c++)"miral::operator<(miral::Window const&, miral::Window const&)@MIRAL_1.0" 1.3.0
  (c++)"miral::WindowManagerTools::create_workspace()@MIRAL_1.3" 1.3.0
  (c++)"miral::WindowManagerTools::add_tree_to_workspace(miral::Window const&, std::shared_ptr<miral::Workspace> const&)@MIRAL_1.3" 1.3.0
+ (c++)"miral::WindowManagerTools::focus_prev_within_application()@MIRAL_1.3" 1.3.0
  (c++)"miral::WindowManagerTools::remove_tree_from_workspace(miral::Window const&, std::shared_ptr<miral::Workspace> const&)@MIRAL_1.3" 1.3.0
  (c++)"miral::WindowManagerTools::move_workspace_content_to_workspace(std::shared_ptr<miral::Workspace> const&, std::shared_ptr<miral::Workspace> const&)@MIRAL_1.3" 1.3.0
  (c++)"miral::WorkspacePolicy::advise_adding_to_workspace(std::shared_ptr<miral::Workspace> const&, std::vector<miral::Window, std::allocator<miral::Window> > const&)@MIRAL_1.3" 1.3.0

=== modified file 'include/miral/window_manager_tools.h'
--- include/miral/window_manager_tools.h	2017-02-28 09:56:30 +0000
+++ include/miral/window_manager_tools.h	2017-03-02 14:37:05 +0000
@@ -154,6 +154,9 @@
     /// make the next surface active within the active application
     void focus_next_within_application();
 
+    /// make the prev surface active within the active application
+    void focus_prev_within_application();
+
     /// Find the topmost window at the cursor
     auto window_at(mir::geometry::Point cursor) const -> Window;
 

=== modified file 'miral-kiosk/kiosk_window_manager.cpp'
--- miral-kiosk/kiosk_window_manager.cpp	2017-01-26 11:30:51 +0000
+++ miral-kiosk/kiosk_window_manager.cpp	2017-03-02 14:37:05 +0000
@@ -58,6 +58,14 @@
 
         return true;
     }
+    else if (action == mir_keyboard_action_down &&
+             modifiers == (mir_input_event_modifier_alt | mir_input_event_modifier_shift) &&
+             scan_code == KEY_GRAVE)
+    {
+        tools.focus_prev_within_application();
+
+        return true;
+    }
     else if (action == mir_keyboard_action_down && scan_code == KEY_F4)
     {
         switch (modifiers & modifier_mask)

=== modified file 'miral-shell/decoration_provider.cpp'
--- miral-shell/decoration_provider.cpp	2017-02-24 13:00:28 +0000
+++ miral-shell/decoration_provider.cpp	2017-03-02 14:37:05 +0000
@@ -161,7 +161,7 @@
             "Keyboard shortcuts:",
             "",
             "  o Switch apps: Alt-Tab, tap or click on the corresponding window",
-            "  o Switch window: Alt-`, tap or click on the corresponding window",
+            "  o Next (previous) app window: Alt-` (Alt-Shift-`)",
             "",
             "  o Move window: Alt-leftmousebutton drag (three finger drag)",
             "  o Resize window: Alt-middle_button drag (three finger pinch)",

=== modified file 'miral-shell/tiling_window_manager.cpp'
--- miral-shell/tiling_window_manager.cpp	2017-01-26 11:30:51 +0000
+++ miral-shell/tiling_window_manager.cpp	2017-03-02 14:37:05 +0000
@@ -333,6 +333,14 @@
 
         return true;
     }
+    else if (action == mir_keyboard_action_down &&
+             modifiers == (mir_input_event_modifier_alt | mir_input_event_modifier_shift) &&
+             scan_code == KEY_GRAVE)
+    {
+        tools.focus_prev_within_application();
+
+        return true;
+    }
 
     return false;
 }

=== modified file 'miral-shell/titlebar_window_manager.cpp'
--- miral-shell/titlebar_window_manager.cpp	2017-02-21 11:54:06 +0000
+++ miral-shell/titlebar_window_manager.cpp	2017-03-02 14:37:05 +0000
@@ -449,6 +449,14 @@
         return true;
     }
     else if (action == mir_keyboard_action_down &&
+             modifiers == (mir_input_event_modifier_alt | mir_input_event_modifier_shift) &&
+             scan_code == KEY_GRAVE)
+    {
+        tools.focus_prev_within_application();
+
+        return true;
+    }
+    else if (action == mir_keyboard_action_down &&
              modifiers == (mir_input_event_modifier_ctrl|mir_input_event_modifier_meta))
     {
         if (auto active_window = tools.active_window())

=== modified file 'miral/basic_window_manager.cpp'
--- miral/basic_window_manager.cpp	2017-02-28 09:56:30 +0000
+++ miral/basic_window_manager.cpp	2017-03-02 14:37:05 +0000
@@ -606,6 +606,63 @@
     }
 }
 
+void miral::BasicWindowManager::focus_prev_within_application()
+{
+    if (auto const prev = active_window())
+    {
+        auto const workspaces_containing_window = workspaces_containing(prev);
+        auto const& siblings = info_for(prev.application()).windows();
+        auto current = find(rbegin(siblings), rend(siblings), prev);
+
+        if (current != rend(siblings))
+        {
+            while (++current != rend(siblings))
+            {
+                for (auto const& workspace : workspaces_containing(*current))
+                {
+                    for (auto const& ww : workspaces_containing_window)
+                    {
+                        if (ww == workspace)
+                        {
+                            if (prev != select_active_window(*current))
+                                return;
+                        }
+                    }
+                }
+            }
+        }
+
+        for (current = rbegin(siblings); *current != prev; ++current)
+        {
+            for (auto const& workspace : workspaces_containing(*current))
+            {
+                for (auto const& ww : workspaces_containing_window)
+                {
+                    if (ww == workspace)
+                    {
+                        if (prev != select_active_window(*current))
+                            return;
+                    }
+                }
+            }
+        }
+
+        current = find(rbegin(siblings), rend(siblings), prev);
+        if (current != rend(siblings))
+        {
+            while (++current != rend(siblings) && prev == select_active_window(*current))
+                ;
+        }
+
+        if (current == rend(siblings))
+        {
+            current = rbegin(siblings);
+            while (prev != *current && prev == select_active_window(*current))
+                ++current;
+        }
+    }
+}
+
 auto miral::BasicWindowManager::window_at(geometry::Point cursor) const
 -> Window
 {

=== modified file 'miral/basic_window_manager.h'
--- miral/basic_window_manager.h	2017-03-01 12:51:41 +0000
+++ miral/basic_window_manager.h	2017-03-02 14:37:05 +0000
@@ -146,6 +146,7 @@
     void focus_next_application() override;
 
     void focus_next_within_application() override;
+    void focus_prev_within_application() override;
 
     auto window_at(mir::geometry::Point cursor) const -> Window override;
 

=== modified file 'miral/symbols.map'
--- miral/symbols.map	2017-02-28 09:56:30 +0000
+++ miral/symbols.map	2017-03-02 14:37:05 +0000
@@ -373,6 +373,7 @@
   extern "C++" {
     miral::WindowManagerTools::add_tree_to_workspace*;
     miral::WindowManagerTools::create_workspace*;
+    miral::WindowManagerTools::focus_prev_within_application*;
     miral::WindowManagerTools::for_each_window_in_workspace*;
     miral::WindowManagerTools::for_each_workspace_containing*;
     miral::WindowManagerTools::remove_tree_from_workspace*;
@@ -382,17 +383,10 @@
     miral::WorkspacePolicy::advise_adding_to_workspace*;
     miral::WorkspacePolicy::advise_removing_from_workspace*;
     miral::WorkspacePolicy::operator*;
-    miral::toolkit::Window::Window*;
     non-virtual?thunk?to?miral::WorkspacePolicy::?WorkspacePolicy*;
     non-virtual?thunk?to?miral::WorkspacePolicy::advise_adding_to_workspace*;
     non-virtual?thunk?to?miral::WorkspacePolicy::advise_removing_from_workspace*;
     typeinfo?for?miral::WorkspacePolicy;
-    typeinfo?for?miral::toolkit::Window;
-    typeinfo?for?miral::toolkit::WindowId;
-    typeinfo?for?miral::toolkit::WindowSpec;
     vtable?for?miral::WorkspacePolicy;
-    vtable?for?miral::toolkit::Window;
-    vtable?for?miral::toolkit::WindowId;
-    vtable?for?miral::toolkit::WindowSpec;
   };
 } MIRAL_1.2;

=== modified file 'miral/window_management_trace.cpp'
--- miral/window_management_trace.cpp	2017-02-28 09:56:30 +0000
+++ miral/window_management_trace.cpp	2017-03-02 14:37:05 +0000
@@ -505,6 +505,15 @@
 }
 MIRAL_TRACE_EXCEPTION
 
+void miral::WindowManagementTrace::focus_prev_within_application()
+try {
+    log_input();
+    mir::log_info("%s", __func__);
+    trace_count++;
+    wrapped.focus_prev_within_application();
+}
+MIRAL_TRACE_EXCEPTION
+
 void miral::WindowManagementTrace::raise_tree(miral::Window const& root)
 try {
     log_input();

=== modified file 'miral/window_management_trace.h'
--- miral/window_management_trace.h	2017-02-28 09:56:30 +0000
+++ miral/window_management_trace.h	2017-03-02 14:37:05 +0000
@@ -66,6 +66,7 @@
     virtual void focus_next_application() override;
 
     virtual void focus_next_within_application() override;
+    virtual void focus_prev_within_application() override;
 
     virtual void raise_tree(Window const& root) override;
 

=== modified file 'miral/window_manager_tools.cpp'
--- miral/window_manager_tools.cpp	2017-02-28 09:56:30 +0000
+++ miral/window_manager_tools.cpp	2017-03-02 14:37:05 +0000
@@ -71,6 +71,9 @@
 void miral::WindowManagerTools::focus_next_within_application()
 { tools->focus_next_within_application(); }
 
+void miral::WindowManagerTools::focus_prev_within_application()
+{ tools->focus_prev_within_application(); }
+
 auto miral::WindowManagerTools::window_at(mir::geometry::Point cursor) const -> Window
 { return tools->window_at(cursor); }
 

=== modified file 'miral/window_manager_tools_implementation.h'
--- miral/window_manager_tools_implementation.h	2017-02-28 09:56:30 +0000
+++ miral/window_manager_tools_implementation.h	2017-03-02 14:37:05 +0000
@@ -62,6 +62,7 @@
     virtual void drag_window(Window const& window, mir::geometry::Displacement& movement) = 0;
     virtual void focus_next_application() = 0;
     virtual void focus_next_within_application() = 0;
+    virtual void focus_prev_within_application() = 0;
     virtual auto window_at(mir::geometry::Point cursor) const -> Window = 0;
     virtual auto active_display() -> mir::geometry::Rectangle const = 0;
     virtual void raise_tree(Window const& root) = 0;