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

diff --git a/source/engineer/engineer.h b/source/engineer/engineer.h
index dc48e70..f6e23bc 100644
--- a/source/engineer/engineer.h
+++ b/source/engineer/engineer.h
@@ -2,10 +2,13 @@
 #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/locotype.h"
 #include "libmarklin/trafficmanager.h"
 #include "libmarklin/train.h"
 #include "3d/layout.h"
@@ -16,17 +19,11 @@ class TrainProperties;
 
 class Engineer: public Msp::Application
 {
-public:
-	Engineer(int argc, char **argv);
-	~Engineer();
-
-	Marklin::Control &get_control()    { return control; }
-	Marklin::Train   *add_train(unsigned);
-	int      main();
-	void     quit() { exit(0); }
 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;
@@ -38,8 +35,7 @@ private:
 	float              cam_rot;
 	Msp::GLtk::Resources ui_res;
 	MainPanel          *main_panel;
-	TrainPanelSeq      train_panels;
-	std::string        status_text;
+	std::list<TrainPanel *> train_panels;
 	bool               no_lighting;
 	Marklin::TrafficManager *trfc_mgr;
 	Marklin::Train     *placing_train;
@@ -49,13 +45,26 @@ private:
 	TrainProperties    *train_prop;
 	bool               train_prop_stale;
 
+public:
+	Engineer(int argc, char **argv);
+	~Engineer();
+
+	const Marklin::Catalogue &get_catalogue() const { return catalogue; }
+	Marklin::Control &get_control()    { return control; }
+	void             add_train();
+	Marklin::Train   *add_train(const Marklin::LocoType &, unsigned);
+	void     place_train(Marklin::Train &);
+	int      main();
+	void     quit() { exit(0); }
+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 &);
+	void set_block_color(const Marklin::Block &, const Msp::GL::Color &);
+	void reset_block_color(const Marklin::Block &);
 	void sensor_event(bool, Marklin::Sensor *);
 	void block_reserved(const Marklin::Block &, const Marklin::Train *);
 	void project_3d();