X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Froot.h;h=5d721c0c2370f5e1ac68d68ef1aee8e987bdbde0;hb=79af58bcfa941e0f2c33b172c9e924522ebcdfea;hp=a74065dc9c08d8d1e44956e8695a7cef50d567a4;hpb=50f11cec86c034fbee2ab332503266808b1eba74;p=libs%2Fgltk.git

diff --git a/source/root.h b/source/root.h
index a74065d..5d721c0 100644
--- a/source/root.h
+++ b/source/root.h
@@ -2,9 +2,12 @@
 #define MSP_GLTK_ROOT_H_
 
 #include <sigc++/trackable.h>
+#include <msp/gl/camera.h>
+#include <msp/gl/program.h>
 #include <msp/graphics/window.h>
 #include <msp/input/keyboard.h>
 #include <msp/input/mouse.h>
+#include <msp/input/touchscreen.h>
 #include <msp/time/timestamp.h>
 #include "panel.h"
 
@@ -26,12 +29,15 @@ private:
 	const Resources &resources;
 	Input::Keyboard *keyboard;
 	Input::Mouse *mouse;
+	Input::Touchscreen *touchscreen;
 	bool own_input;
 	Label *lbl_tooltip;
 	int pointer_x;
 	int pointer_y;
 	Time::TimeStamp tooltip_timeout;
 	Widget *tooltip_target;
+	Msp::GL::Camera camera;
+	Msp::GL::Program *shprog;
 
 public:
 	/** Creates a Root widget for a window.  The geometry is set to match the
@@ -40,7 +46,7 @@ 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(const Resources &, Graphics::Window *, Input::Keyboard *, Input::Mouse *);
+	Root(const Resources &, Graphics::Window *, Input::Keyboard *, Input::Mouse *, Input::Touchscreen * = 0);
 private:
 	void init(Graphics::Window *);
 public:
@@ -62,9 +68,15 @@ private:
 	bool key_press_event(unsigned);
 	bool key_release_event(unsigned);
 	bool character_event(StringCodec::unichar);
+	bool touch_press_event(unsigned);
+	bool touch_release_event(unsigned);
+	bool touch_motion_event(unsigned, float, float);
 
 	void get_pointer(int &, int &);
+	void get_touch(unsigned, int &, int &);
+	void update_camera();
 
+	virtual void on_geometry_change();
 	virtual void on_child_added(Widget &);
 };