X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapp.hpp;h=413d1c9ffe620a5ea3a83332cbc93942e00a341d;hb=c392fff74872af6d4f165ff3f854d19f390ec0ee;hp=ea3e92b45df890b58432977e10888fea89bc2856;hpb=eb7fc4eb593d723f1ac2ed4e5b523afd34e992ac;p=apps%2Fagl-service-windowmanager.git diff --git a/src/app.hpp b/src/app.hpp index ea3e92b..413d1c9 100644 --- a/src/app.hpp +++ b/src/app.hpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Mentor Graphics Development (Deutschland) GmbH + * Copyright (c) 2017 TOYOTA MOTOR CORPORATION * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,12 +33,13 @@ #include "policy.hpp" #include "result.hpp" #include "wayland.hpp" +#include "hmi-debug.h" namespace wl { struct display; } -namespace genivi { +namespace compositor { struct controller; } @@ -76,7 +77,7 @@ struct id_allocator { this->id2name[sid] = name; // this->pending_surfaces.insert({sid}); this->name2id[name] = sid; - logdebug("allocated new id %u with name %s", sid, name.c_str()); + HMI_DEBUG("wm", "allocated new id %u with name %s", sid, name.c_str()); return sid; } @@ -93,7 +94,6 @@ struct id_allocator { } // Remove a surface id and name - // I don't think I will need this, do I? void remove_id(std::string const &name) { auto i = this->name2id.find(name); if (i != this->name2id.end()) { @@ -112,13 +112,37 @@ struct id_allocator { }; struct App { + enum EventType { + Event_Val_Min = 0, + + Event_Active = Event_Val_Min, + Event_Inactive, + + Event_Visible, + Event_Invisible, + + Event_SyncDraw, + Event_FlushDraw, + + Event_Val_Max = Event_FlushDraw, + }; + + const std::vector kListEventName{ + "active", + "inactive", + "visible", + "invisible", + "syncdraw", + "flushdraw" + }; + struct binding_api api; struct controller_hooks chooks; // This is the one thing, we do not own. struct wl::display *display; - std::unique_ptr controller; + std::unique_ptr controller; std::vector> outputs; struct config config; @@ -136,6 +160,8 @@ struct App { Policy policy; + std::map map_afb_event; + explicit App(wl::display *d); ~App() = default; @@ -155,6 +181,7 @@ struct App { char const *api_activate_surface(char const *drawing_name, char const *drawing_area); char const *api_deactivate_surface(char const *drawing_name); char const *api_enddraw(char const *drawing_name); + char const *api_subscribe(afb_req *req, char const *event_name); void api_ping(); // Events from the compositor we are interested in