diff options
| author |   Marius Vlad <marius.vlad@collabora.com> | 2024-01-31 19:10:34 +0200 |
|---|---|---|
| committer | Marius Vlad <marius.vlad@collabora.com> | 2024-02-22 13:51:33 +0000 |
| commit | 000b725db81ae79ffec0a7a84a2c4aab2778dc82 (patch) | |
| tree | cdcbd2f10846bf126ad0a5c598101e7d37ea2390 /grpc-proxy | |
| parent | b87f46acc5b0b252e4642f2130ef3093294afac8 (diff) | |
grpc-proxy/shell: Add sticky parameter when setting up split window
This allow to further customize how to handle the split window.
There's no implementation in the compositor for allow this functionality
to take place, but doing so can be at a later point in time.
Tagging the split window as sticky should allow activation of other
windows while keeping the split window always displayed.
Bug-AGL: SPEC-4839
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Change-Id: Iae4d18d2a857497c11d0e77bf43f654e2b8ed501
Diffstat (limited to 'grpc-proxy')
| -rw-r--r-- | grpc-proxy/agl_shell.proto | 3 | ||||
| -rw-r--r-- | grpc-proxy/grpc-async-cb.cpp | 4 | ||||
| -rw-r--r-- | grpc-proxy/shell.cpp | 5 | ||||
| -rw-r--r-- | grpc-proxy/shell.h | 3 |
4 files changed, 10 insertions, 5 deletions
diff --git a/grpc-proxy/agl_shell.proto b/grpc-proxy/agl_shell.proto index c8d57ac..d38d896 100644 --- a/grpc-proxy/agl_shell.proto +++ b/grpc-proxy/agl_shell.proto @@ -37,7 +37,8 @@ message SplitRequest { string app_id = 1; int32 tile_orientation = 2; int32 width = 3; - string output_name = 4; + int32 sticky = 4; + string output_name = 5; } message SplitResponse { diff --git a/grpc-proxy/grpc-async-cb.cpp b/grpc-proxy/grpc-async-cb.cpp index 23a293d..6807564 100644 --- a/grpc-proxy/grpc-async-cb.cpp +++ b/grpc-proxy/grpc-async-cb.cpp @@ -225,7 +225,9 @@ GrpcServiceImpl::SetAppSplit(grpc::CallbackServerContext *context, LOG("m_aglShell not set-up\n"); return nullptr; } - m_aglShell->SetAppSplit(request->app_id(), request->tile_orientation(), request->width(), request->output_name()); + m_aglShell->SetAppSplit(request->app_id(), request->tile_orientation(), + request->width(), request->sticky(), + request->output_name()); grpc::ServerUnaryReactor* reactor = context->DefaultReactor(); reactor->Finish(grpc::Status::OK); diff --git a/grpc-proxy/shell.cpp b/grpc-proxy/shell.cpp index 6dffe6b..7267d70 100644 --- a/grpc-proxy/shell.cpp +++ b/grpc-proxy/shell.cpp @@ -140,7 +140,8 @@ Shell::SetAppScale(const std::string &app_id, } void -Shell::SetAppSplit(const std::string &app_id, uint32_t orientation, uint32_t width, const std::string &output_name) +Shell::SetAppSplit(const std::string &app_id, uint32_t orientation, + uint32_t width, uint32_t sticky, const std::string &output_name) { struct window_output *woutput, *w_output; struct agl_shell *shell = this->m_shell.get(); @@ -161,6 +162,6 @@ Shell::SetAppSplit(const std::string &app_id, uint32_t orientation, uint32_t wid w_output, link); - agl_shell_set_app_split(shell, app_id.c_str(), orientation, width, w_output->output); + agl_shell_set_app_split(shell, app_id.c_str(), orientation, width, sticky, w_output->output); wl_display_flush(m_shell_data->wl_display); } diff --git a/grpc-proxy/shell.h b/grpc-proxy/shell.h index f428088..fc02f25 100644 --- a/grpc-proxy/shell.h +++ b/grpc-proxy/shell.h @@ -40,7 +40,8 @@ public: m_shell(shell), m_shell_data(sh_data) { } void ActivateApp(const std::string &app_id, const std::string &output_name); void DeactivateApp(const std::string &app_id); - void SetAppSplit(const std::string &app_id, uint32_t orientation, uint32_t width, const std::string &output_name); + void SetAppSplit(const std::string &app_id, uint32_t orientation, + uint32_t width, uint32_t sticky, const std::string &output_name); void SetAppFloat(const std::string &app_id, int32_t x_pos, int32_t y_pos); void SetAppNormal(const std::string &app_id); |