addSurface to client

[apps/agl-service-windowmanager.git] / src / window_manager.hpp

diff --git a/src/window_manager.hpp b/src/window_manager.hpp
index afafeb1..189d249 100644 (file)
--- a/src/window_manager.hpp
+++ b/src/window_manager.hpp
@@ -169,29 +169,6 @@ class WindowManager
         Event_Val_Max = Event_Error,
     };
 
-    const std::vector<const char *> kListEventName{
-        "active",
-        "inactive",
-        "visible",
-        "invisible",
-        "syncDraw",
-        "flushDraw",
-        "screenUpdated",
-        "error"};
-
-    struct controller_hooks chooks;
-
-    // ID allocation and proxy methods for lookup
-    struct id_allocator id_alloc;
-
-    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;
-
     explicit WindowManager();
     ~WindowManager() = default;
 
@@ -228,9 +205,18 @@ class WindowManager
     void startTransitionWrapper(std::vector<WMAction> &actions);
     void processError(WMError error);
 
+    const std::vector<const char *> kListEventName{
+        "active",
+        "inactive",
+        "visible",
+        "invisible",
+        "syncDraw",
+        "flushDraw",
+        "screenUpdated",
+        "error"};
+    std::map<const char *, struct afb_event> map_afb_event;
+
   private:
-    optional<int> lookup_id(char const *name);
-    optional<std::string> lookup_name(int id);
     int init_layers();
     void surface_set_layout(int surface_id, const std::string& area = "");
     void layout_commit();
@@ -249,7 +235,6 @@ class WindowManager
     void deactivate(int id);
     WMError setRequest(const std::string &appid, const std::string &role, const std::string &area,
                              Task task, unsigned *req_num);
-    WMError doTransition(unsigned sequence_number);
     WMError checkPolicy(unsigned req_num);
     WMError startTransition(unsigned req_num);
 
@@ -274,6 +259,15 @@ class WindowManager
     std::shared_ptr<LayerControl> lc;
     PMWrapper pmw;
 
+    struct controller_hooks chooks;
+    // ID allocation and proxy methods for lookup
+    struct id_allocator id_alloc;
+    // Surface are info (x, y, w, h)
+    rect_map area_info;
+    // FOR CES DEMO
+    std::vector<int> surface_bg;
+    std::unordered_map<unsigned, std::string> tmp_surface2app;
+
     static const char* kDefaultOldRoleDb;
 };