From 71404b98aaf87ea73afcfe0b6e383cd8ce7b23f6 Mon Sep 17 00:00:00 2001
From: "dedal.qq" <dedal.qq@omg.team>
Date: Sat, 18 Jan 2025 01:54:41 +0300
Subject: [PATCH] commit

---
 lua/config/keymaping.lua | 43 ++++++++++++++++++++++++++++++++++------
 lua/config/menu.lua      |  2 ++
 2 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/lua/config/keymaping.lua b/lua/config/keymaping.lua
index f3b0b5b..359081a 100644
--- a/lua/config/keymaping.lua
+++ b/lua/config/keymaping.lua
@@ -8,7 +8,11 @@ map("n", "<C-right>", "<C-i>", { desc = "LSP Forward" })
 map("v", "<C-c>", '"+y', { desc = "Copy selected" })
 map({ "i", "n" }, "<C-v>", '<ESC>"+p', { desc = "Past" })
 
-map({ "n", "v", "i" }, "<C-s>", "<Cmd>w<CR>", { desc = "Save file" })
+map({ "n", "v", "i" }, "<C-s>", function()
+	vim.cmd("w")
+	vim.api.nvim_input("<esc>")
+end, { desc = "Save file" })
+
 map({ "n", "v", "i" }, "<C-a>", "<ESC>ggVG", { desc = "Select all" })
 
 map("n", "<C-S-left>", "<C-w>h", { desc = "switch window left" })
@@ -16,8 +20,8 @@ map("n", "<C-S-right>", "<C-w>l", { desc = "switch window right" })
 map("n", "<C-S-down>", "<C-w>j", { desc = "switch window down" })
 map("n", "<C-S-up>", "<C-w>k", { desc = "switch window up" })
 
-map("n", "<C-/>", "gcc", { desc = "toggle comment", remap = true })
-map("v", "<C-/>", "gc", { desc = "toggle comment", remap = true })
+map("n", "<C-_>", "gcc", { desc = "toggle comment", remap = true })
+map("v", "<C-_>", "gc", { desc = "toggle comment", remap = true })
 
 -- neo-tree
 map({ "n", "v" }, "<leader>e", "<Cmd>Neotree<CR>", { desc = "nvimtree focus window" })
@@ -49,13 +53,40 @@ map({ "n", "v", "i" }, "<C-f>", function()
 end, { desc = "Search in file" })
 
 -- menu
-local menu = require("menu")
+function MergeTable(table1, table2)
+	for _, value in ipairs(table2) do
+		table1[#table1 + 1] = value
+	end
+	return table1
+end
+
+local menu = require("menu")
+local menuItems = MergeTable(require("config.menu"), require("menus.default"))
+
+function OpenMenu(mouse)
+	-- require("menu.utils").delete_old_menus()
+	-- vim.cmd.exec('"normal! \\<RightMouse>"')
 
-map("n", "<A-CR>", function()
 	local ft = vim.bo.ft
 	if ft ~= "neo-tree" then
-		menu.open(require("config.menu"), { border = true })
+		menu.open(menuItems, { mouse = mouse, border = true })
 	end
+end
+
+map({ "n", "v", "i" }, "<RightMouse>", function()
+	OpenMenu(true)
+end)
+map("n", "<A-CR>", function()
+	OpenMenu(false)
 end)
 
+-- --
+
+-- map({ "n", "i" }, "<S-left>", function()
+-- 	vim.cmd.normal("v")
+-- 	-- vim.api.nvim_input("<CMD>v")
+-- 	-- vim.api.nvim_command("set insertmode")
+-- 	--  evim.cmd("v")
+-- end)
+
 require("langmapper").automapping({ global = true, buffer = true })
diff --git a/lua/config/menu.lua b/lua/config/menu.lua
index 9177d1d..e644761 100644
--- a/lua/config/menu.lua
+++ b/lua/config/menu.lua
@@ -36,4 +36,6 @@ return {
 		name = "󰚃 Toggle delete",
 		cmd = gitsigns.toggle_deleted,
 	},
+
+	{ name = "separator" },
 }