WIP6

Author: mrannanj

src/console/console_cmd.c

@@ -282,7 +282,8 @@ int console_find_by_text(game_state *gs, int argc, char **argv) {
         return 1;
     }
     gui_frame *frame = mechlab_get_frame(game_state_get_scene(gs));
-    component *c = component_find_text(gui_frame_get_root(frame), "NEW");
+    // component *c = component_find_text(gui_frame_get_root(frame), "NEW");
+    component *c = gui_frame_find_text(frame, "NEW");
     if(c == NULL) {
         log_debug("Could not find the component");
         return 1;

src/game/gui/gui_frame.c

@@ -1,5 +1,6 @@
 #include "game/gui/gui_frame.h"
 #include "utils/allocator.h"
+#include "utils/log.h"
 
 typedef struct gui_frame {
     int x;
@@ -48,6 +49,7 @@ component *gui_frame_find(gui_frame *frame, int id) {
 }
 
 component *gui_frame_find_text(gui_frame *frame, const char *text) {
+    log_debug("gui_frame_find_text");
     if(frame->root_node) {
         return component_find_text(frame->root_node, text);
     }

src/game/gui/menu.c

@@ -431,10 +431,13 @@ static component *menu_find(component *c, int id) {
 }
 
 static component *menu_find_text(component *c, const char *text) {
+    log_debug("menu_find_text");
     menu *m = sizer_get_obj(c);
     if(m->submenu) {
+        log_debug("menu_find_text: calling for submenu");
         return component_find_text(m->submenu, text);
     }
+    log_debug("menu_find_text: returning NULL");
     return NULL;
 }
 

src/game/gui/spritebutton.c

@@ -73,6 +73,7 @@ static void spritebutton_tick(component *c) {
 }
 
 static component *spritebutton_find_text(component *c, const char *text) {
+    log_debug("spritebutton_find_text");
     spritebutton *b = widget_get_obj(c);
     if(strcmp(text_c(b->text), text) == 0) {
         return c;
@@ -148,6 +149,7 @@ component *spritebutton_create(const char *text, const surface *img, bool disabl
     widget_set_tick_cb(c, spritebutton_tick);
     widget_set_free_cb(c, spritebutton_free);
     widget_set_layout_cb(c, spritebutton_layout);
+    log_debug("widget_set_find_text_cb(c, spritebutton_find_text): %s", text_c(b->text));
     widget_set_find_text_cb(c, spritebutton_find_text);
     return c;
 }

src/game/gui/trn_menu.c

@@ -1,5 +1,6 @@
 #include "game/gui/trn_menu.h"
 #include "game/gui/sizer.h"
+#include "game/gui/widget.h"
 #include "utils/allocator.h"
 #include "utils/log.h"
 #include "utils/vector.h"
@@ -420,6 +421,46 @@ int trnmenu_is_finished(const component *c) {
     return m->finished;
 }
 
+static component *trnmenu_find_text(component *c, const char *text) {
+    log_debug("trnmenu_find_text");
+
+    iterator it;
+    component **tmp;
+    sizer_begin_iterator(c, &it);
+
+    foreach(it, tmp) {
+        component *t = *tmp;
+        // log_debug("trnmenu_find_text: iterating %p", t);
+
+        // if(!component_is_selectable(t)) {
+        // continue;
+        //}
+        // widget *w = component_get_obj(t);
+        // component_get_obj(t);
+
+        component *found = widget_find_text(t, text);
+        if(found != NULL) {
+            log_debug("trnmenu_find_text: found %p", t);
+            return found;
+        } else {
+            log_debug("trnmenu_find_text: found was NULL on %p", t);
+        }
+    }
+    log_debug("trnmenu_find_text: checking submenu");
+
+    trnmenu *m = sizer_get_obj(c);
+    if(m->submenu != NULL) {
+        log_debug("trnmenu_find_text: submenu is non-NULL");
+        component *found = component_find_text(m->submenu, text);
+        if(found != NULL) {
+            return found;
+        }
+    } else {
+        log_debug("trnmenu_find_text: submenu is NULL");
+    }
+    return NULL;
+}
+
 void trnmenu_set_submenu(component *c, component *submenu) {
     trnmenu *m = sizer_get_obj(c);
     if(m->submenu) {
@@ -480,6 +521,7 @@ component *trnmenu_create(surface *button_sheet, int sheet_x, int sheet_y, bool
     sizer_set_event_cb(c, trnmenu_event);
     sizer_set_tick_cb(c, trnmenu_tick);
     sizer_set_free_cb(c, trnmenu_free);
+    sizer_set_find_text_cb(c, trnmenu_find_text);
 
     return c;
 }

src/game/gui/trn_menu.h

@@ -11,6 +11,7 @@ typedef void (*trnmenu_tick_cb)(component *c);
 typedef void (*trnmenu_free_cb)(component *c);
 typedef void (*trnmenu_submenu_init_cb)(component *menu, component *submenu);
 typedef void (*trnmenu_submenu_done_cb)(component *menu, component *submenu);
+typedef component *(*trnmenu_find_text_cb)(component *menu, const char *text);
 
 component *trnmenu_create(surface *button_sheet, int sheet_x, int sheet_y, bool return_hand);
 void trnmenu_attach(component *menu, component *c);

src/game/gui/widget.c

@@ -68,6 +68,7 @@ void widget_set_focus_cb(component *c, widget_focus_cb cb) {
 }
 
 void widget_set_find_text_cb(component *c, widget_find_text_cb cb) {
+    log_debug("widget_set_find_text_cb %p", c);
     assert(c->header == WIDGET_MAGIC);
     widget *local = component_get_obj(c);
     local->find_text = cb;
@@ -172,6 +173,16 @@ static component *widget_find(component *c, int id) {
     return NULL;
 }
 
+component *widget_find_text(component *c, const char *text) {
+    widget *w = component_get_obj(c);
+    log_debug("widget_find_text(%p): %p", c, w);
+    component *ret = NULL;
+    if(w->find_text != NULL) {
+        ret = w->find_text(c, text);
+    }
+    return ret;
+}
+
 component *widget_create(void) {
     component *c = component_create(WIDGET_MAGIC);
     c->supports_disable = 1;

src/game/gui/widget.h

@@ -21,6 +21,8 @@ void *widget_get_obj(const component *c);
 void widget_set_id(component *c, int id);
 int widget_get_id(const component *c);
 
+component *widget_find_text(component *c, const char *text);
+
 void widget_set_render_cb(component *c, widget_render_cb cb);
 void widget_set_event_cb(component *c, widget_event_cb cb);
 void widget_set_action_cb(component *c, widget_action_cb cb);

src/game/scenes/mechlab/button_details.c

@@ -1,9 +1,13 @@
 #include "game/scenes/mechlab/button_details.h"
+#include "utils/log.h"
 
 component *sprite_button_from_details(const button_details *details, const char *text, const surface *img,
                                       void *userdata) {
-    component *b =
-        spritebutton_create(text != NULL ? text : details->text, img, details->disabled, details->cb, userdata);
+    text = text != NULL ? text : details->text;
+
+    log_debug("sprite_button_from_details(%s)", text);
+
+    component *b = spritebutton_create(text, img, details->disabled, details->cb, userdata);
     spritebutton_set_vertical_align(b, details->valign);
     spritebutton_set_horizontal_align(b, details->halign);
     spritebutton_set_text_direction(b, details->dir);

src/game/scenes/mechlab/lab_menu_main.c

@@ -5,6 +5,7 @@
 #include "game/gui/sizer.h"
 #include "game/gui/spritebutton.h"
 #include "game/gui/trn_menu.h"
+#include "game/gui/widget.h"
 #include "game/scenes/mechlab.h"
 #include "game/scenes/mechlab/button_details.h"
 #include "game/scenes/mechlab/lab_menu_customize.h"