From: Marius Vlad Date: Mon, 31 Jul 2023 11:41:48 +0000 (+0300) Subject: grpc-proxy: Add dynamic scale of floating windows X-Git-Tag: 17.90.0~13 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=src%2Fagl-compositor.git;a=commitdiff_plain;h=ca537df2c52990acf97fb1c42ec2d993c60eae2d grpc-proxy: Add dynamic scale of floating windows This adds basic scaling for floating windows, sending new dimensions to the clients to resize itself. Bug-AGL: SPEC-4862 Signed-off-by: Marius Vlad Change-Id: Ic693153cd704b278dcddd2514afc8dafecf8829b --- diff --git a/grpc-proxy/agl_shell.proto b/grpc-proxy/agl_shell.proto index 74ea958..c4f3dfe 100644 --- a/grpc-proxy/agl_shell.proto +++ b/grpc-proxy/agl_shell.proto @@ -4,16 +4,17 @@ syntax = "proto3"; package agl_shell_ipc; service AglShellManagerService { - rpc ActivateApp(ActivateRequest) returns (ActivateResponse) {} - rpc DeactivateApp(DeactivateRequest) returns (DeactivateResponse) {} - rpc SetAppSplit(SplitRequest) returns (SplitResponse) {} - rpc SetAppFloat(FloatRequest) returns (FloatResponse) {} - rpc SetAppFullscreen(FullscreenRequest) returns (FullscreenResponse) {} - rpc AppStatusState(AppStateRequest) returns (stream AppStateResponse) {} - rpc GetOutputs(OutputRequest) returns (ListOutputResponse) {} - rpc SetAppNormal(NormalRequest) returns (NormalResponse) {} - rpc SetAppOnOutput(AppOnOutputRequest) returns (AppOnOutputResponse) {} - rpc SetAppPosition(AppPositionRequest) returns (AppPositionResponse) {} + rpc ActivateApp(ActivateRequest) returns (ActivateResponse) {} + rpc DeactivateApp(DeactivateRequest) returns (DeactivateResponse) {} + rpc SetAppSplit(SplitRequest) returns (SplitResponse) {} + rpc SetAppFloat(FloatRequest) returns (FloatResponse) {} + rpc SetAppFullscreen(FullscreenRequest) returns (FullscreenResponse) {} + rpc AppStatusState(AppStateRequest) returns (stream AppStateResponse) {} + rpc GetOutputs(OutputRequest) returns (ListOutputResponse) {} + rpc SetAppNormal(NormalRequest) returns (NormalResponse) {} + rpc SetAppOnOutput(AppOnOutputRequest) returns (AppOnOutputResponse) {} + rpc SetAppPosition(AppPositionRequest) returns (AppPositionResponse) {} + rpc SetAppScale(AppScaleRequest) returns (AppScaleResponse) {} } message ActivateRequest { @@ -98,3 +99,12 @@ message AppPositionRequest { message AppPositionResponse { }; + +message AppScaleRequest { + string app_id = 1; + int32 width = 2; + int32 height = 3; +}; + +message AppScaleResponse { +}; diff --git a/grpc-proxy/grpc-async-cb.cpp b/grpc-proxy/grpc-async-cb.cpp index 92aaa3c..9cbbb4d 100644 --- a/grpc-proxy/grpc-async-cb.cpp +++ b/grpc-proxy/grpc-async-cb.cpp @@ -170,6 +170,19 @@ GrpcServiceImpl::SetAppPosition(grpc::CallbackServerContext *context, return reactor; } +grpc::ServerUnaryReactor * +GrpcServiceImpl::SetAppScale(grpc::CallbackServerContext *context, + const ::agl_shell_ipc::AppScaleRequest* request, + ::agl_shell_ipc::AppScaleResponse* /* response */) +{ + m_aglShell->SetAppScale(request->app_id(), + request->width(), request->height()); + + grpc::ServerUnaryReactor* reactor = context->DefaultReactor(); + reactor->Finish(grpc::Status::OK); + return reactor; +} + grpc::ServerUnaryReactor * GrpcServiceImpl::SetAppSplit(grpc::CallbackServerContext *context, const ::agl_shell_ipc::SplitRequest* request, diff --git a/grpc-proxy/grpc-async-cb.h b/grpc-proxy/grpc-async-cb.h index 21a4e4d..cb8adcb 100644 --- a/grpc-proxy/grpc-async-cb.h +++ b/grpc-proxy/grpc-async-cb.h @@ -100,6 +100,10 @@ public: const ::agl_shell_ipc::AppPositionRequest* request, ::agl_shell_ipc::AppPositionResponse* /*response*/) override; + grpc::ServerUnaryReactor *SetAppScale(grpc::CallbackServerContext *context, + const ::agl_shell_ipc::AppScaleRequest* request, + ::agl_shell_ipc::AppScaleResponse* /*response*/) override; + grpc::ServerWriteReactor< ::agl_shell_ipc::AppStateResponse>* AppStatusState( ::grpc::CallbackServerContext* /*context*/, const ::agl_shell_ipc::AppStateRequest* /*request*/) override; diff --git a/grpc-proxy/main-grpc.cpp b/grpc-proxy/main-grpc.cpp index 740594f..b2eca84 100644 --- a/grpc-proxy/main-grpc.cpp +++ b/grpc-proxy/main-grpc.cpp @@ -275,7 +275,7 @@ global_add(void *data, struct wl_registry *reg, uint32_t id, sh->shell = static_cast(wl_registry_bind(reg, id, &agl_shell_interface, - std::min(static_cast(9), version))); + std::min(static_cast(10), version))); agl_shell_add_listener(sh->shell, &shell_listener, data); sh->version = version; } else if (strcmp(interface, "wl_output") == 0) { @@ -299,7 +299,7 @@ global_add_init(void *data, struct wl_registry *reg, uint32_t id, sh->shell = static_cast(wl_registry_bind(reg, id, &agl_shell_interface, - std::min(static_cast(9), version))); + std::min(static_cast(10), 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 44f2117..bc2df23 100644 --- a/grpc-proxy/shell.cpp +++ b/grpc-proxy/shell.cpp @@ -129,6 +129,16 @@ Shell::SetAppPosition(const std::string &app_id, const int32_t x, const int32_t wl_display_flush(m_shell_data->wl_display); } +void +Shell::SetAppScale(const std::string &app_id, + const int32_t width, const int32_t height) +{ + struct agl_shell *shell = this->m_shell.get(); + + agl_shell_set_app_scale(shell, app_id.c_str(), width, height); + wl_display_flush(m_shell_data->wl_display); +} + void Shell::SetAppSplit(const std::string &app_id, uint32_t orientation) { diff --git a/grpc-proxy/shell.h b/grpc-proxy/shell.h index b9a818c..95aae79 100644 --- a/grpc-proxy/shell.h +++ b/grpc-proxy/shell.h @@ -47,4 +47,5 @@ public: void SetAppFullscreen(const std::string &app_id); void SetAppOnOutput(const std::string &app_id, const std::string &output); void SetAppPosition(const std::string &app_id, int32_t x, int32_t y); + void SetAppScale(const std::string &app_id, int32_t width, int32_t height); }; diff --git a/protocol/agl-shell.xml b/protocol/agl-shell.xml index b85cf01..b11beb6 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. - + 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. @@ -324,6 +324,24 @@ + + + + Clients can inform the compositor to scale a floating type of window + to the values specified in width and height. If the window is + not a floating type, the request will be discarded. If the window + doesn't exist the compositor will ignore the request. For this request + to function properly the window would first to be set as floating + and then it can be moved using this request. + + + see xdg_toplevel.set_app_id from the xdg-shell protocol for a + description of app_id. + + + + + diff --git a/src/shell.c b/src/shell.c index 2ce6ac4..f5dc3e3 100644 --- a/src/shell.c +++ b/src/shell.c @@ -1678,6 +1678,21 @@ shell_set_app_position(struct wl_client *client, struct wl_resource *res, weston_compositor_schedule_repaint(ivi->compositor); } +static void +shell_set_app_scale(struct wl_client *client, struct wl_resource *res, + const char *app_id, int32_t width, int32_t height) +{ + + struct ivi_compositor *ivi = wl_resource_get_user_data(res); + struct ivi_surface *surf = ivi_find_app(ivi, app_id); + + if (!surf || !app_id || surf->role != IVI_SURFACE_ROLE_POPUP) + return; + + weston_desktop_surface_set_size(surf->dsurface, width, height); + weston_compositor_schedule_repaint(ivi->compositor); +} + static void shell_ext_destroy(struct wl_client *client, struct wl_resource *res) { @@ -1707,6 +1722,7 @@ static const struct agl_shell_interface agl_shell_implementation = { .set_app_fullscreen = shell_set_app_fullscreen, .set_app_output = shell_set_app_output, .set_app_position = shell_set_app_position, + .set_app_scale = shell_set_app_scale, }; static const struct agl_shell_ext_interface agl_shell_ext_implementation = { @@ -2008,7 +2024,7 @@ int ivi_shell_create_global(struct ivi_compositor *ivi) { ivi->agl_shell = wl_global_create(ivi->compositor->wl_display, - &agl_shell_interface, 9, + &agl_shell_interface, 10, ivi, bind_agl_shell); if (!ivi->agl_shell) { weston_log("Failed to create wayland global.\n");