X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Froot.h;h=b0751b688985265d76566894c5dab694863ef5c5;hb=4b52d16bc895f9d969383d7a7d6a3558c1972cc5;hp=5d5a3d1fa5e8e84c6f9f27eb96888fdc19238f77;hpb=eb428857eabd6f73441ed777d485885e252f5d31;p=libs%2Fgltk.git

diff --git a/source/root.h b/source/root.h
index 5d5a3d1..b0751b6 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"
 
@@ -25,22 +28,28 @@ public:
 private:
 	const 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;
 	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
 	window's size, and input devices are created automatically. */
 	Root(const Resources &, Graphics::Window &);
 
-	Root(const Resources &, Input::Keyboard *, Input::Mouse *);
+	/** 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 *, Input::Touchscreen * = 0);
 private:
-	void init();
+	void init(Graphics::Window *);
 public:
 	virtual ~Root();
 
@@ -57,11 +66,16 @@ private:
 	bool button_press_event(unsigned);
 	bool button_release_event(unsigned);
 	bool axis_motion_event(unsigned, float, float);
-	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 &);
 };
 
 } // namespace GLtk