/*
- * 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 "policy.hpp"
#include "result.hpp"
#include "wayland.hpp"
+#include "hmi-debug.h"
namespace wl {
struct display;
}
-namespace genivi {
+namespace compositor {
struct controller;
}
/* Key for json obejct */
static const char *kKeyDrawingName = "drawing_name";
static const char *kKeyDrawingArea = "drawing_area";
+static const char *kKeyDrawingRect = "drawing_rect";
+static const char *kKeyX = "x";
+static const char *kKeyY = "y";
+static const char *kKeyWidth = "width";
+static const char *kKeyHeight = "height";
+static const char *kKeyWidthPixel = "width_pixel";
+static const char *kKeyHeightPixel = "height_pixel";
+static const char *kKeyWidthMm = "width_mm";
+static const char *kKeyHeightMm = "height_mm";
+
+
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;
}
};
struct App {
+
+ typedef std::unordered_map<uint32_t, struct compositor::rect> rect_map;
+
enum EventType {
Event_Val_Min = 0,
// 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;
std::map<const char *, struct afb_event> map_afb_event;
+ rect_map area_info;
+
explicit App(wl::display *d);
~App() = default;
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);
+ result<json_object *> api_get_display_info();
+ result<json_object *> api_get_area_info(char const *drawing_name);
char const *api_subscribe(afb_req *req, char const *event_name);
void api_ping();
// TMC WM Events to clients
void emit_activated(char const *label);
void emit_deactivated(char const *label);
- void emit_syncdraw(char const *label, char const *area);
+ void emit_syncdraw(char const *label, char const *area, int x, int y, int w, int h);
void emit_flushdraw(char const *label);
void emit_visible(char const *label, bool is_visible);
void emit_invisible(char const *label);