diff options
| -rw-r--r-- | grpc-proxy/main-grpc.cpp | 4 | ||||
| -rw-r--r-- | grpc-proxy/shell.cpp | 5 | ||||
| -rw-r--r-- | protocol/agl-shell.xml | 19 | ||||
| -rw-r--r-- | src/shell.c | 14 |
4 files changed, 36 insertions, 6 deletions
diff --git a/grpc-proxy/main-grpc.cpp b/grpc-proxy/main-grpc.cpp index a59c282..d094be5 100644 --- a/grpc-proxy/main-grpc.cpp +++ b/grpc-proxy/main-grpc.cpp @@ -260,7 +260,7 @@ global_add(void *data, struct wl_registry *reg, uint32_t id, sh->shell = static_cast<struct agl_shell *>(wl_registry_bind(reg, id, &agl_shell_interface, - std::min(static_cast<uint32_t>(3), version))); + std::min(static_cast<uint32_t>(5), version))); agl_shell_add_listener(sh->shell, &shell_listener, data); sh->version = version; } else if (strcmp(interface, "wl_output") == 0) { @@ -284,7 +284,7 @@ global_add_init(void *data, struct wl_registry *reg, uint32_t id, sh->shell = static_cast<struct agl_shell *>(wl_registry_bind(reg, id, &agl_shell_interface, - std::min(static_cast<uint32_t>(3), version))); + std::min(static_cast<uint32_t>(5), version))); agl_shell_add_listener(sh->shell, &shell_listener_init, data); sh->version = version; } diff --git a/grpc-proxy/shell.cpp b/grpc-proxy/shell.cpp index cc6ead6..b96ac39 100644 --- a/grpc-proxy/shell.cpp +++ b/grpc-proxy/shell.cpp @@ -61,7 +61,10 @@ Shell::ActivateApp(const std::string &app_id, const std::string &output_name) void Shell::DeactivateApp(const std::string &app_id) { - (void) app_id; + struct agl_shell *shell = this->m_shell.get(); + + agl_shell_deactivate_app(shell, app_id.c_str()); + wl_display_flush(m_shell_data->wl_display); } void diff --git a/protocol/agl-shell.xml b/protocol/agl-shell.xml index b8f219e..d3640f6 100644 --- a/protocol/agl-shell.xml +++ b/protocol/agl-shell.xml @@ -22,7 +22,7 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. </copyright> - <interface name="agl_shell" version="4"> + <interface name="agl_shell" version="5"> <description summary="user interface for Automotive Grade Linux platform"> Starting with version 2 of the protocol, the client is required to wait for the 'bound_ok' or 'bound_fail' events in order to proceed further. @@ -200,6 +200,23 @@ <arg name="width" type="int" summary="width of rectangle"/> <arg name="height" type="int" summary="height of rectangle"/> </request> + + <request name="deactivate_app" since="5"> + <description summary="de-activate/hide window identified by app_id"> + Ask the compositor to hide the toplevel window for window + management purposes. Depending on the window role, this request + will either display the previously active window (or the background + in case there's no previously active surface) or temporarily (or + until a 'activate_app' is called upon) hide the surface. + + All the surfaces are identifiable by using the app_id, and no actions + are taken in case the app_id is not/was not present. + + See xdg_toplevel.set_app_id from the xdg-shell protocol for a + description of app_id. + </description> + <arg name="app_id" type="string"/> + </request> </interface> <interface name="agl_shell_ext" version="1"> diff --git a/src/shell.c b/src/shell.c index bcfb673..b1ef59b 100644 --- a/src/shell.c +++ b/src/shell.c @@ -1439,6 +1439,15 @@ shell_activate_app(struct wl_client *client, } static void +shell_new_deactivate_app(struct wl_client *client, struct wl_resource *shell_res, + const char *app_id) +{ + struct ivi_compositor *ivi = wl_resource_get_user_data(shell_res); + + ivi_layout_deactivate(ivi, app_id); +} + +static void shell_desktop_activate_app(struct wl_client *client, struct wl_resource *shell_res, const char *app_id, const char *data, @@ -1518,7 +1527,8 @@ static const struct agl_shell_interface agl_shell_implementation = { .set_panel = shell_set_panel, .activate_app = shell_activate_app, .destroy = shell_destroy, - .set_activate_region = shell_set_activate_region + .set_activate_region = shell_set_activate_region, + .deactivate_app = shell_new_deactivate_app, }; static const struct agl_shell_ext_interface agl_shell_ext_implementation = { @@ -1818,7 +1828,7 @@ int ivi_shell_create_global(struct ivi_compositor *ivi) { ivi->agl_shell = wl_global_create(ivi->compositor->wl_display, - &agl_shell_interface, 4, + &agl_shell_interface, 5, ivi, bind_agl_shell); if (!ivi->agl_shell) { weston_log("Failed to create wayland global.\n"); |