From 3c54de751f2d5a57766dc06fc854db31df5d79cf Mon Sep 17 00:00:00 2001
From: steffen <steffen>
Date: Tue, 4 Feb 2014 20:33:00 +0000
Subject: [PATCH] gtk version is running again..

---
 Makefile             |  2 +-
 draw/draw.c          |  1 -
 draw/draw_gui.c      |  1 +
 gtk/gtk_map_screen.c | 16 ++++++++--------
 gui/gui.c            |  4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 756e275..5dcfaae 100644
--- a/Makefile
+++ b/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
diff --git a/draw/draw.c b/draw/draw.c
index 1d479fc..3c60bf0 100644
--- a/draw/draw.c
+++ b/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;
diff --git a/draw/draw_gui.c b/draw/draw_gui.c
index 30a4e3e..e8f9539 100644
--- a/draw/draw_gui.c
+++ b/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 ();
 	}
 		
diff --git a/gtk/gtk_map_screen.c b/gtk/gtk_map_screen.c
index 2c0c53f..9f3375c 100644
--- a/gtk/gtk_map_screen.c
+++ b/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 == 1 && lo == 0x08)  gevent.keyval = lo;
-	if (hi == 1 && lo == 0x1b)  gevent.keyval = lo;
-	if (hi == 1 && lo == 0x0d)  gevent.keyval = lo;
-	if (hi == 1 && lo == 0x51)  gevent.keyval = lo;
-	if (hi == 1 && lo == 0x53)  gevent.keyval = lo;
-
-	d_printf ("keyval: '%c'  lo(%x) hi(%x)  gevent:%lx", event->keyval, lo, hi, gevent.keyval);
+	if (hi == 0) 				gevent.keychar = lo;
+	if (hi == 1 && lo == 0x08)  gevent.keychar = lo;
+	if (hi == 1 && lo == 0x1b)  gevent.keychar = lo;
+	if (hi == 1 && lo == 0x0d)  gevent.keychar = lo;
+	if (hi == 1 && lo == 0x51)  gevent.keychar = lo;
+	if (hi == 1 && lo == 0x53)  gevent.keychar = lo;
+
+	d_printf ("keyval: '%c'  lo(%x) hi(%x)  gevent:%lx", event->keyval, lo, hi, gevent.keychar);
 
 	gevent.event = EGUI_KEYCHAR;
 	gui_event (gevent);
diff --git a/gui/gui.c b/gui/gui.c
index bd8a6de..d56c1c8 100644
--- a/gui/gui.c
+++ b/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;
 };