From c8eb9d6e0c5bb88df7eb8ad1ca0cf8d5b7b6b99b Mon Sep 17 00:00:00 2001 From: steffen Date: Fri, 1 Mar 2013 19:56:56 +0000 Subject: [PATCH] ... --- gui/gui.c | 6 +++--- gui/gui_entry.c | 3 ++- sdlgl/sdl_main.c | 7 ++++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/gui/gui.c b/gui/gui.c index 4b21f77..29dafd8 100644 --- a/gui/gui.c +++ b/gui/gui.c @@ -1,4 +1,4 @@ -/* $Id: gui.c,v 1.15 2013/02/28 23:43:19 steffen Exp $ */ +/* $Id: gui.c,v 1.16 2013/03/01 19:56:56 steffen Exp $ */ /*************************************************************************** * gui.c * @@ -153,12 +153,12 @@ int gui_event (GUIEvent event) { winpos.y = event.mousepos.y - currentwin->y; item = currentwin->focus; - + for (i = 0; i < GUI_MAX_ITEM; i++) if (currentwin->items[i] != NULL) 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 , event:%d", item, item ? item->type : -1, currentwin->focus, event.event); if (item) switch (item->type) { case (GUI_BUTTON): diff --git a/gui/gui_entry.c b/gui/gui_entry.c index 6da7be3..3dadac0 100644 --- a/gui/gui_entry.c +++ b/gui/gui_entry.c @@ -1,4 +1,4 @@ -/* $Id: gui_entry.c,v 1.8 2013/02/28 23:19:59 steffen Exp $ */ +/* $Id: gui_entry.c,v 1.9 2013/03/01 19:56:56 steffen Exp $ */ /*************************************************************************** * gui_entry.c * @@ -113,6 +113,7 @@ void gui_entry_event (GUIItem *item, GUIEvent *event) { // ignore all the rest } else { + d_printf ("new char:"); strncpy (text1, entry->text, GUI_TEXTLEN ); snprintf (entry->text, GUI_TEXTLEN, "%s%c", text1, event->keyval); entry->curpos++; diff --git a/sdlgl/sdl_main.c b/sdlgl/sdl_main.c index af8a171..b9336e3 100644 --- a/sdlgl/sdl_main.c +++ b/sdlgl/sdl_main.c @@ -166,17 +166,18 @@ int msdl_eventloop () { case SDL_KEYDOWN: { int keyu = 0; - + d_printf ("keydown. old_key:%d keysym:%d ukey:%d", oldkey, event.key.keysym.sym, event.key.keysym.unicode); if (oldkey != event.key.keysym.sym) { keyu = oldkey = event.key.keysym.unicode; gevent.keyval = keyu; gevent.event = EGUI_KEYCHAR; - gevent.mousepos.x = event.motion.x; - gevent.mousepos.y = event.motion.y; + gevent.mousepos.x = -1; + gevent.mousepos.y = -1; if (gui_event (gevent) != 0) draw(); } } break; case SDL_KEYUP: + d_printf ("keyup. old_key:%d keysym:%d ukey:%d", oldkey, event.key.keysym.sym, event.key.keysym.unicode); oldkey = 0; break;