From 68803c1921e9b6eef7f2a6d14ee586f6b4804861 Mon Sep 17 00:00:00 2001
From: steffen <steffen>
Date: Wed, 27 Feb 2013 23:50:17 +0000
Subject: [PATCH] gui events and items changed..

---
 gui/gui.c       |  6 +++---
 gui/gui_entry.c | 18 ++++++++----------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/gui/gui.c b/gui/gui.c
index 43a6754..e73cc5e 100644
--- a/gui/gui.c
+++ b/gui/gui.c
@@ -1,4 +1,4 @@
-/* $Id: gui.c,v 1.12 2013/02/27 22:21:35 steffen Exp $ */
+/* $Id: gui.c,v 1.13 2013/02/27 23:50:17 steffen Exp $ */
 /***************************************************************************
  *            gui.c
  *
@@ -157,7 +157,7 @@ int gui_event (GUIEvent event) {
 			if (GUI_ITEM_IS_INSIDE (currentwin->items[i], winpos))
 				item = currentwin->items[i];
 
-		d_printf ("item:%p , type:%d , focus:%p", item, item ? item->type : -1, currentwin->focus);
+		// d_printf ("item:%p , type:%d , focus:%p", item, item ? item->type : -1, currentwin->focus);
 		
 		if (item)	switch (item->type) {
 			case (GUI_BUTTON):
@@ -183,7 +183,7 @@ int gui_event (GUIEvent event) {
 	}
 
 	/* no gui active nor any window is responsible.. */	
-	d_printf ("no event..");
+	// d_printf ("no event..");
 	switch (event.event) {
 		case (EGUI_MOUSERELEASED):
 			draw_mousebtnup (event.mousepos.x, event.mousepos.y, event.mousebtn);
diff --git a/gui/gui_entry.c b/gui/gui_entry.c
index cd8d5f2..9fa566d 100644
--- a/gui/gui_entry.c
+++ b/gui/gui_entry.c
@@ -1,4 +1,4 @@
-/* $Id: gui_entry.c,v 1.6 2013/02/27 22:21:35 steffen Exp $ */
+/* $Id: gui_entry.c,v 1.7 2013/02/27 23:50:17 steffen Exp $ */
 /***************************************************************************
  *            gui_entry.c
  *  
@@ -73,14 +73,12 @@ void gui_entry_event (GUIItem *item, GUIEvent *event) {
 
 	if (item) entry = (GUIEntry *) item->data;
 
-	d_printf ("event: %d pos: %d,%d", event->event, event->mousepos.x, event->mousepos.y);
+	d_printf ("gui_entry_event: %d pos: %d,%d", event->event, event->mousepos.x, event->mousepos.y);
 	
-	if (event->event == EGUI_MOUSERELEASED 
-	    && event->mousepos.x < item->x && item->x+item->w >= event->mousepos.x
-		&& event->mousepos.y < item->y && item->y+item->h >= event->mousepos.y) {
+	if (event->event == EGUI_MOUSERELEASED) {
 			d_printf ("gui_entry_event set focus");
 			currentwin->focus = item;
-		}
+	}
 
 	else if (event->event == EGUI_KEYRELEASED) {
 		d_printf ("gui_entry_event: curpos:%d len:%d text:%s char:%x", entry->curpos, strlen (entry->text), entry->text, event->keyval);
@@ -108,10 +106,10 @@ void gui_entry_event (GUIItem *item, GUIEvent *event) {
 			// ignore all the rest
 		}
 		else {
-					  strncpy (text1, entry->text, GUI_TEXTLEN );
-					  snprintf (entry->text, GUI_TEXTLEN, "%s%c", text1, event->keyval);
-					  entry->curpos++;
-				  }
+			strncpy (text1, entry->text, GUI_TEXTLEN );
+			snprintf (entry->text, GUI_TEXTLEN, "%s%c", text1, event->keyval);
+			entry->curpos++;
+		}
 	}
 	currentwin->screen_changed = 1;
 	return;