Rewrite input even handling

[r2c2.git] / source / engineer / engineer.h

diff --git a/source/engineer/engineer.h b/source/engineer/engineer.h
index 85dc347937b1f7d55d1e7654186f3911a01bff48..2bb079d62f3ab5c8c1d77ceab832294611f30bee 100644 (file)
--- a/source/engineer/engineer.h
+++ b/source/engineer/engineer.h
@@ -30,6 +30,8 @@ private:
        Options options;
 
        Msp::Graphics::SimpleGLWindow window;
+       Msp::Input::Keyboard keyboard;
+       Msp::Input::Mouse mouse;
        Msp::GLtk::Resources ui_res;
        Msp::GLtk::Root *root;
 
@@ -55,8 +57,7 @@ private:
        R2C2::Track *picking_track;
        int picking_entry;
        R2C2::Path3D *picking_path;
-       int pointer_x;
-       int pointer_y;
+       R2C2::Vector pointer;
        bool pointer_moved;
 
 public:
@@ -78,14 +79,14 @@ public:
        void quit() { exit(0); }
 private:
        void tick();
-       void button_press(int, int, unsigned, unsigned);
-       void pointer_motion(int, int);
+       void button_press(unsigned);
+       void axis_motion(unsigned, float, float);
        void view_all();
        void set_block_color(const R2C2::Block &, const Msp::GL::Color &);
        void reset_block_color(const R2C2::Block &);
        void sensor_event(unsigned, bool);
        void block_reserved(const R2C2::Block &, const R2C2::Train *);
-       R2C2::Track *pick_track(int, int);
+       R2C2::Track *pick_track(const R2C2::Vector &);
        void train_added(R2C2::Train &);
        virtual void sighandler(int);
 };