X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.cpp;h=180ed50ff1fb55ebd933302e74cfd4b9d0bdcf75;hb=de09cba1d12af38ff2e7e4312d67624fe63bf0e4;hp=f38dae95af3372222028232312f2df6bf31ca743;hpb=540e931ec79129c8776f48434ff5b230b53337f1;p=r2c2.git

diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp
index f38dae9..180ed50 100644
--- a/source/designer/designer.cpp
+++ b/source/designer/designer.cpp
@@ -9,10 +9,10 @@ Distributed under the GPL
 #include <cmath>
 #include <iostream>
 #include <GL/gl.h>
-#include <SDL.h>
 #include <msp/gl/rendermode.h>
 #include <msp/gl/select.h>
 #include <msp/gl/texture2d.h>
+#include <msp/input/keys.h>
 #include <msp/strings/codec.h>
 #include <msp/strings/lexicalcast.h>
 #include <msp/strings/utf8.h>
@@ -103,12 +103,17 @@ Designer::~Designer()
 
 int Designer::main()
 {
-	setenv("__GL_SYNC_TO_VBLANK", "1", 0);
-	SDL_Init(SDL_INIT_VIDEO);
-	SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
-	SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 4);
-	SDL_SetVideoMode(screen_w, screen_h, 32, SDL_OPENGL);
-	SDL_EnableUNICODE(1);
+	dpy=new Graphics::Display;
+	wnd=new Graphics::Window(*dpy, screen_w, screen_h);
+	glc=new Graphics::GLContext(*wnd);
+
+	wnd->signal_close.connect(sigc::bind(sigc::mem_fun(this, &Designer::exit), 0));
+	wnd->signal_key_press.connect(sigc::mem_fun(this, &Designer::key_press));
+	wnd->signal_key_release.connect(sigc::mem_fun(this, &Designer::key_release));
+	wnd->signal_button_press.connect(sigc::mem_fun(this, &Designer::button_press));
+	wnd->signal_pointer_motion.connect(sigc::mem_fun(this, &Designer::pointer_motion));
+
+	wnd->show();
 
 	glEnableClientState(GL_VERTEX_ARRAY);
 	glEnable(GL_DEPTH_TEST);
@@ -131,7 +136,9 @@ int Designer::main()
 	delete font_tex;
 	delete input;
 
-	SDL_Quit();
+	delete glc;
+	delete wnd;
+	delete dpy;
 
 	return exit_code;
 }
@@ -163,36 +170,12 @@ void Designer::map_pointer_coords(int x, int y, float &gx, float &gy)
 
 void Designer::tick()
 {
-	SDL_Event event;
-	while(SDL_PollEvent(&event))
-	{
-		float gx, gy;
-		switch(event.type)
-		{
-		case SDL_MOUSEBUTTONDOWN:
-			map_pointer_coords(event.button.x, event.button.y, gx, gy);
-			button_press(event.button.x, screen_h-1-event.button.y, gx, gy, event.button.button);
-			break;
-		case SDL_MOUSEMOTION:
-			map_pointer_coords(event.motion.x, event.motion.y, gx, gy);
-			pointer_motion(event.motion.x, screen_h-1-event.motion.y, gx, gy);
-			break;
-		case SDL_KEYDOWN:
-			key_press(event.key.keysym.sym, event.key.keysym.mod, event.key.keysym.unicode);
-			break;
-		case SDL_KEYUP:
-			key_release(event.key.keysym.sym, event.key.keysym.mod);
-			break;
-		case SDL_QUIT:
-			exit(0);
-			break;
-		}
-	}
-
-	const Time::TimeStamp t=Time::now();
-	float dt=(t-last_tick)/Time::sec;
+	const Msp::Time::TimeStamp t=Msp::Time::now();
+	float dt=(t-last_tick)/Msp::Time::sec;
 	last_tick=t;
 
+	dpy->tick();
+
 	if(move_y)
 	{
 		cam_pos.x+=cos(cam_yaw)*dt*move_y;
@@ -266,55 +249,57 @@ void Designer::tick()
 		else
 			tooltip="";
 
-		tooltip_timeout=Time::TimeStamp();
+		tooltip_timeout=Msp::Time::TimeStamp();
 	}
 
 	render();
 
-	SDL_GL_SwapBuffers();
+	glc->swap_buffers();
 }
 
 /*** private ***/
 
