X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=grpc-proxy%2Fmain-grpc.cpp;h=5b07d647d6e8cdf4daf2613f35783de0f10bcaca;hb=refs%2Fchanges%2F01%2F29301%2F1;hp=ea609f0ef73617e46ceeb067ff8b08d917b7d35d;hpb=4af44df30c1784a69b96d310f152133a507bc2e1;p=src%2Fagl-compositor.git

diff --git a/grpc-proxy/main-grpc.cpp b/grpc-proxy/main-grpc.cpp
index ea609f0..5b07d64 100644
--- a/grpc-proxy/main-grpc.cpp
+++ b/grpc-proxy/main-grpc.cpp
@@ -120,16 +120,31 @@ agl_shell_app_state(void *data, struct agl_shell *agl_shell,
 	}
 }
 
+static void
+agl_shell_app_on_output(void *data, struct agl_shell *agl_shell,
+		const char *app_id, const char *output_name)
+{
+	(void) agl_shell;
+	(void) output_name;
+	(void) data;
+	(void) app_id;
+
+	LOG("got app_on_output event app_id %s on output\n", app_id, output_name);
+}
+
+
 static const struct agl_shell_listener shell_listener = {
-        agl_shell_bound_ok,
-        agl_shell_bound_fail,
-        agl_shell_app_state,
+	agl_shell_bound_ok,
+	agl_shell_bound_fail,
+	agl_shell_app_state,
+	agl_shell_app_on_output,
 };
 
 static const struct agl_shell_listener shell_listener_init = {
-        agl_shell_bound_ok_init,
-        agl_shell_bound_fail_init,
-        nullptr,
+	agl_shell_bound_ok_init,
+	agl_shell_bound_fail_init,
+	nullptr,
+	nullptr,
 };
 
 static void
@@ -260,7 +275,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>(6), version)));
+				std::min(static_cast<uint32_t>(10), version)));
 		agl_shell_add_listener(sh->shell, &shell_listener, data);
 		sh->version = version;
 	} else if (strcmp(interface, "wl_output") == 0) {
@@ -284,7 +299,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>(6), version)));
+				std::min(static_cast<uint32_t>(10), version)));
 		agl_shell_add_listener(sh->shell, &shell_listener_init, data);
 		sh->version = version;
 	}
@@ -563,6 +578,7 @@ int main(int argc, char **argv)
 		ret = wl_display_dispatch(sh->wl_display);
 	}
 
+	thread.join();
 	destroy_shell_data(sh);
 	return 0;
 }