grpc-proxy: Extend AglShellSetSplit from gRPC proxy

This adds an implementation for it and includes the output name,
previously being missed.

Bug-AGL: SPEC-4839
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Change-Id: I95181adebe1ff6cddf81796444774277fec28a9a

diff --git a/grpc-proxy/agl_shell.proto b/grpc-proxy/agl_shell.proto
index c4f3dfe..cb9f191 100644 (file)
--- a/grpc-proxy/agl_shell.proto
+++ b/grpc-proxy/agl_shell.proto
@@ -36,6 +36,7 @@ message DeactivateResponse {
 message SplitRequest {
        string app_id = 1;
        int32 tile_orientation = 2;
+       string output_name = 3;
 }
 
 message SplitResponse {

diff --git a/grpc-proxy/grpc-async-cb.cpp b/grpc-proxy/grpc-async-cb.cpp
index 69466e0..8c4ed24 100644 (file)
--- a/grpc-proxy/grpc-async-cb.cpp
+++ b/grpc-proxy/grpc-async-cb.cpp
@@ -225,7 +225,7 @@ GrpcServiceImpl::SetAppSplit(grpc::CallbackServerContext *context,
                LOG("m_aglShell not set-up\n");
                return nullptr;
        }
-       m_aglShell->SetAppSplit(request->app_id(), request->tile_orientation());
+       m_aglShell->SetAppSplit(request->app_id(), request->tile_orientation(), 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 ec8997c..8e78b20 100644 (file)
--- a/grpc-proxy/shell.cpp
+++ b/grpc-proxy/shell.cpp
@@ -140,8 +140,27 @@ Shell::SetAppScale(const std::string &app_id,
 }
 
 void
-Shell::SetAppSplit(const std::string &app_id, uint32_t orientation)
+Shell::SetAppSplit(const std::string &app_id, uint32_t orientation, const std::string &output_name)
 {
-       (void) app_id;
-       (void) orientation;
+       struct window_output *woutput, *w_output;
+       struct agl_shell *shell = this->m_shell.get();
+
+       woutput = nullptr;
+       w_output = nullptr;
+
+       wl_list_for_each(woutput, &m_shell_data->output_list, link) {
+               if (woutput->name && !strcmp(woutput->name, output_name.c_str())) {
+                       w_output = woutput;
+                       break;
+               }
+       }
+
+       // else, get the first one available
+       if (!w_output)
+               w_output = wl_container_of(m_shell_data->output_list.prev,
+                                          w_output, link);
+
+
+       agl_shell_set_app_split(shell, app_id.c_str(), orientation, w_output->output);
+       wl_display_flush(m_shell_data->wl_display);
 }

diff --git a/grpc-proxy/shell.h b/grpc-proxy/shell.h
index 95aae79..587ed90 100644 (file)
--- a/grpc-proxy/shell.h
+++ b/grpc-proxy/shell.h
@@ -40,7 +40,7 @@ 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);
+       void SetAppSplit(const std::string &app_id, uint32_t orientation, 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);