COMMON: update V_FUNC callback to take return var arg

Author: chrisws

src/common/blib.c

@@ -2908,7 +2908,7 @@ void cmd_call_vfunc() {
     if (code_peek() == kwTYPE_LEVEL_BEGIN) {
       code_skipnext();
     }
-    v_func->v.fn.cb(map);
+    v_func->v.fn.cb(map, NULL);
     if (code_peek() == kwTYPE_LEVEL_END) {
       code_skipnext();
     }

src/common/eval.c

@@ -748,6 +748,7 @@ static inline void eval_var(var_t *r, var_t *var_p) {
   if (prog_error) {
     return;
   }
+
   switch (var_p->type) {
   case V_INT:
     r->type = V_INT;
@@ -770,7 +771,7 @@ static inline void eval_var(var_t *r, var_t *var_p) {
     v_set(r, var_p);
     break;
   case V_FUNC:
-    var_p->v.fn.cb(r);
+    var_p->v.fn.cb(var_p, r);
     break;
   case V_NIL:
     r->type = V_NIL;

src/include/var.h

@@ -47,7 +47,7 @@ extern "C" {
 #endif
 
 struct var_s;
-typedef void (*method) (struct var_s *self);
+typedef void (*method) (struct var_s *self, struct var_s *retval);
 
 typedef struct var_s {
   union {

src/platform/console/image.cpp

@@ -253,7 +253,7 @@ ImageBuffer *load_xpm_image(char **data) {
 //
 // png.clip(10, 10, 10, 10)
 //
-void cmd_image_clip(var_s *self) {
+void cmd_image_clip(var_s *self, var_s *) {
   var_int_t left, top, right, bottom;
   ImageBuffer *image = load_image(self);
   if (par_massget("iiii", &left, &top, &right, &bottom) == 4) {
@@ -298,7 +298,7 @@ void cmd_image_clip(var_s *self) {
 // end
 // png.filter(use colorToAlpha(x))
 //
-void cmd_image_filter(var_s *self) {
+void cmd_image_filter(var_s *self, var_s *) {
   ImageBuffer *image_buffer = load_image(self);
   if (code_peek() == kwUSE && image_buffer != NULL) {
     code_skipnext();
@@ -340,7 +340,7 @@ void cmd_image_filter(var_s *self) {
 // png2 = image(w, h)
 // png2.paste(png1, 0, 0)
 //
-void cmd_image_paste(var_s *self) {
+void cmd_image_paste(var_s *self, var_s *) {
   var_int_t x, y;
   var_t *var;
   ImageBuffer *image = load_image(self);
@@ -384,7 +384,7 @@ void cmd_image_paste(var_s *self) {
 // png.save("horse1.png")
 // png.save(#1)
 //
-void cmd_image_save(var_s *self) {
+void cmd_image_save(var_s *self, var_s *) {
   ImageBuffer *image = load_image(self);
   dev_file_t *filep = NULL;
   byte code = code_peek();

src/ui/form.cpp

@@ -116,7 +116,7 @@ void FormLink::clicked(int x, int y, bool pressed) {
   }
 }
 
-void cmd_form_close(var_s *self) {
+void cmd_form_close(var_s *self, var_s *) {
   g_system->getOutput()->removeInputs();
   g_system->getOutput()->resetScroll();
 
@@ -129,7 +129,7 @@ void cmd_form_close(var_s *self) {
   v_free(&arg);
 }
 
-void cmd_form_refresh(var_s *self) {
+void cmd_form_refresh(var_s *self, var_s *) {
   var_t arg;
   v_init(&arg);
   eval(&arg);
@@ -138,7 +138,7 @@ void cmd_form_refresh(var_s *self) {
   g_system->getOutput()->updateInputs(self, setVars);
 }
 
-void cmd_form_do_events(var_s *self) {
+void cmd_form_do_events(var_s *self, var_s *) {
   // apply any variable changes onto attached widgets
   if (g_system->isRunning()) {
     AnsiWidget *out = g_system->getOutput();

src/ui/image.cpp

@@ -301,7 +301,7 @@ ImageBuffer *load_xpm_image(char **data) {
   return result;
 }
 
-void cmd_image_show(var_s *self) {
+void cmd_image_show(var_s *self, var_s *) {
   ImageDisplay image;
   image._bid = map_get_int(self, IMG_BID, -1);
 
@@ -351,12 +351,12 @@ void cmd_image_show(var_s *self) {
   }
 }
 
-void cmd_image_hide(var_s *self) {
+void cmd_image_hide(var_s *self, var_s *) {
   int id = map_get_int(self, IMG_ID, -1);
   g_system->getOutput()->removeImage(id);
 }
 
-void cmd_image_save(var_s *self) {
+void cmd_image_save(var_s *self, var_s *) {
   unsigned id = map_get_int(self, IMG_BID, -1);
   ImageBuffer *image = nullptr;
   List_each(ImageBuffer *, it, cache) {

src/ui/window.cpp

@@ -60,23 +60,23 @@ StringList *get_items() {
   return items;
 }
 
-void cmd_window_select_screen1(var_s *self) {
+void cmd_window_select_screen1(var_s *self, var_s *) {
   g_system->getOutput()->selectScreen(USER_SCREEN1);
 }
 
-void cmd_window_select_screen2(var_s *self) {
+void cmd_window_select_screen2(var_s *self, var_s *) {
   g_system->getOutput()->selectScreen(USER_SCREEN2);
 }
 
-void cmd_window_select_screen3(var_s *self) {
+void cmd_window_select_screen3(var_s *self, var_s *) {
   g_system->getOutput()->selectScreen(TEXT_SCREEN);
 }
 
-void cmd_window_show_keypad(var_s *self) {
+void cmd_window_show_keypad(var_s *self, var_s *) {
   maShowVirtualKeyboard();
 }
 
-void cmd_window_inset(var_s *self) {
+void cmd_window_inset(var_s *self, var_s *) {
   var_int_t x, y, w, h;
   par_massget("IIII", &x, &y, &w, &h);
   if (!prog_error) {
@@ -91,7 +91,7 @@ void cmd_window_inset(var_s *self) {
   }
 }
 
-void cmd_window_set_font(var_s *self) {
+void cmd_window_set_font(var_s *self, var_s *) {
   var_num_t size;
   var_int_t bold, italic;
   char *unit = NULL;
@@ -103,27 +103,29 @@ void cmd_window_set_font(var_s *self) {
   pfree(unit);
 }
 
-void cmd_window_set_size(var_s *self) {
+void cmd_window_set_size(var_s *self, var_s *) {
   var_int_t width, height;
   par_massget("II", &width, &height);
   g_system->setWindowSize(width, height);
 }
 
-void cmd_window_get_theme(var_s *self) {
-  EditTheme theme;
-  theme.setId(g_themeId);
-  v_init(self);
-  map_init(self);
-  map_set_int(self, "background", -theme._background);
-  map_set_int(self, "text1", -theme._color);
-  map_set_int(self, "text2", -theme._syntax_text);
-  map_set_int(self, "text3", -theme._syntax_comments);
-  map_set_int(self, "text4", -theme._syntax_command);
-  map_set_int(self, "text5", -theme._syntax_statement);
-  map_set_int(self, "text6", -theme._syntax_digit);
+void cmd_window_get_theme(var_s *, var_s *retval) {
+  if (retval != nullptr) {
+    EditTheme theme;
+    theme.setId(g_themeId);
+    v_init(retval);
+    map_init(retval);
+    map_set_int(retval, "background", -theme._background);
+    map_set_int(retval, "text1", -theme._color);
+    map_set_int(retval, "text2", -theme._syntax_text);
+    map_set_int(retval, "text3", -theme._syntax_comments);
+    map_set_int(retval, "text4", -theme._syntax_command);
+    map_set_int(retval, "text5", -theme._syntax_statement);
+    map_set_int(retval, "text6", -theme._syntax_digit);
+  }
 }
 
-void cmd_window_alert(var_s *self) {
+void cmd_window_alert(var_s *self, var_s *) {
   StringList *items = get_items();
   if (!prog_error && items->size() > 0) {
     const char *message = items->size() > 0 ? (*items)[0]->c_str() : "";
@@ -133,25 +135,29 @@ void cmd_window_alert(var_s *self) {
   delete items;
 }
 
-void cmd_window_ask(var_s *self) {
+void cmd_window_ask(var_s *self, var_s *retval) {
   StringList *items = get_items();
   if (!prog_error && items->size() > 0) {
     const char *message = items->size() > 0 ? (*items)[0]->c_str() : "";
     const char *title   = items->size() > 1 ? (*items)[1]->c_str() : "";
-    map_set_int(self, WINDOW_ASK_RTN, g_system->ask(title, message, false));
+    int result = g_system->ask(title, message, false);
+    map_set_int(self, WINDOW_ASK_RTN, result);
+    if (retval != nullptr) {
+      v_setint(retval, result);
+    }
   }
   delete items;
 }
 
-void cmd_window_menu(var_s *self) {
+void cmd_window_menu(var_s *self, var_s *) {
   StringList *items = get_items();
   if (!prog_error && items->size() > 0) {
     g_system->optionsBox(items);
   }
   delete items;
 }
 
-void cmd_window_message(var_s *self) {
+void cmd_window_message(var_s *self, var_s *) {
   var_t arg;
   v_init(&arg);
   eval(&arg);