vim: src/menu.c comparison

comparison src/menu.c @ 18800:f41b55f9357c v8.1.2388

patch 8.1.2388: using old C style comments Commit: https://github.com/vim/vim/commit/4ba37b5833de99db9e9afe8928b31c864182405c Author: Bram Moolenaar <Bram@vim.org> Date: Wed Dec 4 21:57:43 2019 +0100 patch 8.1.2388: using old C style comments Problem: Using old C style comments. Solution: Use // comments where appropriate.

author	Bram Moolenaar <Bram@vim.org>
date	Wed, 04 Dec 2019 22:00:04 +0100
parents	e9b2ade1adbd
children	22f0dda71638

comparison

equal deleted inserted replaced

-:d7d0942e231b
+:f41b55f9357c
 #include "vim.h"
 #if defined(FEAT_MENU) || defined(PROTO)
-#define MENUDEPTH   10		/* maximum depth of menus */
+#define MENUDEPTH   10		// maximum depth of menus
 #ifdef FEAT_GUI_MSWIN
 static int add_menu_path(char_u *, vimmenu_T *, int *, char_u *, int);
 #else
 static int add_menu_path(char_u *, vimmenu_T *, int *, char_u *);
 static void menu_unescape_name(char_u	*p);
 #endif
 static char_u *menu_translate_tab_and_shift(char_u *arg_start);
-/* The character for each menu mode */
+// The character for each menu mode
 static char *menu_mode_chars[] = {"n", "v", "s", "o", "i", "c", "tl", "t"};
 static char_u e_notsubmenu[] = N_("E327: Part of menu-item path is not sub-menu");
 static char_u e_nomenu[] = N_("E329: No menu \"%s\"");
 /*
 * Do the :menu command and relatives.
 */
 void
 ex_menu(
-exarg_T	*eap)		    /* Ex command arguments */
+exarg_T	*eap)		    // Ex command arguments
 {
 char_u	*menu_path;
 int		modes;
 char_u	*map_to;
 int		noremap;
 # if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_MSWIN)
 int		old_toolbar_height;
 # endif
 #endif
 int		pri_tab[MENUDEPTH + 1];
-int		enable = MAYBE;	    /* TRUE for "menu enable", FALSE for "menu
+int		enable = MAYBE;	    // TRUE for "menu enable", FALSE for "menu
-				     * disable */
+				    // disable
 #ifdef FEAT_TOOLBAR
 char_u	*icon = NULL;
 #endif
 vimmenu_T	menuarg;
 vimmenu_T	**root_menu_ptr;
 	}
 	break;
 }
-/* Locate an optional "icon=filename" argument. */
+// Locate an optional "icon=filename" argument.
 if (STRNCMP(arg, "icon=", 5) == 0)
 {
 	arg += 5;
 #ifdef FEAT_TOOLBAR
 	icon = arg;
 }
 else
 	i = 0;
 while (i < MENUDEPTH)
 	pri_tab[i++] = 500;
-pri_tab[MENUDEPTH] = -1;		/* mark end of the table */
+pri_tab[MENUDEPTH] = -1;		// mark end of the table
 /*
 * Check for "disable" or "enable" argument.
 */
 if (STRNCMP(arg, "enable", 6) == 0 && VIM_ISWHITE(arg[6]))
 # endif
 #endif
 root_menu_ptr = get_root_menu(menu_path);
 if (root_menu_ptr == &curwin->w_winbar)
-	/* Assume the window toolbar menu will change. */
+	// Assume the window toolbar menu will change.
 	redraw_later(NOT_VALID);
 if (enable != MAYBE)
 {
 	/*
 	 * Change sensitivity of the menu.
 	 * For the PopUp menu, remove a menu for each mode separately.
 	 * Careful: menu_nable_recurse() changes menu_path.
 	 */
-	if (STRCMP(menu_path, "*") == 0)	/* meaning: do all menus */
+	if (STRCMP(menu_path, "*") == 0)	// meaning: do all menus
 	    menu_path = (char_u *)"";
 	if (menu_is_popup(menu_path))
 	{
 	    for (i = 0; i < MENU_INDEX_TIP; ++i)
 else if (unmenu)
 {
 	/*
 	 * Delete menu(s).
 	 */
-	if (STRCMP(menu_path, "*") == 0)	/* meaning: remove all menus */
+	if (STRCMP(menu_path, "*") == 0)	// meaning: remove all menus
 	    menu_path = (char_u *)"";
 	/*
 	 * For the PopUp menu, remove a menu for each mode separately.
 	 */
 			vim_free(p);
 		    }
 		}
 	}
