Refactor Dialog to separate the autodeletion functionality

[libs/gltk.git] / source / root.h

diff --git a/source/root.h b/source/root.h
index 9ebe7cf57d823fdf59cf63d25829251f51b0b806..29fff237430c156e0a2b94ef3ad89bbb269d38fb 100644 (file)
--- a/source/root.h
+++ b/source/root.h
@@ -1,6 +1,7 @@
 #ifndef MSP_GLTK_ROOT_H_
 #define MSP_GLTK_ROOT_H_
 
+#include <memory>
 #include <sigc++/trackable.h>
 #include <msp/gl/blend.h>
 #include <msp/gl/camera.h>
@@ -32,21 +33,23 @@ public:
 
 private:
        Resources &resources;
-       Input::Keyboard *keyboard = 0;
-       InputMethod *input_method = 0;
-       Input::Mouse *mouse = 0;
-       Input::Touchscreen *touchscreen = 0;
-       bool own_input = false;
-       Label *lbl_tooltip = 0;
+       Input::Keyboard *keyboard = nullptr;
+       std::unique_ptr<InputMethod> input_method;
+       Input::Mouse *mouse = nullptr;
+       Input::Touchscreen *touchscreen = nullptr;
+       std::unique_ptr<Input::Device> own_input[2];
+       Label *lbl_tooltip = nullptr;
        int pointer_x = 0;
        int pointer_y = 0;
        Time::TimeStamp tooltip_timeout;
        Time::TimeStamp last_tick;
-       Widget *tooltip_target = 0;
+       Widget *tooltip_target = nullptr;
        Msp::GL::Camera camera;
-       Msp::GL::Program *shprog = 0;
+       Msp::GL::Program *shprog = nullptr;
        Msp::GL::Blend blend;
 
+       Root(Resources &, Graphics::Window &, std::unique_ptr<Input::Keyboard>, std::unique_ptr<Input::Mouse>);
+
 public:
        /** Creates a Root widget for a window.  The geometry is set to match the
        window's size, and input devices are created automatically. */
@@ -54,18 +57,17 @@ public:
 
        /** Creates a Root widget with custom input devices.  If window is not null,
        it is used to set the widget's initial geometry. */
-       Root(Resources &, Graphics::Window *, Input::Keyboard *, Input::Mouse *, Input::Touchscreen * = 0);
-       virtual ~Root();
+       Root(Resources &, Graphics::Window *, Input::Keyboard *, Input::Mouse *, Input::Touchscreen * = nullptr);
 
-       virtual const char *get_class() const { return "root"; }
+       const char *get_class() const override { return "root"; }
 
        Resources &get_resources() const { return resources; }
        virtual unsigned get_width() const { return geom.w; }
        virtual unsigned get_height() const { return geom.h; }
 
        void tick();
-       virtual void setup_frame(GL::Renderer &);
-       virtual void render(GL::Renderer &, GL::Tag = GL::Tag()) const;
+       void setup_frame(GL::Renderer &) override;
+       void render(GL::Renderer &, GL::Tag = GL::Tag()) const override;
 
 private:
        bool button_press_event(unsigned);
@@ -79,8 +81,8 @@ private:
        void get_touch(unsigned, int &, int &);
        void update_camera();
 
-       virtual void on_size_change();
-       virtual void on_child_added(Widget &);
+       void on_size_change() override;
+       void on_child_added(Widget &) override;
 };
 
 } // namespace GLtk