finished modal callbacks system

src/ui/widget/dialogue.c

@@ -1,26 +1,36 @@
 #include <ncurses.h>
 #include <stdint.h>
-#include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 
 #include "dialogue.h"
 #include "group.h"
+#include "../app.h"
 
-
-void dialogue_default_callback(callback_args_t *args, void *widget, void *data,
-                               void *callback) {
-  dialogue_t *d = (void *)widget;
-  char key = *((char *)data);
+void dialogue_default_callback(callback_args_t *args) {
+  dialogue_t *d = (void *)args->widget;
+  char key = *((char *)args->data);
+  app_t *app = (app_t *)args->app;
+  callback_args_t new_args;
+  group_resp_t response;
+  memcpy(&new_args, args, sizeof(callback_args_t));
+  new_args.widget = d->ch_group;
+  new_args.resp_data = &response;
   switch (key) {
   default:
-    d->ch_group->w.callback(args, d->ch_group, data, callback);
-    draw_dialogue(d);
+    d->ch_group->w.callback(&new_args);
+    if (response.value > -1) {
+      d->is_initiated = 0;
+      destroy_dialogue(d);
+      app->modal.type = none;
+    } else {
+      draw_dialogue(d);
+    }
   }
 }
 
-dialogue_t *init_dialogue(const char title[], const char text[], uint32_t cur_y, uint32_t cur_x) {
-  dialogue_t *dialogue = malloc(sizeof(dialogue_t));
+void init_dialogue(dialogue_t *dialogue, const char title[], const char text[], uint32_t cur_y,
+                          uint32_t cur_x) {
   dialogue->win = 0;
   dialogue->ch_group = NULL;
   dialogue->w.x = 0;
@@ -28,12 +38,13 @@ dialogue_t *init_dialogue(const char title[], const char text[], uint32_t cur_y,
   dialogue->cur_y = cur_y;
   dialogue->cur_x = cur_x;
   dialogue->w.callback = dialogue_default_callback;
+  dialogue->is_initiated = 1;
   strcpy(dialogue->w.title, title);
   strcpy(dialogue->text, text);
-  return dialogue;
 }
 
 int32_t draw_dialogue(dialogue_t *d) {
+  if (!d->is_initiated) return -1;
   /* count dimensions */
   uint32_t x = 1; /* when uses box */
   uint32_t y = 1; /* when uses box */
@@ -92,11 +103,11 @@ int32_t draw_dialogue(dialogue_t *d) {
   return 0;
 };
 
-void destroy_active_dialogue(dialogue_t *d) {
+void destroy_dialogue(dialogue_t *d) {
   if (d->ch_group) {
     destroy_group(d->ch_group);
   }
   delwin(d->win);
-  free(d->win);
   d->win = NULL;
+  d->is_initiated = 0;
 }

src/ui/widget/dialogue.h

@@ -13,12 +13,13 @@ typedef struct {
   uint32_t cur_y;
   uint32_t cur_x;
   char text[DIALOGUE_TEXT];
+  uint32_t is_initiated : 1;
 } dialogue_t;
 
-dialogue_t *init_dialogue(const char title[], const char text[], uint32_t cur_x,
+void init_dialogue(dialogue_t *d, const char title[], const char text[], uint32_t cur_x,
                           uint32_t cur_y);
 int32_t draw_dialogue(dialogue_t *d);
-void destroy_active_dialogue(dialogue_t *d);
-void dialogue_default_callback(callback_args_t *args, void *widget, void *data, void *);
+void destroy_dialogue(dialogue_t *d);
+void dialogue_default_callback(callback_args_t *args);
 
 #endif

src/ui/widget/group.c

@@ -4,10 +4,10 @@
 #include <stdlib.h>
 #include <sys/types.h>
 
-void group_default_callback(callback_args_t *args, void *widget, void *data, void *resp_data) {
-  group_t *g = (void *)widget;
-  char key = *((char *)data);
-  group_resp_t *response = (group_resp_t *) resp_data;
+void group_default_callback(callback_args_t *args) {
+  group_t *g = (group_t *)args->widget;
+  char key = *((char *)args->data);
+  group_resp_t *response = (group_resp_t *) args->resp_data;
   switch (key) {
   case '\t':
     if (g->active_id != g->last_id) {
@@ -15,13 +15,13 @@ void group_default_callback(callback_args_t *args, void *widget, void *data, voi
     } else {
       g->active_id = g->first_id;
     }
-    if (resp_data != NULL) {
+    if (args->resp_data != NULL) {
       response->active_id = g->active_id;
       response->value = -1;
     }
     break;
   case '\n':
-    if (resp_data != NULL) {
+    if (args->resp_data != NULL) {
       for (int i=0; i < g->count; i++) {
         if (g->elements[i].id == g->active_id) {
           response->active_id = g->active_id;
@@ -41,9 +41,12 @@ group_t *init_group(WINDOW **win, widget_t *w_parent, group_el_init_t *children,
   group->count = 0;
   for (; children[group->count].type != w_end; group->count++)
     ;
-  group->elements = calloc(group->count, sizeof(group_el_t));
   group->w.w_parent = w_parent;
   group->w.callback = group_default_callback;
+  if (group->count == 0) {
+    return group;
+  }
+  group->elements = calloc(group->count, sizeof(group_el_t));
   group_el_t *elements = group->elements;
   for (int i = 0; i < group->count; i++) {
     elements[i].type = children[i].type;
@@ -112,6 +115,8 @@ void destroy_group(group_t *group) {
       break;
     }
   }
-  free(group->elements);
+  if (group->elements != NULL) {
+    free(group->elements);
+  }
   free(group);
 }

src/ui/widget/group.h

@@ -39,6 +39,6 @@ group_t *init_group(WINDOW **win, widget_t *w_parent, group_el_init_t *children,
                     enum g_direction dir);
 void draw_group(WINDOW *win, group_t *group);
 void destroy_group(group_t *group);
-void group_default_callback(callback_args_t *args, void *widget, void *data, void *resp_data);
+void group_default_callback(callback_args_t *args);
 
 #endif