Convert designer to use mspgbase instead of sdl

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

diff --git a/source/designer/designer.h b/source/designer/designer.h
index 553b25c3e4faf91d35f554c68128fe53a2c832f4..c2c949eb409e706243db867eeb0115c2467c6934 100644 (file)
--- a/source/designer/designer.h
+++ b/source/designer/designer.h
@@ -1,8 +1,18 @@
+/* $Id$
+
+This file is part of the MSP Märklin suite
+Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa
+Distributed under the GPL
+*/
+
 #ifndef DESIGNER_H_
 #define DESIGNER_H_
 
 #include <string>
 #include <msp/core/application.h>
+#include <msp/gbase/display.h>
+#include <msp/gbase/window.h>
+#include <msp/gbase/glcontext.h>
 #include <msp/gl/font.h>
 #include <msp/time/timestamp.h>
 #include "libmarklin/catalogue.h"
@@ -17,14 +27,6 @@ class Selection;
 
 class Designer: public Msp::Application
 {
-public:
-       Designer(int, char **);
-       Marklin::Layout *get_layout() { return layout; }
-       Marklin::Layout3D *get_layout_3d() { return layout_3d; }
-       Msp::GL::Font   &get_font()   { return *font; }
-       int             main();
-       void            map_pointer_coords(int, int, float &, float &);
-       ~Designer();
 private:
        enum Mode
        {
@@ -35,6 +37,9 @@ private:
                INPUT
        };
 
+       Msp::Graphics::Display *dpy;
+       Msp::Graphics::Window *wnd;
+       Msp::Graphics::GLContext *glc;
        unsigned       screen_w;
        unsigned       screen_h;
        Msp::GL::Font  *font;
@@ -65,11 +70,21 @@ private:
        Msp::Time::TimeStamp tooltip_timeout;
        Msp::Time::TimeStamp last_tick;
 
+public:
+       Designer(int, char **);
+       ~Designer();
+
+       Marklin::Layout *get_layout() { return layout; }
+       Marklin::Layout3D *get_layout_3d() { return layout_3d; }
+       Msp::GL::Font   &get_font()   { return *font; }
+       int             main();
+       void            map_pointer_coords(int, int, float &, float &);
+private:
        void tick();
        void key_press(unsigned, unsigned, wchar_t);
        void key_release(unsigned, unsigned);
-       void button_press(int, int, float, float, unsigned);
-       void pointer_motion(int, int, float, float);
+       void button_press(int, int, unsigned, unsigned);
+       void pointer_motion(int, int);
        void project_3d();
        void apply_camera();
        void render();