gtk version is running again..

Makefile

@@ -56,7 +56,7 @@ sposmroute:
 	do if ! make -C $$i; then \
 		exit -2; \
 	fi done
-	$(CC) -o sposmroute -lgtk -lmapsys -lgui -ldraw -lmain -lbase -lgui -Lbase -Lmain -Lgtk -Ldraw -Lgui -Lmapsys `pkg-config --libs gtk+-2.0 libxml-2.0` -lbz2 $(DEBUG)
+	$(CC) -o sposmroute -lgtk -lmapsys -lgui -ldraw -lmain -lbase -lgui -Lbase -Lmain -Lgtk -Ldraw -Lgui -Lmapsys `pkg-config --libs gtk+-2.0 libxml-2.0` -lbz2 -lm $(DEBUG)
 
 cleanapp:
 	rm -rf sposmroute

draw/draw.c

@@ -796,7 +796,6 @@ int draw_mapcopy () {
 void draw () {
 	static int still_drawing = 0;
 	
-//	d_printf ("draw()");
 	/* only run once at the time.. */
 	if (still_drawing) return;
 	still_drawing = 1;

draw/draw_gui.c

@@ -144,6 +144,7 @@ void draw_mouseloop ()
 	if (mousebtn && t - mousebtnpresstime > 1)
 	{
 		mousebtnpresslongtime = 1;
+		d_printf ("draw_mouseloop: long press..");
 		draw ();
 	}
 		

gtk/gtk_map_screen.c

@@ -121,14 +121,14 @@ gboolean map_da_key_press_event (GtkWidget *widget, GdkEventKey *event, gpointer
 	lo = event->keyval & 0x00FF;
 	hi = (event->keyval & 0xFF00) > 8;
 
-	if (hi == 0) 				gevent.keyval = lo;
+	if (hi == 0) 				gevent.keychar = lo;
-	if (hi == 1 && lo == 0x08)  gevent.keyval = lo;
+	if (hi == 1 && lo == 0x08)  gevent.keychar = lo;
-	if (hi == 1 && lo == 0x1b)  gevent.keyval = lo;
+	if (hi == 1 && lo == 0x1b)  gevent.keychar = lo;
-	if (hi == 1 && lo == 0x0d)  gevent.keyval = lo;
+	if (hi == 1 && lo == 0x0d)  gevent.keychar = lo;
-	if (hi == 1 && lo == 0x51)  gevent.keyval = lo;
+	if (hi == 1 && lo == 0x51)  gevent.keychar = lo;
-	if (hi == 1 && lo == 0x53)  gevent.keyval = lo;
+	if (hi == 1 && lo == 0x53)  gevent.keychar = lo;
-
+
-	d_printf ("keyval: '%c'  lo(%x) hi(%x)  gevent:%lx", event->keyval, lo, hi, gevent.keyval);
+	d_printf ("keyval: '%c'  lo(%x) hi(%x)  gevent:%lx", event->keyval, lo, hi, gevent.keychar);
 
 	gevent.event = EGUI_KEYCHAR;
 	gui_event (gevent);

gui/gui.c

@@ -1,4 +1,4 @@
-/* $Id: gui.c,v 1.25 2013/08/01 23:27:38 steffen Exp $ */
+/* $Id: gui.c,v 1.27 2014/02/04 20:33:19 steffen Exp $ */
 /***************************************************************************
  *            gui.c
  *
@@ -189,7 +189,7 @@ int gui_event (GUIEvent event) {
 		default:
 			break;
 	}
-
+	
 	return 0;
 };