/*
- * 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.
#include <unordered_map>
#include <unordered_set>
#include <experimental/optional>
-
-#include "afb_binding_api.hpp"
#include "config.hpp"
#include "controller_hooks.hpp"
#include "layers.hpp"
#include "policy.hpp"
#include "result.hpp"
#include "wayland.hpp"
+#include "hmi-debug.h"
namespace wl {
struct display;
}
-namespace genivi {
+namespace compositor {
struct controller;
}
using std::experimental::optional;
+/* DrawingArea name used by "{layout}.{area}" */
+static const char *kNameLayoutNormal = "normal";
+static const char *kNameLayoutSplit = "split";
+static const char *kNameAreaFull = "full";
+static const char *kNameAreaMain = "main";
+static const char *kNameAreaSub = "sub";
+
+/* Key for json obejct */
+static const char *kKeyDrawingName = "drawing_name";
+static const char *kKeyDrawingArea = "drawing_area";
+
struct id_allocator {
unsigned next = 1;
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;
}
+ // Insert a new ID which defined outside
+ void register_name_id(std::string const &name, unsigned sid) {
+ this->id2name[sid] = name;
+ this->name2id[name] = sid;
+ HMI_DEBUG("wm", "register id %u with name %s", sid, name.c_str());
+ return;
+ }
+
// Lookup by ID or by name
optional<unsigned> lookup(std::string const &name) const {
auto i = this->name2id.find(name);
}
// 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()) {
};
struct App {
- struct binding_api api;
+ 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<const char *> kListEventName{
+ "active",
+ "inactive",
+ "visible",
+ "invisible",
+ "syncdraw",
+ "flushdraw"
+ };
+
struct controller_hooks chooks;
// This is the one thing, we do not own.
struct wl::display *display;
- std::unique_ptr<struct genivi::controller> controller;
+ std::unique_ptr<struct compositor::controller> controller;
std::vector<std::unique_ptr<struct wl::output>> outputs;
struct config config;
Policy policy;
+ std::map<const char *, struct afb_event> map_afb_event;
+
+ // FOR CES DEMO
+ std::vector<int> surface_bg;
+
explicit App(wl::display *d);
~App() = default;
void set_pending_events();
result<int> api_request_surface(char const *drawing_name);
- char const *api_activate_surface(char const *drawing_name);
+ char const *api_request_surface(char const *drawing_name, char const *ivi_id);
+ 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();
+ void send_event(char const *evname, char const *label);
+ void send_event(char const *evname, char const *label, char const *area);
// Events from the compositor we are interested in
void surface_created(uint32_t surface_id);
// TMC WM Events to clients
void emit_activated(char const *label);
void emit_deactivated(char const *label);
- void emit_syncdraw(char const *label);
+ void emit_syncdraw(char const *label, char const *area);
void emit_flushdraw(char const *label);
void emit_visible(char const *label, bool is_visible);
void emit_invisible(char const *label);