X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Fengineer.h;h=1575c0c31e381ad1d18a0a9727b2727746fff3db;hb=aead7f2da831199fbb8f6950b067656b2965c2fa;hp=dc48e70dadac3fe6729fc665318fa8da433a6a91;hpb=52cbe8d99669f843f8f75c51128e2748584dd03a;p=r2c2.git

diff --git a/source/engineer/engineer.h b/source/engineer/engineer.h
index dc48e70..1575c0c 100644
--- a/source/engineer/engineer.h
+++ b/source/engineer/engineer.h
@@ -2,8 +2,10 @@
 #define ENGINEER_H_
 
 #include <msp/core/application.h>
+#include <msp/gbase/glcontext.h>
 #include <msp/gl/font.h>
 #include <msp/gltk/resources.h>
+#include <msp/gltk/root.h>
 #include "libmarklin/catalogue.h"
 #include "libmarklin/control.h"
 #include "libmarklin/trafficmanager.h"
@@ -27,6 +29,10 @@ public:
 private:
 	typedef std::list<TrainPanel *> TrainPanelSeq;
 
+	Msp::Graphics::Display   *dpy;
+	Msp::Graphics::Window    *wnd;
+	Msp::Graphics::GLContext *glc;
+	Msp::GLtk::Root          *root;
 	unsigned           screen_w;
 	unsigned           screen_h;
 	bool               fullscreen;
@@ -39,7 +45,6 @@ private:
 	Msp::GLtk::Resources ui_res;
 	MainPanel          *main_panel;
 	TrainPanelSeq      train_panels;
-	std::string        status_text;
 	bool               no_lighting;
 	Marklin::TrafficManager *trfc_mgr;
 	Marklin::Train     *placing_train;
@@ -51,8 +56,8 @@ private:
 
 	void tick();
 	void key_press(unsigned, unsigned, wchar_t);
-	void button_press(int, int, unsigned);
-	void button_release(int, int, unsigned);
+	void button_press(int, int, unsigned, unsigned);
+	void button_release(int, int, unsigned, unsigned);
 	void pointer_motion(int, int);
 	void view_all();
 	void set_block_color(const Marklin::Block &, const Marklin::Color &);