aboutsummaryrefslogtreecommitdiffstats
path: root/src/app.hpp
diff options
context:
space:
mode:
authorTadao Tanikawa <tanikawa.tadao@jp.panasonic.com>2017-12-11 20:39:21 +0900
committerTadao Tanikawa <tanikawa.tadao@jp.panasonic.com>2017-12-11 20:39:21 +0900
commit9f9abc58011121722a82759124d061a645cee112 (patch)
treee0c2c0fe27fefaa755ecd238e03e41855e72c203 /src/app.hpp
parent6aaba1066fe89f324d4bae67497f4035fe997d5f (diff)
Revert "Add APIs which can get information of display and area"
This reverts commit 6aaba1066fe89f324d4bae67497f4035fe997d5f. To fix double posts to Gerrit Review and repository directly. Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com>
Diffstat (limited to 'src/app.hpp')
-rw-r--r--src/app.hpp20
1 files changed, 1 insertions, 19 deletions
diff --git a/src/app.hpp b/src/app.hpp
index 11ae8a7..413d1c9 100644
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -57,17 +57,6 @@ static const char *kNameAreaSub = "sub";
/* 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;
@@ -123,9 +112,6 @@ struct id_allocator {
};
struct App {
-
- typedef std::unordered_map<uint32_t, struct compositor::rect> rect_map;
-
enum EventType {
Event_Val_Min = 0,
@@ -176,8 +162,6 @@ struct App {
std::map<const char *, struct afb_event> map_afb_event;
- rect_map area_info;
-
explicit App(wl::display *d);
~App() = default;
@@ -197,8 +181,6 @@ 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);
- 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();
@@ -223,7 +205,7 @@ private:
// 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, int x, int y, int w, int h);
+ 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);