UI: internal changes to user-menu storage

- Use per context menu lists to support menu editing.
- Support for different kinds of menu items since this may be needed
  in the future. Only use operator types for now.

4 files changed, 174 insertions, 8 deletions

diff --git a/source/blender/blenkernel/BKE_blender_user_menu.h b/source/blender/blenkernel/BKE_blender_user_menu.h
new file mode 100644
index 00000000000..9f8d1d62951
--- /dev/null
+++ b/source/blender/blenkernel/BKE_blender_user_menu.h
@@ -0,0 +1,48 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef __BKE_BLENDER_USER_MENU_H__
+
+/** \file BKE_blender_user_menu.h
+ *  \ingroup bke
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct ListBase;
+struct bUserMenu;
+struct bUserMenuItem;
+
+struct bUserMenu *BKE_blender_user_menu_find(
+        struct ListBase *lb, char space_type, const char *context);
+struct bUserMenu *BKE_blender_user_menu_ensure(
+        struct ListBase *lb, char space_type, const char *context);
+
+struct bUserMenuItem *BKE_blender_user_menu_item_add(struct ListBase *lb, int type);
+void BKE_blender_user_menu_item_free(struct bUserMenuItem *umi);
+void BKE_blender_user_menu_item_free_list(struct ListBase *lb);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  /* __BKE_BLENDER_USER_MENU_H__ */
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 15ccd660d83..94a6fc45303 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -77,6 +77,7 @@ set(SRC
 	intern/blender.c
 	intern/blender_copybuffer.c
 	intern/blender_undo.c
+	intern/blender_user_menu.c
 	intern/blendfile.c
 	intern/bmfont.c
 	intern/boids.c
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c
index 7b41bb62872..23c2147ff7e 100644
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@ -48,6 +48,7 @@
 #include "BKE_addon.h"
 #include "BKE_blender.h"  /* own include */
 #include "BKE_blender_version.h"  /* own include */
+#include "BKE_blender_user_menu.h"
 #include "BKE_blendfile.h"
 #include "BKE_brush.h"
 #include "BKE_cachefile.h"
@@ -206,6 +207,15 @@ static void userdef_free_keymaps(UserDef *userdef)
 	BLI_listbase_clear(&userdef->user_keymaps);
 }
 
+static void userdef_free_user_menus(UserDef *userdef)
+{
+	for (bUserMenu *um = userdef->user_menus.first, *um_next; um; um = um_next) {
+		um_next = um->next;
+		BKE_blender_user_menu_item_free_list(&um->items);
+		MEM_freeN(um);
+	}
+}
+
 static void userdef_free_addons(UserDef *userdef)
 {
 	for (bAddon *addon = userdef->addons.first, *addon_next; addon; addon = addon_next) {
@@ -226,6 +236,7 @@ void BKE_blender_userdef_data_free(UserDef *userdef, bool clear_fonts)
 #endif
 
 	userdef_free_keymaps(userdef);
+	userdef_free_user_menus(userdef);
 	userdef_free_addons(userdef);
 
 	if (clear_fonts) {
@@ -241,14 +252,6 @@ void BKE_blender_userdef_data_free(UserDef *userdef, bool clear_fonts)
 	BLI_freelistN(&userdef->uifonts);
 	BLI_freelistN(&userdef->themes);
 
-	for (bUserMenuItem *umi = userdef->user_menu_items.first, *umi_next; umi; umi = umi_next) {
-		umi_next = umi->next;
-		if (umi->prop) {
-			IDP_FreeProperty(umi->prop);
-			MEM_freeN(umi->prop);
-		}
-		MEM_freeN(umi);
-	}
 
 #undef U
 }
diff --git a/source/blender/blenkernel/intern/blender_user_menu.c b/source/blender/blenkernel/intern/blender_user_menu.c
new file mode 100644
index 00000000000..3bb150b8fac
--- /dev/null
+++ b/source/blender/blenkernel/intern/blender_user_menu.c
@@ -0,0 +1,114 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/blenkernel/intern/blender_user_menu.c
+ *  \ingroup bke
+ *
+ * User defined menu API.
+ */
+
+#include <string.h>
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_listbase.h"
+#include "BLI_string.h"
+
+#include "DNA_userdef_types.h"
+
+#include "BKE_blender_user_menu.h"
+#include "BKE_idprop.h"
+
+/* -------------------------------------------------------------------- */
+/** \name Menu Type
+ * \{ */
+
+bUserMenu *BKE_blender_user_menu_find(
+        ListBase *lb, char space_type, const char *context)
+{
+	for (bUserMenu *um = lb->first; um; um = um->next) {
+		if ((space_type == um->space_type) &&
+		    (STREQ(context, um->context)))
+		{
+			return um;
+		}
+	}
+	return NULL;
+}
+
+bUserMenu *BKE_blender_user_menu_ensure(
+        ListBase *lb, char space_type, const char *context)
+{
+	bUserMenu *um = BKE_blender_user_menu_find(lb, space_type, context);
+	if (um == NULL) {
+		um = MEM_callocN(sizeof(bUserMenu), __func__);
+		um->space_type = space_type;
+		STRNCPY(um->context, context);
+		BLI_addhead(lb, um);
+	}
+	return um;
+}
+
+/** \} */
+
+/* -------------------------------------------------------------------- */
+/** \name Menu Item
+ * \{ */
+
+bUserMenuItem *BKE_blender_user_menu_item_add(ListBase *lb, int type)
+{
+	uint size;
+
+	if (type == USER_MENU_TYPE_OPERATOR) {
+		size = sizeof(bUserMenuItem_Op);
+	}
+	else if (type == USER_MENU_TYPE_SEP) {
+		size = sizeof(bUserMenuItem);
+	}
+	else {
+		BLI_assert(0);
+	}
+
+	bUserMenuItem *umi = MEM_callocN(size, __func__);
+	umi->type = type;
+	BLI_addtail(lb, umi);
+	return umi;
+}
+
+void BKE_blender_user_menu_item_free(bUserMenuItem *umi)
+{
+	if (umi->type == USER_MENU_TYPE_OPERATOR) {
+		bUserMenuItem_Op *umi_op = (bUserMenuItem_Op *)umi;
+		if (umi_op->prop) {
+			IDP_FreeProperty(umi_op->prop);
+			MEM_freeN(umi_op->prop);
+		}
+	}
+	MEM_freeN(umi);
+}
+
+void BKE_blender_user_menu_item_free_list(ListBase *lb)
+{
+	for (bUserMenuItem *umi = lb->first, *umi_next; umi; umi = umi_next) {
+		umi_next = umi->next;
+		BKE_blender_user_menu_item_free(umi);
+	}
+	BLI_listbase_clear(lb);
+}