-void Designer::key_press(unsigned key, unsigned mod, wchar_t ch)
+void Designer::key_press(unsigned code, unsigned mod, wchar_t ch)
 {
+	unsigned key=Msp::Input::key_from_sys(code);
+
 	if(mode==INPUT)
 	{
 		input->key_press(key, mod, ch);
 		return;
 	}
 
-	if(key==SDLK_RSHIFT || key==SDLK_LSHIFT)
+	if(key==Msp::Input::KEY_SHIFT_L || key==Msp::Input::KEY_SHIFT_R)
 		shift=true;
 
-	if(key==SDLK_n)
+	if(key==Msp::Input::KEY_N)
 		mode=CATALOGUE;
-	else if(key==SDLK_g)
+	else if(key==Msp::Input::KEY_G)
 	{
 		manipulator->start_move();
 		mode=MANIPULATE;
 	}
-	else if(key==SDLK_r)
+	else if(key==Msp::Input::KEY_R)
 	{
 		manipulator->start_rotate();
 		mode=MANIPULATE;
 	}
-	else if(key==SDLK_d)
+	else if(key==Msp::Input::KEY_D)
 	{
 		manipulator->duplicate();
 		manipulator->start_move();
 		mode=MANIPULATE;
 	}
-	else if(key==SDLK_w)
+	else if(key==Msp::Input::KEY_W)
 	{
-		input=new Input(*this, "Filename");
+		input=new ::Input(*this, "Filename");
 		input->signal_cancel.connect(sigc::mem_fun(this, &Designer::input_dismiss));
 		input->signal_accept.connect(sigc::mem_fun(this, &Designer::save_accept));
 		mode=INPUT;
 	}
-	else if(key==SDLK_PLUS)
+	else if(key==Msp::Input::KEY_PLUS)
 		selection->select_more();
-	else if(key==SDLK_l && (mod&KMOD_SHIFT))
+	else if(key==Msp::Input::KEY_L && (mod&1))
 	{
 		const set<Track *> &tracks=layout->get_tracks();
 		float len=0;
@@ -322,19 +307,19 @@ void Designer::key_press(unsigned key, unsigned mod, wchar_t ch)
 			len+=(*i)->get_type().get_total_length();
 		cout<<"Total length: "<<len<<"m\n";
 	}
-	else if(key==SDLK_l)
+	else if(key==Msp::Input::KEY_L)
 		selection->select_linked();
-	else if(key==SDLK_m)
+	else if(key==Msp::Input::KEY_M)
 	{
 		measure->start();
 		mode=MEASURE;
 	}
-	else if(key==SDLK_z)
+	else if(key==Msp::Input::KEY_Z)
 	{
 		manipulator->start_elevate();
 		mode=MANIPULATE;
 	}
-	else if(key==SDLK_ESCAPE)
+	else if(key==Msp::Input::KEY_ESC)
 	{
 		if(mode==MANIPULATE)
 			manipulator->cancel();
@@ -343,7 +328,7 @@ void Designer::key_press(unsigned key, unsigned mod, wchar_t ch)
 		else
 			selection->clear();
 	}
-	else if(key==SDLK_x)
+	else if(key==Msp::Input::KEY_X)
 	{
 		set<Track *> tracks=selection->get_tracks();
 		selection->clear();
@@ -353,7 +338,7 @@ void Designer::key_press(unsigned key, unsigned mod, wchar_t ch)
 			delete *i;
 		}
 	}
-	else if(key==SDLK_f && (mod&KMOD_SHIFT))
+	else if(key==Msp::Input::KEY_F && (mod&1))
 	{
 		const set<Track *> &tracks=selection->get_tracks();
 		const set<Track *> &ltracks=layout->get_tracks();
@@ -372,81 +357,88 @@ void Designer::key_press(unsigned key, unsigned mod, wchar_t ch)
 				t3d.set_color(GL::Color(1, 1, 1));
 		}
 	}
-	else if(key==SDLK_f)
+	else if(key==Msp::Input::KEY_F)
 		manipulator->flatten();
-	else if(key==SDLK_e && (mod&KMOD_SHIFT))
+	else if(key==Msp::Input::KEY_E && (mod&1))
 		manipulator->even_slope(true);
-	else if(key==SDLK_e)
+	else if(key==Msp::Input::KEY_E)
 		manipulator->even_slope();
-	else if(key==SDLK_t)
+	else if(key==Msp::Input::KEY_T)
 	{
 		Track *track=selection->get_track();
 		if(selection->size()==1 && track->get_type().get_n_routes()>1)
 		{
 			ostringstream ss;
 			ss<<track->get_turnout_id();
-			input=new Input(*this, "Turnout ID", ss.str());
+			input=new ::Input(*this, "Turnout ID", ss.str());
 			input->signal_cancel.connect(sigc::mem_fun(this, &Designer::input_dismiss));
 			input->signal_accept.connect(sigc::mem_fun(this, &Designer::turnout_id_accept));
 			mode=INPUT;
 		}
 	}
