X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Froot.h;h=5dbf7bb1aa112a317f59763ac6fd9c8ccb7bad9a;hb=HEAD;hp=7d5a592805f187a096e1fbc5e6f1a40822981d78;hpb=aa939035cbb1bc2b89f77255953b2927690e4cca;p=libs%2Fgltk.git

diff --git a/source/root.h b/source/root.h
index 7d5a592..29fff23 100644
--- a/source/root.h
+++ b/source/root.h
@@ -1,7 +1,9 @@
 #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>
 #include <msp/gl/program.h>
 #include <msp/gl/renderable.h>
@@ -10,6 +12,7 @@
 #include <msp/input/mouse.h>
 #include <msp/input/touchscreen.h>
 #include <msp/time/timestamp.h>
+#include "mspgltk_api.h"
 #include "panel.h"
 
 namespace Msp {
@@ -23,25 +26,29 @@ input from keyboard and mouse.  It can be used by itself or in a GL::Pipeline.
 Due to its specialized nature it's recommended to not use it with Scenes or
 other containers.
 */
-class Root: public Panel, public GL::Renderable, public sigc::trackable
+class MSPGLTK_API Root: public Panel, public GL::Renderable, public sigc::trackable
 {
 public:
 	sigc::signal<std::string, int, int> signal_tooltip;
 
 private:
 	Resources &resources;
-	Input::Keyboard *keyboard;
-	InputMethod *input_method;
-	Input::Mouse *mouse;
-	Input::Touchscreen *touchscreen;
-	bool own_input;
-	Label *lbl_tooltip;
-	int pointer_x;
-	int pointer_y;
+	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;
-	Widget *tooltip_target;
+	Time::TimeStamp last_tick;
+	Widget *tooltip_target = nullptr;
 	Msp::GL::Camera camera;
-	Msp::GL::Program *shprog;
+	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
@@ -50,21 +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);
-private:
-	void init(Graphics::Window *);
-public:
-	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();
-	void render() const;
-	virtual void render(GL::Renderer &, const 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);
@@ -78,8 +81,8 @@ private:
 	void get_touch(unsigned, int &, int &);
 	void update_camera();
 
-	virtual void on_geometry_change();
-	virtual void on_child_added(Widget &);
+	void on_size_change() override;
+	void on_child_added(Widget &) override;
 };
 
 } // namespace GLtk