-	/* Careful: remove_menu() changes menu_path */
+	// Careful: remove_menu() changes menu_path
 	remove_menu(root_menu_ptr, menu_path, modes, FALSE);
 }
 else
 {
 	/*
 	 * Add menu(s).
 	 * Replace special key codes.
 	 */
-	if (STRICMP(map_to, "<nop>") == 0)	/* "<Nop>" means nothing */
+	if (STRICMP(map_to, "<nop>") == 0)	// "<Nop>" means nothing
 	{
 	    map_to = (char_u *)"";
 	    map_buf = NULL;
 	}
 	else if (modes & MENU_TIP_MODE)
-	    map_buf = NULL;	/* Menu tips are plain text. */
+	    map_buf = NULL;	// Menu tips are plain text.
 	else
 	    map_to = replace_termcodes(map_to, &map_buf,
 			REPTERM_DO_LT | (special ? REPTERM_SPECIAL : 0), NULL);
 	menuarg.modes = modes;
 #ifdef FEAT_TOOLBAR
 		if (modes & (1 << i))
 		{
 		    p = popup_mode_name(menu_path, i);
 		    if (p != NULL)
 		    {
-			/* Include all modes, to make ":amenu" work */
+			// Include all modes, to make ":amenu" work
 			menuarg.modes = modes;
 #ifdef FEAT_TOOLBAR
 			menuarg.iconfile = NULL;
 			menuarg.iconidx = -1;
 			menuarg.icon_builtin = FALSE;
 	vim_free(map_buf);
 }
 #if defined(FEAT_GUI) && !(defined(FEAT_GUI_GTK))
-/* If the menubar height changed, resize the window */
+// If the menubar height changed, resize the window
 if (gui.in_use
 	    && (gui.menu_height != old_menu_height
 # if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_MSWIN)
 		|| gui.toolbar_height != old_toolbar_height
 # endif
 * Add the menu with the given name to the menu hierarchy
 */
 static int
 add_menu_path(
 char_u	*menu_path,
-vimmenu_T	*menuarg,	/* passes modes, iconfile, iconidx,
+vimmenu_T	*menuarg,	// passes modes, iconfile, iconidx,
-				   icon_builtin, silent[0], noremap[0] */
+				// icon_builtin, silent[0], noremap[0]
 int		*pri_tab,
 char_u	*call_data
 #ifdef FEAT_GUI_MSWIN
-, int	addtearoff	/* may add tearoff item */
+, int	addtearoff	// may add tearoff item
 #endif
 )
 {
 char_u	*path_name;
 int		modes = menuarg->modes;
 char_u	*en_name;
 char_u	*map_to = NULL;
 #endif
 vimmenu_T	**root_menu_ptr;
-/* Make a copy so we can stuff around with it, since it could be const */
+// Make a copy so we can stuff around with it, since it could be const
 path_name = vim_strsave(menu_path);
 if (path_name == NULL)
 	return FAIL;
 root_menu_ptr = get_root_menu(menu_path);
 menup = root_menu_ptr;
 parent = NULL;
 name = path_name;
 while (*name)
 {
-	/* Get name of this element in the menu hierarchy, and the simplified
+	// Get name of this element in the menu hierarchy, and the simplified
-	 * name (without mnemonic and accelerator text). */
+	// name (without mnemonic and accelerator text).
 	next_name = menu_name_skip(name);
 #ifdef	FEAT_MULTI_LANG
 	map_to = menutrans_lookup(name, (int)STRLEN(name));
 	if (map_to != NULL)
 	{
 	dname = menu_text(name, NULL, NULL);
 	if (dname == NULL)
 	    goto erret;
 	if (*dname == NUL)
 	{
-	    /* Only a mnemonic or accelerator is not valid. */
+	    // Only a mnemonic or accelerator is not valid.
 	    emsg(_("E792: Empty menu name"));
 	    goto erret;
 	}
-	/* See if it's already there */
+	// See if it's already there
 	lower_pri = menup;
 #ifdef FEAT_GUI
 	idx = 0;
 	new_idx = 0;
 #endif
 		}
 		break;
 	    }
 	    menup = &menu->next;
-	    /* Count menus, to find where this one needs to be inserted.
+	    // Count menus, to find where this one needs to be inserted.
-	     * Ignore menus that are not in the menubar (PopUp and Toolbar) */
+	    // Ignore menus that are not in the menubar (PopUp and Toolbar)
 	    if (parent != NULL || menu_is_menubar(menu->name))
 	    {
 #ifdef FEAT_GUI
 		++idx;
 #endif
 	    {
 		emsg(_("E332: Separator cannot be part of a menu path"));
 		goto erret;
 	    }
-	    /* Not already there, so lets add it */
+	    // Not already there, so lets add it
 	    menu = ALLOC_CLEAR_ONE(vimmenu_T);
 	    if (menu == NULL)
 		goto erret;
 	    menu->modes = modes;
 	    menu->enabled = MENU_ALL_MODES;
 	    menu->name = vim_strsave(name);
-	    /* separate mnemonic and accelerator text from actual menu name */
+	    // separate mnemonic and accelerator text from actual menu name
 	    menu->dname = menu_text(name, &menu->mnemonic, &menu->actext);
 #ifdef	FEAT_MULTI_LANG
 	    if (en_name != NULL)
 	    {
 		menu->en_name = vim_strsave(en_name);
 	    }
 #endif
 	    menu->priority = pri_tab[pri_idx];
 	    menu->parent = parent;
 #ifdef FEAT_GUI_MOTIF
-	    menu->sensitive = TRUE;	    /* the default */
+	    menu->sensitive = TRUE;	    // the default
 #endif
 #ifdef FEAT_BEVAL_TIP
 	    menu->tip = NULL;
 #endif
 #ifdef FEAT_GUI_ATHENA
-	    menu->image = None;		    /* X-Windows definition for NULL*/
+	    menu->image = None;		    // X-Windows definition for NULL
 #endif
 	    /*
 	     * Add after menu that has lower priority.
 	     */
 	    menu->icon_builtin = menuarg->icon_builtin;
 	    if (*next_name == NUL && menuarg->iconfile != NULL)
 		menu->iconfile = vim_strsave(menuarg->iconfile);
 #endif
 #if defined(FEAT_GUI_MSWIN) && defined(FEAT_TEAROFF)
-	    /* the tearoff item must be present in the modes of each item. */
+	    // the tearoff item must be present in the modes of each item.
 	    if (parent != NULL && menu_is_tearoff(parent->children->dname))
 		parent->children->modes |= modes;
 #endif
 	}
 	else
 	     * If this menu option was previously only available in other
 	     * modes, then make sure it's available for this one now
 	     * Also enable a menu when it's created or changed.
 	     */
 #ifdef FEAT_GUI_MSWIN
-	    /* If adding a tearbar (addtearoff == FALSE) don't update modes */
+	    // If adding a tearbar (addtearoff == FALSE) don't update modes
 	    if (addtearoff)
 #endif
 	    {
 		menu->modes |= modes;
 		menu->enabled |= modes;
 	 * only a tooltip is defined.
 	 */
 	if ((old_modes & MENU_ALL_MODES) == 0
 		&& (menu->modes & MENU_ALL_MODES) != 0)
 	{
-	    if (gui.in_use)  /* Otherwise it will be added when GUI starts */
+	    if (gui.in_use)  // Otherwise it will be added when GUI starts
 	    {
 		if (*next_name == NUL)
 		{
-		    /* Real menu item, not sub-menu */
+		    // Real menu item, not sub-menu
 		    gui_mch_add_menu_item(menu, new_idx);
-		    /* Want to update menus now even if mode not changed */
+		    // Want to update menus now even if mode not changed
 		    force_menu_update = TRUE;
 		}
 		else
 		{
-		    /* Sub-menu (not at end of path yet) */
+		    // Sub-menu (not at end of path yet)
 		    gui_mch_add_menu(menu, new_idx);
 		}
 	    }
 # if defined(FEAT_GUI_MSWIN) & defined(FEAT_TEAROFF)
-	    /* When adding a new submenu, may add a tearoff item */
+	    // When adding a new submenu, may add a tearoff item
 	    if (	addtearoff
 		    && *next_name
 		    && vim_strchr(p_go, GO_TEAROFF) != NULL
 		    && menu_is_menubar(name)
 #  ifdef VIMDLL
 		    vim_free(tearpath);
 		}
 	    }
 # endif
 	}
-#endif /* FEAT_GUI */
+#endif // FEAT_GUI
 	menup = &menu->children;
 	parent = menu;
 	name = next_name;
 	VIM_CLEAR(dname);
 #ifdef FEAT_GUI
 	menu->cb = gui_menu_cb;
 #endif
 	p = (call_data == NULL) ? NULL : vim_strsave(call_data);
-	/* loop over all modes, may add more than one */
+	// loop over all modes, may add more than one
 	for (i = 0; i < MENU_MODES; ++i)
 	{
 	    if (modes & (1 << i))
 	    {
-		/* free any old menu */
+		// free any old menu
 		free_menu_string(menu, i);
-		/* For "amenu", may insert an extra character.
+		// For "amenu", may insert an extra character.
-		 * Don't do this if adding a tearbar (addtearoff == FALSE).
+		// Don't do this if adding a tearbar (addtearoff == FALSE).
-		 * Don't do this for "<Nop>". */
+		// Don't do this for "<Nop>".
 		c = 0;
 		d = 0;
 		if (amenu && call_data != NULL && *call_data != NUL
 #ifdef FEAT_GUI_MSWIN
 		       && addtearoff
 			}
 			if (c == Ctrl_C)
 			{
 			    int	    len = (int)STRLEN(menu->strings[i]);
-			    /* Append CTRL-\ CTRL-G to obey 'insertmode'. */
+			    // Append CTRL-\ CTRL-G to obey 'insertmode'.
 			    menu->strings[i][len] = Ctrl_BSL;
 			    menu->strings[i][len + 1] = Ctrl_G;
 			    menu->strings[i][len + 2] = NUL;
 			}
 		    }
 		menu->silent[i] = menuarg->silent[0];
 	    }
 	}
 #if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_MSWIN) \
 	&& (defined(FEAT_BEVAL_GUI) || defined(FEAT_GUI_GTK))
-	/* Need to update the menu tip. */
+	// Need to update the menu tip.
 	if (modes & MENU_TIP_MODE)
 	    gui_mch_menu_set_tip(menu);
 #endif
 }
 return OK;
 erret:
 vim_free(path_name);
 vim_free(dname);
-/* Delete any empty submenu we added before discovering the error.  Repeat
+// Delete any empty submenu we added before discovering the error.  Repeat
-* for higher levels. */
+// for higher levels.
 while (parent != NULL && parent->children == NULL)
 {
 	if (parent->parent == NULL)
 	    menup = root_menu_ptr;
 	else
 	    menup = &parent->parent->children;
 	for ( ; *menup != NULL && *menup != parent; menup = &((*menup)->next))
 	    ;
-	if (*menup == NULL) /* safety check */
+	if (*menup == NULL) // safety check
 	    break;
 	parent = parent->parent;
 	free_menu(menup);
 }
 return FAIL;
 int		enable)
 {
 char_u	*p;
 if (menu == NULL)
-	return OK;		/* Got to bottom of hierarchy */
+	return OK;		// Got to bottom of hierarchy
-/* Get name of this element in the menu hierarchy */
+// Get name of this element in the menu hierarchy
 p = menu_name_skip(name);
-/* Find the menu */
+// Find the menu
 while (menu != NULL)
 {
 	if (*name == NUL || *name == '*' || menu_name_equal(name, menu))
 	{
 	    if (*p != NUL)
 	semsg(_(e_nomenu), name);
 	return FAIL;
 }
 #ifdef FEAT_GUI
-/* Want to update menus now even if mode not changed */
+// Want to update menus now even if mode not changed
 force_menu_update = TRUE;
 #endif
 return OK;
 }
 static int
 remove_menu(
 vimmenu_T	**menup,
 char_u	*name,
 int		modes,
-int		silent)		/* don't give error messages */
+int		silent)		// don't give error messages
 {
 vimmenu_T	*menu;
 vimmenu_T	*child;
 char_u	*p;
 if (*menup == NULL)
-	return OK;		/* Got to bottom of hierarchy */
+	return OK;		// Got to bottom of hierarchy
-/* Get name of this element in the menu hierarchy */
+// Get name of this element in the menu hierarchy
 p = menu_name_skip(name);
-/* Find the menu */
+// Find the menu
 while ((menu = *menup) != NULL)
 {
 	if (*name == NUL || menu_name_equal(name, menu))
 	{
 	    if (*p != NUL && menu->children == NULL)
 	     * menu item (which has been found) so break here.
 	     */
 	    if (*name != NUL)
 		break;
-	    /* Remove the menu item for the given mode[s].  If the menu item
+	    // Remove the menu item for the given mode[s].  If the menu item
-	     * is no longer valid in ANY mode, delete it */
+	    // is no longer valid in ANY mode, delete it
 	    menu->modes &= ~modes;
 	    if (modes & MENU_TIP_MODE)
 		free_menu_string(menu, MENU_INDEX_TIP);
 	    if ((menu->modes & MENU_ALL_MODES) == 0)
 		free_menu(menup);
 		semsg(_(e_nomenu), name);
 	    return FAIL;
 	}
-	/* Recalculate modes for menu based on the new updated children */
+	// Recalculate modes for menu based on the new updated children
 	menu->modes &= ~modes;
 #if defined(FEAT_GUI_MSWIN) & defined(FEAT_TEAROFF)
-	if ((s_tearoffs) && (menu->children != NULL)) /* there's a tear bar.. */
+	if ((s_tearoffs) && (menu->children != NULL)) // there's a tear bar..
-	    child = menu->children->next; /* don't count tearoff bar */
+	    child = menu->children->next; // don't count tearoff bar
 	else
 #endif
 	    child = menu->children;
 	for ( ; child != NULL; child = child->next)
 	    menu->modes |= child->modes;
 	if (modes & MENU_TIP_MODE)
 	{
 	    free_menu_string(menu, MENU_INDEX_TIP);
 #if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_MSWIN) \
 	    && (defined(FEAT_BEVAL_GUI) || defined(FEAT_GUI_GTK))
-	    /* Need to update the menu tip. */
+	    // Need to update the menu tip.
 	    if (gui.in_use)
 		gui_mch_menu_set_tip(menu);
 #endif
 	}
 	if ((menu->modes & MENU_ALL_MODES) == 0)
 	{
-	    /* The menu item is no longer valid in ANY mode, so delete it */
+	    // The menu item is no longer valid in ANY mode, so delete it
 #if defined(FEAT_GUI_MSWIN) & defined(FEAT_TEAROFF)
-	    if (s_tearoffs && menu->children != NULL) /* there's a tear bar.. */
+	    if (s_tearoffs && menu->children != NULL) // there's a tear bar..
 		free_menu(&menu->children);
 #endif
 	    *menup = menu;
 	    free_menu(menup);
 	}
 vimmenu_T	*menu;
 menu = *menup;
 #ifdef FEAT_GUI
-/* Free machine specific menu structures (only when already created) */
+// Free machine specific menu structures (only when already created)
-/* Also may rebuild a tearoff'ed menu */
+// Also may rebuild a tearoff'ed menu
 if (gui.in_use)
 	gui_mch_destroy_menu(menu);
 #endif
-/* Don't change *menup until after calling gui_mch_destroy_menu(). The
+// Don't change *menup until after calling gui_mch_destroy_menu(). The
-* MacOS code needs the original structure to properly delete the menu. */
+// MacOS code needs the original structure to properly delete the menu.
 *menup = menu->next;
 vim_free(menu->name);
 vim_free(menu->dname);
 #ifdef FEAT_MULTI_LANG
 vim_free(menu->en_name);
 for (i = 0; i < MENU_MODES; i++)
 	free_menu_string(menu, i);
 vim_free(menu);
 #ifdef FEAT_GUI
-/* Want to update menus now even if mode not changed */
+// Want to update menus now even if mode not changed
 force_menu_update = TRUE;
 #endif
 }
 /*
 name = path_name = vim_strsave(path_name);
 if (path_name == NULL)
 	return FAIL;
 menu = *get_root_menu(path_name);
-/* First, find the (sub)menu with the given name */
+// First, find the (sub)menu with the given name
 while (*name)
 {
 	p = menu_name_skip(name);
 	while (menu != NULL)
 	{
 	    if (menu_name_equal(name, menu))
 	    {
-		/* Found menu */
+		// Found menu
 		if (*p != NUL && menu->children == NULL)
 		{
 		    emsg(_(e_notsubmenu));
 		    vim_free(path_name);
 		    return FAIL;
 	parent = menu;
 	menu = menu->children;
 }
 vim_free(path_name);
-/* Now we have found the matching menu, and we list the mappings */
+// Now we have found the matching menu, and we list the mappings
-						    /* Highlight title */
+						    // Highlight title
 msg_puts_title(_("\n--- Menus ---"));
 show_menus_recursive(parent, modes, 0);
 return OK;
 }
 	return;
 if (menu != NULL)
 {
 	msg_putchar('\n');
-	if (got_int)		/* "q" hit for "--more--" */
+	if (got_int)		// "q" hit for "--more--"
 	    return;
 	for (i = 0; i < depth; i++)
 	    msg_puts("  ");
 	if (menu->priority)
 	{
 	    msg_outnum((long)menu->priority);
 	    msg_puts(" ");
 	}
-				/* Same highlighting as for directories!? */
+				// Same highlighting as for directories!?
 	msg_outtrans_attr(menu->name, HL_ATTR(HLF_D));
 }
 if (menu != NULL && menu->children == NULL)
 {
 	for (bit = 0; bit < MENU_MODES; bit++)
 	    if ((menu->modes & modes & (1 << bit)) != 0)
 	    {
 		msg_putchar('\n');
-		if (got_int)		/* "q" hit for "--more--" */
+		if (got_int)		// "q" hit for "--more--"
 		    return;
 		for (i = 0; i < depth + 2; i++)
 		    msg_puts("  ");
 		msg_puts(menu_mode_chars[bit]);
 		if (menu->noremap[bit] == REMAP_NONE)
 	    depth--;
 	}
 	else
 	    menu = menu->children;
-	/* recursively show all children.  Skip PopUp[nvoci]. */
+	// recursively show all children.  Skip PopUp[nvoci].
 	for (; menu != NULL && !got_int; menu = menu->next)
 	    if (!menu_is_hidden(menu->dname))
 		show_menus_recursive(menu, modes, depth + 1);
 }
 }
 * Used when expanding menu names.
 */
 static vimmenu_T	*expand_menu = NULL;
 static vimmenu_T	*expand_menu_alt = NULL;
 static int		expand_modes = 0x0;
-static int		expand_emenu;	/* TRUE for ":emenu" command */
+static int		expand_emenu;	// TRUE for ":emenu" command
 /*
 * Work out what to complete when doing command line completion of menu names.
 */
 char_u *
 int		expand_menus;
 xp->xp_context = EXPAND_UNSUCCESSFUL;
-/* Check for priority numbers, enable and disable */
+// Check for priority numbers, enable and disable
 for (p = arg; *p; ++p)
 	if (!VIM_ISDIGIT(*p) && *p != '.')
 	    break;
 if (!VIM_ISWHITE(*p))
 	    p++;
 	else if (*p == '.')
 	    after_dot = p + 1;
 }
-/* ":tearoff" and ":popup" only use menus, not entries */
+// ":tearoff" and ":popup" only use menus, not entries
 expand_menus = !((*cmd == 't' && cmd[1] == 'e') || *cmd == 'p');
 expand_emenu = (*cmd == 'e');
 if (expand_menus && VIM_ISWHITE(*p))
-	return NULL;	/* TODO: check for next command? */
+	return NULL;	// TODO: check for next command?
-if (*p == NUL)		/* Complete the menu name */
+if (*p == NUL)		// Complete the menu name
 {
 	int try_alt_menu = TRUE;
 	/*
 	 * With :unmenu, you only want to match menus for the appropriate mode.
 	    p = menu_name_skip(name);
 	    while (menu != NULL)
 	    {
 		if (menu_name_equal(name, menu))
 		{
-		    /* Found menu */
+		    // Found menu
 		    if ((*p != NUL && menu->children == NULL)
 			|| ((menu->modes & expand_modes) == 0x0))
 		    {
 			/*
 			 * Menu path continues, but we have reached a leaf.
 		    try_alt_menu = FALSE;
 		}
 	    }
 	    if (menu == NULL)
 	    {
-		/* No menu found with the name we were looking for */
+		// No menu found with the name we were looking for
 		vim_free(path_name);
 		return NULL;
 	    }
 	    name = p;
 	    menu = menu->children;
 	if (expand_menu == root_menu)
 	    expand_menu_alt = curwin->w_winbar;
 	else
 	    expand_menu_alt = NULL;
 }
-else			/* We're in the mapping part */
+else			// We're in the mapping part
 	xp->xp_context = EXPAND_NOTHING;
 return NULL;
 }
 /*
 char_u		*str;
 #ifdef FEAT_MULTI_LANG
 static  int		should_advance = FALSE;
 #endif
-if (idx == 0)	    /* first call: start at first item */
+if (idx == 0)	    // first call: start at first item
 {
 	menu = expand_menu;
 	did_alt_menu = FALSE;
 #ifdef FEAT_MULTI_LANG
 	should_advance = FALSE;
 #endif
 }
-/* Skip PopUp[nvoci]. */
+// Skip PopUp[nvoci].
 while (menu != NULL && (menu_is_hidden(menu->dname)
 	    || menu_is_separator(menu->dname)
 	    || menu_is_tearoff(menu->dname)
 	    || menu->children == NULL))
 {
 	    menu = expand_menu_alt;
 	    did_alt_menu = TRUE;
 	}
 }
-if (menu == NULL)	    /* at end of linked list */
+if (menu == NULL)	    // at end of linked list
 	return NULL;
 if (menu->modes & expand_modes)
 #ifdef FEAT_MULTI_LANG
 	if (should_advance)
 #ifdef FEAT_MULTI_LANG
 if (should_advance)
 #endif
 {
-	/* Advance to next menu entry. */
+	// Advance to next menu entry.
 	menu = menu->next;
 	if (menu == NULL && !did_alt_menu)
 	{
 	    menu = expand_menu_alt;
 	    did_alt_menu = TRUE;
 get_menu_names(expand_T *xp UNUSED, int idx)
 {
 static vimmenu_T	*menu = NULL;
 static int		did_alt_menu = FALSE;
 #define TBUFFER_LEN 256
-static char_u	tbuffer[TBUFFER_LEN]; /*hack*/
+static char_u	tbuffer[TBUFFER_LEN]; //hack
 char_u		*str;
 #ifdef FEAT_MULTI_LANG
 static  int		should_advance = FALSE;
 #endif
-if (idx == 0)	    /* first call: start at first item */
+if (idx == 0)	    // first call: start at first item
 {
 	menu = expand_menu;
 	did_alt_menu = FALSE;
 #ifdef FEAT_MULTI_LANG
 	should_advance = FALSE;
 #endif
 }
-/* Skip Browse-style entries, popup menus and separators. */
+// Skip Browse-style entries, popup menus and separators.
 while (menu != NULL
 	    && (   menu_is_hidden(menu->dname)
 		|| (expand_emenu && menu_is_separator(menu->dname))
 		|| menu_is_tearoff(menu->dname)
 #ifndef FEAT_BROWSE
 	    menu = expand_menu_alt;
 	    did_alt_menu = TRUE;
 	}
 }
-if (menu == NULL)	    /* at end of linked list */
+if (menu == NULL)	    // at end of linked list
 	return NULL;
 if (menu->modes & expand_modes)
 {
 	if (menu->children != NULL)
 #ifdef FEAT_MULTI_LANG
 		if (menu->en_dname == NULL)
 		    should_advance = TRUE;
 	    }
 #endif
-	    /* hack on menu separators:  use a 'magic' char for the separator
+	    // hack on menu separators:  use a 'magic' char for the separator
-	     * so that '.' in names gets escaped properly */
+	    // so that '.' in names gets escaped properly
 	    STRCAT(tbuffer, "\001");
 	    str = tbuffer;
 	}
 	else
 #ifdef FEAT_MULTI_LANG
 #ifdef FEAT_MULTI_LANG
 if (should_advance)
 #endif
 {
-	/* Advance to next menu entry. */
+	// Advance to next menu entry.
 	menu = menu->next;
 	if (menu == NULL && !did_alt_menu)
 	{
 	    menu = expand_menu_alt;
 	    did_alt_menu = TRUE;
 * whether the command is an "unmenu" command.
 */
 static int
 get_menu_cmd_modes(
 char_u  *cmd,
-int	    forceit,	    /* Was there a "!" after the command? */
+int	    forceit,	    // Was there a "!" after the command?
 int	    *noremap,
 int	    *unmenu)
 {
 int	    modes;
 switch (*cmd++)
 {
-	case 'v':			/* vmenu, vunmenu, vnoremenu */
+	case 'v':			// vmenu, vunmenu, vnoremenu
 	    modes = MENU_VISUAL_MODE | MENU_SELECT_MODE;
 	    break;
-	case 'x':			/* xmenu, xunmenu, xnoremenu */
+	case 'x':			// xmenu, xunmenu, xnoremenu
 	    modes = MENU_VISUAL_MODE;
 	    break;
-	case 's':			/* smenu, sunmenu, snoremenu */
+	case 's':			// smenu, sunmenu, snoremenu
 	    modes = MENU_SELECT_MODE;
 	    break;
-	case 'o':			/* omenu */
+	case 'o':			// omenu
 	    modes = MENU_OP_PENDING_MODE;
 	    break;
-	case 'i':			/* imenu */
+	case 'i':			// imenu
 	    modes = MENU_INSERT_MODE;
 	    break;
 	case 't':
-	    if (*cmd == 'l')            /* tlmenu, tlunmenu, tlnoremenu */
+	    if (*cmd == 'l')            // tlmenu, tlunmenu, tlnoremenu
 	    {
 		modes = MENU_TERMINAL_MODE;
 		++cmd;
 		break;
 	    }
-	    modes = MENU_TIP_MODE;	/* tmenu */
+	    modes = MENU_TIP_MODE;	// tmenu
 	    break;
-	case 'c':			/* cmenu */
+	case 'c':			// cmenu
 	    modes = MENU_CMDLINE_MODE;
 	    break;
-	case 'a':			/* amenu */
+	case 'a':			// amenu
 	    modes = MENU_INSERT_MODE | MENU_CMDLINE_MODE | MENU_NORMAL_MODE
 				    | MENU_VISUAL_MODE | MENU_SELECT_MODE
 				    | MENU_OP_PENDING_MODE;
 	    break;
 	case 'n':
-	    if (*cmd != 'o')		/* nmenu, not noremenu */
+	    if (*cmd != 'o')		// nmenu, not noremenu
 	    {
 		modes = MENU_NORMAL_MODE;
 		break;
 	    }
-	    /* FALLTHROUGH */
+	    // FALLTHROUGH
 	default:
 	    --cmd;
-	    if (forceit)		/* menu!! */
+	    if (forceit)		// menu!!
 		modes = MENU_INSERT_MODE | MENU_CMDLINE_MODE;
-	    else			/* menu */
+	    else			// menu
 		modes = MENU_NORMAL_MODE | MENU_VISUAL_MODE | MENU_SELECT_MODE
 						       | MENU_OP_PENDING_MODE;
 }
 if (noremap != NULL)
 menu_text(char_u *str, int *mnemonic, char_u **actext)
 {
 char_u	*p;
 char_u	*text;
-/* Locate accelerator text, after the first TAB */
+// Locate accelerator text, after the first TAB
 p = vim_strchr(str, TAB);
 if (p != NULL)
 {
 	if (actext != NULL)
 	    *actext = vim_strsave(p + 1);
 	text = vim_strnsave(str, (int)(p - str));
 }
 else
 	text = vim_strsave(str);
-/* Find mnemonic characters "&a" and reduce "&&" to "&". */
+// Find mnemonic characters "&a" and reduce "&&" to "&".
 for (p = text; p != NULL; )
 {
 	p = vim_strchr(p, '&');
 	if (p != NULL)
 	{
-	    if (p[1] == NUL)	    /* trailing "&" */
+	    if (p[1] == NUL)	    // trailing "&"
 		break;
 	    if (mnemonic != NULL && p[1] != '&')
 #if !defined(__MVS__) || defined(MOTIF390_MNEMONIC_FIXED)
 		*mnemonic = p[1];
 #else
 	return MENU_INDEX_CMDLINE;
 if (finish_op)
 	return MENU_INDEX_OP_PENDING;
 if (State & NORMAL)
 	return MENU_INDEX_NORMAL;
-if (State & LANGMAP)	/* must be a "r" command, like Insert mode */
+if (State & LANGMAP)	// must be a "r" command, like Insert mode
 	return MENU_INDEX_INSERT;
 return MENU_INDEX_INVALID;
 }
 int
 for (menu = root_menu; menu != NULL; menu = menu->next)
 	if (STRNCMP("PopUp", menu->name, 5) == 0 && STRNCMP(menu->name + 5, mode, mode_len) == 0)
 	    break;
-/* Only show a popup when it is defined and has entries */
+// Only show a popup when it is defined and has entries
 if (menu != NULL && menu->children != NULL)
 {
 # if defined(FEAT_GUI)
 	if (gui.in_use)
 	{
-	    /* Update the menus now, in case the MenuPopup autocommand did
+	    // Update the menus now, in case the MenuPopup autocommand did
-	     * anything. */
+	    // anything.
 	    gui_update_menus(0);
 	    gui_mch_show_popupmenu(menu);
 	}
 # endif
 #  if defined(FEAT_GUI) && defined(FEAT_TERM_POPUP_MENU)
 {
 int		idx = 0;
 while (menu != NULL)
 {
-	/* Don't add a menu when only a tip was defined. */
+	// Don't add a menu when only a tip was defined.
 	if (menu->modes & MENU_ALL_MODES)
 	{
 	    if (menu->children != NULL)
 	    {
 		gui_mch_add_menu(menu, idx);
 	   )
 	    grey = FALSE;
 	else
 	    grey = TRUE;
 # ifdef FEAT_GUI_ATHENA
-	/* Hiding menus doesn't work for Athena, it can cause a crash. */
+	// Hiding menus doesn't work for Athena, it can cause a crash.
 	gui_mch_menu_grey(menu, grey);
 # else
-	/* Never hide a toplevel menu, it may make the menubar resize or
+	// Never hide a toplevel menu, it may make the menubar resize or
-	 * disappear. Same problem for ToolBar items. */
+	// disappear. Same problem for ToolBar items.
 	if (vim_strchr(p_go, GO_GREY) != NULL || menu->parent == NULL
 #  ifdef FEAT_TOOLBAR
 		|| menu_is_toolbar(menu->parent->name)
 #  endif
 		   )
 		|| (menu->mnemonic < 256 && TOLOWER_LOC(menu->mnemonic) == key))
 	    return TRUE;
 return FALSE;
 }
 # endif
-#endif /* FEAT_GUI */
+#endif // FEAT_GUI
 #if (defined(FEAT_GUI_MSWIN) && defined(FEAT_TEAROFF)) || defined(PROTO)
 /*
 * Deal with tearoff items that are added like a menu item.
 	++pri_idx;
 while (menu != NULL)
 {
 	if (menu->children != NULL && menu_is_menubar(menu->name))
 	{
-	    /* Add the menu name to the menu path.  Insert a backslash before
+	    // Add the menu name to the menu path.  Insert a backslash before
-	     * dots (it's used to separate menu names). */
+	    // dots (it's used to separate menu names).
 	    len = (int)STRLEN(pname) + (int)STRLEN(menu->name);
 	    for (s = menu->name; *s; ++s)
 		if (*s == '.' || *s == '\\')
 		    ++len;
 	    newpname = alloc(len + TEAR_LEN + 2);
 			*d++ = '\\';
 		    *d++ = *s;
 		}
 		*d = NUL;
-		/* check if tearoff already exists */
+		// check if tearoff already exists
 		if (STRCMP(menu->children->name, TEAR_STRING) != 0)
 		{
 		    gui_add_tearoff(newpname, pri_tab, pri_idx - 1);
-		    *d = NUL;			/* remove TEAR_STRING */
+		    *d = NUL;			// remove TEAR_STRING
 		}
 		STRCAT(newpname, ".");
 		gui_create_tearoffs_recurse(menu->children, newpname,
 							    pri_tab, pri_idx);
 	STRCAT(tbuf + 3, "\r");
 	STRCAT(tearpath, ".");
 	STRCAT(tearpath, TEAR_STRING);
-	/* Priority of tear-off is always 1 */
+	// Priority of tear-off is always 1
 	t = pri_tab[pri_idx + 1];
 	pri_tab[pri_idx + 1] = 1;
 #ifdef FEAT_TOOLBAR
 	menuarg.iconfile = NULL;
 {
 while (menu)
 {
 	if (menu->children)
 	{
-	    /* check if tearoff exists */
+	    // check if tearoff exists
 	    if (STRCMP(menu->children->name, TEAR_STRING) == 0)
 	    {
-		/* Disconnect the item and free the memory */
+		// Disconnect the item and free the memory
 		free_menu(&menu->children);
 	    }
-	    if (menu->children != NULL) /* if not the last one */
+	    if (menu->children != NULL) // if not the last one
 		gui_destroy_tearoffs_recurse(menu->children);
 	}
 	menu = menu->next;
 }
 }
-#endif /* FEAT_GUI_MSWIN && FEAT_TEAROFF */
+#endif // FEAT_GUI_MSWIN && FEAT_TEAROFF
 /*
 * Execute "menu".  Use by ":emenu" and the window toolbar.
 * "eap" is NULL for the window toolbar.
 * "mode_idx" specifies a MENU_INDEX_ value, use -1 to depend on the current
 {
 int		idx = mode_idx;
 if (idx < 0)
 {
-	/* Use the Insert mode entry when returning to Insert mode. */
+	// Use the Insert mode entry when returning to Insert mode.
 	if (restart_edit
 #ifdef FEAT_EVAL
 		&& !current_sctx.sc_sid
 #endif
 		)
 	{
 	    pos_T	tpos;
 	    idx = MENU_INDEX_VISUAL;
-	    /* GEDDES: This is not perfect - but it is a
+	    // GEDDES: This is not perfect - but it is a
-	     * quick way of detecting whether we are doing this from a
+	    // quick way of detecting whether we are doing this from a
-	     * selection - see if the range matches up with the visual
+	    // selection - see if the range matches up with the visual
-	     * select start and end.  */
+	    // select start and end.
 	    if ((curbuf->b_visual.vi_start.lnum == eap->line1)
 		    && (curbuf->b_visual.vi_end.lnum) == eap->line2)
 	    {
-		/* Set it up for visual mode - equivalent to gv.  */
+		// Set it up for visual mode - equivalent to gv.
 		VIsual_mode = curbuf->b_visual.vi_mode;
 		tpos = curbuf->b_visual.vi_end;
 		curwin->w_cursor = curbuf->b_visual.vi_start;
 		curwin->w_curswant = curbuf->b_visual.vi_curswant;
 	    }
 	    else
 	    {
-		/* Set it up for line-wise visual mode */
+		// Set it up for line-wise visual mode
 		VIsual_mode = 'V';
 		curwin->w_cursor.lnum = eap->line1;
 		curwin->w_cursor.col = 1;
 		tpos.lnum = eap->line2;
 		tpos.col = MAXCOL;
 		tpos.coladd = 0;
 	    }
-	    /* Activate visual mode */
+	    // Activate visual mode
 	    VIsual_active = TRUE;
 	    VIsual_reselect = TRUE;
 	    check_cursor();
 	    VIsual = curwin->w_cursor;
 	    curwin->w_cursor = tpos;
 	    check_cursor();
-	    /* Adjust the cursor to make sure it is in the correct pos
+	    // Adjust the cursor to make sure it is in the correct pos
-	     * for exclusive mode */
+	    // for exclusive mode
 	    if (*p_sel == 'e' && gchar_cursor() != NUL)
 		++curwin->w_cursor.col;
 	}
 }
-/* For the WinBar menu always use the Normal mode menu. */
+// For the WinBar menu always use the Normal mode menu.
 if (idx == -1 || eap == NULL)
 	idx = MENU_INDEX_NORMAL;
 if (idx != MENU_INDEX_INVALID && menu->strings[idx] != NULL
 						 && (menu->modes & (1 << idx)))
 {
-	/* When executing a script or function execute the commands right now.
+	// When executing a script or function execute the commands right now.
-	 * Also for the window toolbar.
+	// Also for the window toolbar.
-	 * Otherwise put them in the typeahead buffer. */
+	// Otherwise put them in the typeahead buffer.
 	if (eap == NULL
 #ifdef FEAT_EVAL
 		|| current_sctx.sc_sid != 0
 #endif
 	   )
 menu = *get_root_menu(saved_name);
 name = saved_name;
 while (*name)
 {
-	/* Find in the menu hierarchy */
+	// Find in the menu hierarchy
 	p = menu_name_skip(name);
 	while (menu != NULL)
 	{
 	    if (menu_name_equal(name, menu))
 	    int	    save_visual_reselect = VIsual_reselect;
 	    int	    save_visual_mode = VIsual_mode;
 	    if (wp != curwin)
 	    {
-		/* Clicking in the window toolbar of a not-current window.
+		// Clicking in the window toolbar of a not-current window.
-		 * Make that window the current one and save Visual mode. */
+		// Make that window the current one and save Visual mode.
 		save_curwin = curwin;
 		VIsual_active = FALSE;
 		curwin = wp;
 		curbuf = curwin->w_buffer;
 		check_cursor();
 	return NULL;
 name = saved_name;
 while (*name)
 {
-	/* find the end of one dot-separated name and put a NUL at the dot */
+	// find the end of one dot-separated name and put a NUL at the dot
 	p = menu_name_skip(name);
 	while (menu != NULL)
 	{
 	    if (menu_name_equal(name, menu))
 	    {
 		if (menu->children == NULL)
 		{
-		    /* found a menu item instead of a sub-menu */
+		    // found a menu item instead of a sub-menu
 		    if (*p == NUL)
 			emsg(_("E336: Menu path must lead to a sub-menu"));
 		    else
 			emsg(_(e_notsubmenu));
 		    menu = NULL;
 		    goto theend;
 		}
-		if (*p == NUL)	    /* found a full match */
+		if (*p == NUL)	    // found a full match
 		    goto theend;
 		break;
 	    }
 	    menu = menu->next;
 	}
-	if (menu == NULL)	/* didn't find it */
+	if (menu == NULL)	// didn't find it
 	    break;
-	/* Found a match, search the sub-menu. */
+	// Found a match, search the sub-menu.
 	menu = menu->children;
 	name = p;
 }
 if (menu == NULL)
 * Translation of menu names.  Just a simple lookup table.
 */
 typedef struct
 {
-char_u	*from;		/* English name */
+char_u	*from;		// English name
-char_u	*from_noamp;	/* same, without '&' */
+char_u	*from_noamp;	// same, without '&'
-char_u	*to;		/* translated name */
+char_u	*to;		// translated name
 } menutrans_T;
 static garray_T menutrans_ga = {0, 0, 0, 0, NULL};
 #endif
 	    vim_free(tp[i].from_noamp);
 	    vim_free(tp[i].to);
 	}
 	ga_clear(&menutrans_ga);
 # ifdef FEAT_EVAL
-	/* Delete all "menutrans_" global variables. */
+	// Delete all "menutrans_" global variables.
 	del_menutrans_vars();
 # endif
 }
 else
 {
-	/* ":menutrans from to": add translation */
+	// ":menutrans from to": add translation
 	from = arg;
 	arg = menu_skip_part(arg);
 	to = skipwhite(arg);
 	*arg = NUL;
 	arg = menu_skip_part(to);
 for (i = 0; i < menutrans_ga.ga_len; ++i)
 	if (STRNICMP(name, tp[i].from, len) == 0 && tp[i].from[len] == NUL)
 	    return tp[i].to;
-/* Now try again while ignoring '&' characters. */
+// Now try again while ignoring '&' characters.
 i = name[len];
 name[len] = NUL;
 dname = menu_text(name, NULL, NULL);
 name[len] = i;
 if (dname != NULL)
 for (p = name; *p && *p != '.'; MB_PTR_ADV(p))
 	if (*p == '\\')
 	    STRMOVE(p, p + 1);
 }
-#endif /* FEAT_MULTI_LANG */
+#endif // FEAT_MULTI_LANG
 /*
 * Isolate the menu name.
 * Skip the menu name, and translate <Tab> into a real TAB.
 */
 arg = skipwhite(arg);
 return arg;
 }
-#endif /* FEAT_MENU */
+#endif // FEAT_MENU

Mercurial > vim

comparison src/menu.c @ 18800:f41b55f9357c v8.1.2388