#include "layout.hpp"
#include "policy.hpp"
#include "result.hpp"
-#include "wayland.hpp"
+#include "wayland_ivi_wm.hpp"
+#include "policy_manager.hpp"
#include "hmi-debug.h"
namespace wl {
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";
+extern const char kNameLayoutNormal[];
+extern const char kNameLayoutSplit[];
+extern const char kNameAreaFull[];
+extern const char kNameAreaMain[];
+extern const char kNameAreaSub[];
/* Key for json obejct */
-static const char *kKeyDrawingName = "drawing_name";
-static const char *kKeyDrawingArea = "drawing_area";
+extern const char kKeyDrawingName[];
+extern const char kKeyDrawingArea[];
+extern const char kKeyDrawingRect[];
+extern const char kKeyX[];
+extern const char kKeyY[];
+extern const char kKeyWidth[];
+extern const char kKeyHeigh[];
+extern const char kKeyWidthPixel[];
+extern const char kKeyHeightPixel[];
+extern const char kKeyWidthMm[];
+extern const char kKeyHeightMm[];
+
struct id_allocator {
unsigned next = 1;
}
};
+typedef struct CarInfo {
+ bool parking_brake_stt;
+ bool accel_pedal_stt;
+ double accel_pedal_pos;
+ bool running_stt;
+ bool headlamp_stt;
+ bool lightstatus_brake_stt;
+} CarInfo;
+
struct App {
+
+ typedef std::unordered_map<uint32_t, struct compositor::rect> rect_map;
+ typedef std::function<void(const char* err_msg)> reply_func;
+
enum EventType {
Event_Val_Min = 0,
Event_SyncDraw,
Event_FlushDraw,
- Event_Val_Max = Event_FlushDraw,
+ Event_HeadlampOff,
+ Event_HeadlampOn,
+
+ Event_ParkingBrakeOff,
+ Event_ParkingBrakeOn,
+
+ Event_LightstatusBrakeOff,
+ Event_LightstatusBrakeOn,
+
+ Event_CarStop,
+ Event_CarRun,
+
+ Event_Val_Max = Event_CarRun,
};
const std::vector<const char *> kListEventName{
"visible",
"invisible",
"syncdraw",
- "flushdraw"
+ "flushdraw",
+ "headlamp_off",
+ "headlamp_on",
+ "parking_brake_off",
+ "parking_brake_on",
+ "lightstatus_brake_off",
+ "lightstatus_brake_on",
+ "car_stop",
+ "car_run",
};
struct controller_hooks chooks;
std::map<const char *, struct afb_event> map_afb_event;
+ // Surface are info (x, y, w, h)
+ rect_map area_info;
+
// FOR CES DEMO
std::vector<int> surface_bg;
int init();
- int dispatch_events();
int dispatch_pending_events();
void set_pending_events();
result<int> api_request_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 allocateWindowResource(char const *event, char const *drawing_name,
+ char const *drawing_area, const reply_func &reply);
+ void api_enddraw(char const *drawing_name);
+ result<json_object *> api_get_display_info();
+ result<json_object *> api_get_area_info(char const *drawing_name);
void api_ping();
+ void send_event(char const *evname);
void send_event(char const *evname, char const *label);
- void send_event(char const *evname, char const *label, char const *area);
+ void send_event(char const *evname, char const *label, char const *area, int x, int y, int w, int h);
// Events from the compositor we are interested in
void surface_created(uint32_t surface_id);
void surface_removed(uint32_t surface_id);
+ void setAccelPedalPos(double val);
+ void updateWindowResources(json_object* json_out);
+
private:
+ typedef std::map<std::string, std::string> RoleState;
+
+ PolicyManager pm;
+ LayoutManager lm;
+ std::unordered_map<std::string, std::string> drawingname2role;
+ std::unordered_map<std::string, std::string> role2drawingname;
+ std::unordered_map<int, int> appid2role;
+ CarInfo crr_car_info;
+ std::map<std::string, RoleState> crr_layer_state;
+
+ void updateCarElements(json_object* json_out);
+ void updateLayers(json_object* json_out);
+ void setSurfaceSize(const char* role, const char* area);
+ int loadAppDb();
+ const char* convertDrawingNameToRole(char const *drawing_name);
+
+#if 0
+ struct id_allocator app_id_alloc;
+ std::unordered_map<std::string, int> appname2appid;
+#endif
+
optional<int> lookup_id(char const *name);
optional<std::string> lookup_name(int id);
int init_layers();
- void surface_set_layout(int surface_id, optional<int> sub_surface_id = nullopt);
void layout_commit();
// 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);
void emit_visible(char const *label);
+ void emitHeadlampOff();
+ void emitHeadlampOn();
+ void emitParkingBrakeOff();
+ void emitParkingBrakeOn();
+ void emitLightstatusBrakeOff();
+ void emitLightstatusBrakeOn();
+ void emitCarStop();
+ void emitCarRun();
void activate(int id);
void deactivate(int id);
+ void deactivate(std::string role);
void deactivate_main_surface();
- bool can_split(struct LayoutState const &state, int new_id);
- void try_layout(struct LayoutState &state,
- struct LayoutState const &new_layout,
- std::function<void(LayoutState const &nl)> apply);
};
} // namespace wm
Code Review / apps / agl-service-windowmanager.git / blobdiff