DSCompositor: remove input initialization including seat/input, make wlCompositor...

Change-Id: I6de6a259f08f26ddc54ee0ba48638cb3455aab25
Signed-off-by: Sung-Jin Park <sj76.park@samsung.com>

diff --git a/src/DSCompositor/DSCompositor.cpp b/src/DSCompositor/DSCompositor.cpp
index 565b0f2..ab79a84 100644 (file)
--- a/src/DSCompositor/DSCompositor.cpp
+++ b/src/DSCompositor/DSCompositor.cpp
@@ -51,10 +51,8 @@ DSCompositorPrivate::DSCompositorPrivate(DSCompositor *p_ptr)
 
 {
        __eventLoop = std::make_unique<DSEventLoop>();
-       __wlCompositor = std::make_unique<DSWaylandCompositor>(new DSObject);
+       __wlCompositor = std::make_shared<DSWaylandCompositor>(new DSObject);
        __displayDevice = std::make_unique<DSDisplayDeviceTDMImpl>();
-       __seat = std::make_unique<DSSeat>();
-       __input = std::make_shared<DSInput>();
 }
 
 DSCompositorPrivate::~DSCompositorPrivate()
@@ -66,7 +64,6 @@ bool DSCompositorPrivate::run()
        DS_GET_PUB(DSCompositor);
 
        __initializeWlDisplay();
-       __initializeInput();
        __initializeOutputs();
        __canvas = pub->_onInitialized();
        if (!__canvas) {
@@ -97,10 +94,9 @@ void DSCompositorPrivate::__initializeWlDisplay()
        __wlCompositor->create();
 }
 
-void DSCompositorPrivate::__initializeInput()
+DSWaylandCompositor *DSCompositorPrivate::getWlCompositor()
 {
-       __seat->addInput(__input);
-       __input->Init();
+       return __wlCompositor.get();
 }
 
 void DSCompositorPrivate::__initializeOutputs()

diff --git a/src/DSCompositor/DSCompositorPrivate.h b/src/DSCompositor/DSCompositorPrivate.h
index 57b5be2..29b25af 100644 (file)
--- a/src/DSCompositor/DSCompositorPrivate.h
+++ b/src/DSCompositor/DSCompositorPrivate.h
@@ -12,6 +12,7 @@ namespace display_server
 class DSSeat;
 class DSInput;
 class DSWaylandCompositor;
+
 class DSCompositorPrivate : public DSObjectPrivate
 {
 DS_PIMPL_USE_PUBLIC(DSCompositor);
@@ -20,23 +21,23 @@ public:
        DSCompositorPrivate(DSCompositor *p_ptr);
        ~DSCompositorPrivate();
 
-       static DSCompositorPrivate *getPrivate(DSCompositor *q) { return q->__d_func(); }
        bool run();
        bool quit();
 
+       static DSCompositorPrivate *getPrivate(DSCompositor *q) { return q->__d_func(); }
+       DSWaylandCompositor *getWlCompositor();
+
 protected:
 
 private:
        std::unique_ptr<DSEventLoop> __eventLoop;
        std::unique_ptr<IDSDisplayDevice> __displayDevice;
-       std::unique_ptr<DSSeat> __seat;
-       std::shared_ptr<DSInput> __input;
-       std::unique_ptr<DSWaylandCompositor> __wlCompositor;
+       std::shared_ptr<DSWaylandCompositor> __wlCompositor;
+
        std::list<std::shared_ptr<IDSOutput>> __outputList;
        std::shared_ptr<DSCanvas> __canvas;
 
        void __initializeWlDisplay();
-       void __initializeInput();
        void __initializeOutputs();
 };