-	else if(key==SDLK_s)
+	else if(key==Msp::Input::KEY_S)
 	{
 		Track *track=selection->get_track();
 		if(selection->size()==1 && track->get_type().get_n_routes()==1)
 		{
 			ostringstream ss;
 			ss<<track->get_sensor_id();
-			input=new Input(*this, "Sensor ID", ss.str());
+			input=new ::Input(*this, "Sensor ID", ss.str());
 			input->signal_cancel.connect(sigc::mem_fun(this, &Designer::input_dismiss));
 			input->signal_accept.connect(sigc::mem_fun(this, &Designer::sensor_id_accept));
 			mode=INPUT;
 		}
 	}
-	else if(key==SDLK_RIGHT)
+	else if(key==Msp::Input::KEY_RIGHT)
 		rotate=-1;
-	else if(key==SDLK_LEFT)
+	else if(key==Msp::Input::KEY_LEFT)
 		rotate=1;
-	else if(key==SDLK_UP)
+	else if(key==Msp::Input::KEY_UP)
 		move_y=1;
-	else if(key==SDLK_DOWN)
+	else if(key==Msp::Input::KEY_DOWN)
 		move_y=-1;
-	else if(key==SDLK_INSERT)
+	else if(key==Msp::Input::KEY_INSERT)
 		zoom=-1;
-	else if(key==SDLK_PAGEUP)
+	else if(key==Msp::Input::KEY_PGUP)
 		zoom=1;
-	else if(key==SDLK_HOME)
+	else if(key==Msp::Input::KEY_HOME)
 		pitch=1;
-	else if(key==SDLK_END)
+	else if(key==Msp::Input::KEY_END)
 		pitch=-1;
-	else if(key==SDLK_DELETE)
+	else if(key==Msp::Input::KEY_DELETE)
 		move_x=-1;
-	else if(key==SDLK_PAGEDOWN)
+	else if(key==Msp::Input::KEY_PGDN)
 		move_x=1;
 }
 
-void Designer::key_release(unsigned key, unsigned)
+void Designer::key_release(unsigned code, unsigned)
 {
+	unsigned key=Msp::Input::key_from_sys(code);
+
 	if(mode==INPUT)
 		return;
 
-	if(key==SDLK_RSHIFT || key==SDLK_LSHIFT)
+	if(key==Msp::Input::KEY_SHIFT_L || key==Msp::Input::KEY_SHIFT_R)
 		shift=false;
-	else if(key==SDLK_RIGHT || key==SDLK_LEFT)
+	else if(key==Msp::Input::KEY_RIGHT || key==Msp::Input::KEY_LEFT)
 		rotate=0;
-	else if(key==SDLK_UP || key==SDLK_DOWN)
+	else if(key==Msp::Input::KEY_UP || key==Msp::Input::KEY_DOWN)
 		move_y=0;
-	else if(key==SDLK_INSERT || key==SDLK_PAGEUP)
+	else if(key==Msp::Input::KEY_INSERT || key==Msp::Input::KEY_PGUP)
 		zoom=0;
-	else if(key==SDLK_HOME || key==SDLK_END)
+	else if(key==Msp::Input::KEY_HOME || key==Msp::Input::KEY_END)
 		pitch=0;
-	else if(key==SDLK_DELETE || key==SDLK_PAGEDOWN)
+	else if(key==Msp::Input::KEY_DELETE || key==Msp::Input::KEY_PGDN)
 		move_x=0;
 }
 
-void Designer::button_press(int x, int y, float gx, float gy, unsigned btn)
+void Designer::button_press(int x, int y, unsigned btn, unsigned)
 {
+	y=screen_h-y-1;
+
+	float gx, gy;
+	map_pointer_coords(x, y, gx, gy);
+
 	if(mode==CATALOGUE)
 	{
 		if(btn==1)
@@ -486,13 +478,18 @@ void Designer::button_press(int x, int y, float gx, float gy, unsigned btn)
 		measure->button_press(x, y, gx, gy, btn);
 }
 
-void Designer::pointer_motion(int x, int y, float gx, float gy)
+void Designer::pointer_motion(int x, int y)
 {
+	y=screen_h-y-1;
+
+	float gx, gy;
+	map_pointer_coords(x, y, gx, gy);
+
 	if(mode==SELECT || mode==CATALOGUE)
 	{
 		pointer_x=x;
 		pointer_y=y;
-		tooltip_timeout=Time::now()+100*Time::msec;
+		tooltip_timeout=Msp::Time::now()+100*Msp::Time::msec;
 	}
 
 	if(mode!=INPUT)