vim: src/gui_motif.c comparison

comparison src/gui_motif.c @ 18788:e1f4e9d78a6a v8.1.2383

patch 8.1.2383: using old C style comments Commit: https://github.com/vim/vim/commit/734a867ffe198886da7365b618be67ab8ed9d9f6 Author: Bram Moolenaar <Bram@vim.org> Date: Mon Dec 2 22:49:38 2019 +0100 patch 8.1.2383: using old C style comments Problem: Using old C style comments. Solution: Use // comments where appropriate.

author	Bram Moolenaar <Bram@vim.org>
date	Mon, 02 Dec 2019 23:00:04 +0100
parents	ce04ebdf26b8
children	3ff714d765ba

comparison

equal deleted inserted replaced

-:06ed2fe62dce
+:e1f4e9d78a6a
 #endif
 #ifdef HAVE_XM_NOTEBOOK_H
 # include <Xm/Notebook.h>
 #endif
-#include "gui_xmebw.h"	/* for our Enhanced Button Widget */
+#include "gui_xmebw.h"	// for our Enhanced Button Widget
 #if defined(FEAT_GUI_DIALOG) && defined(HAVE_XPM)
 # include "../pixmaps/alert.xpm"
 # include "../pixmaps/error.xpm"
 # include "../pixmaps/generic.xpm"
 #ifdef FEAT_FOOTER
 static Widget footer;
 #endif
 #ifdef FEAT_MENU
 # if (XmVersion >= 1002)
-/* remember the last set value for the tearoff item */
+// remember the last set value for the tearoff item
 static int tearoff_val = (int)XmTEAR_OFF_ENABLED;
 # endif
 static Widget menuBar;
 #endif
 tab_scroll_w = XtNameToWidget(tabLine, scroller_name);
 if (tab_scroll_w != (Widget)0) {
 	XtVaGetValues(tab_scroll_w, XmNx, &pos_x, XmNy, &pos_y, XmNwidth,
 		      &width, XmNheight, &height, NULL);
 	if (pos_x >= 0) {
-	    /* Tab scroller (next) is visible */
+	    // Tab scroller (next) is visible
 	    if ((event->x >= pos_x) && (event->x <= pos_x + width) &&
 		(event->y >= pos_y) && (event->y <= pos_y + height)) {
-		/* Clicked on the scroller */
+		// Clicked on the scroller
 		return TRUE;
 	    }
 	}
 }
 return FALSE;
 }
 if (event->button != Button3)
 	return;
-/* When ignoring events don't show the menu. */
+// When ignoring events don't show the menu.
 if (hold_gui_events
 # ifdef FEAT_CMDWIN
 	    || cmdwin_type != 0
 # endif
 )
 	return;
 if (event->subwindow != None)
 {
 	tab_w = XtWindowToWidget(XtDisplay(w), event->subwindow);
-	/* LINTED: avoid warning: dubious operation on enum */
+	// LINTED: avoid warning: dubious operation on enum
 	if (tab_w != (Widget)0 && XmIsPushButton(tab_w))
 	    XtVaGetValues(tab_w, XmNpageNumber, &tab_idx, NULL);
 }
 XtVaSetValues(tabLine_menu, XmNuserData, tab_idx, NULL);
 	XtGCMask    dynamic;
 	XFontStruct *fs;
 	_XmFontListGetDefaultFont(lw->label.font, &fs);
-	/* FIXME: we should be doing the whole drawing ourself here. */
+	// FIXME: we should be doing the whole drawing ourself here.
 	insensitiveGC = lw->label.insensitive_GC;
 	mask = GCForeground | GCBackground | GCGraphicsExposures;
 	dynamic = GCClipMask | GCClipXOrigin | GCClipYOrigin;
 	values.graphics_exposures = False;
 */
 #if (XmVersion >= 1002)
 XmRepTypeInstallTearOffModelConverter();
 #endif
-/* Make sure the "Quit" menu entry of the window manager is ignored */
+// Make sure the "Quit" menu entry of the window manager is ignored
 XtVaSetValues(vimShell, XmNdeleteResponse, XmDO_NOTHING, NULL);
 vimForm = XtVaCreateManagedWidget("vimForm",
 	xmFormWidgetClass, vimShell,
 	XmNborderWidth, 0,
 	NULL);
 gui_motif_menu_colors(vimForm);
 #ifdef FEAT_MENU
 {
-	Arg al[7]; /* Make sure there is enough room for arguments! */
+	Arg al[7]; // Make sure there is enough room for arguments!
 	int ac = 0;
 # if (XmVersion >= 1002)
 	XtSetArg(al[ac], XmNtearOffModel, tearoff_val); ac++;
 # endif
 	XtSetArg(al[ac], XmNleftAttachment,  XmATTACH_FORM); ac++;
 	XtSetArg(al[ac], XmNtopAttachment,   XmATTACH_FORM); ac++;
 	XtSetArg(al[ac], XmNrightAttachment, XmATTACH_FORM); ac++;
 # ifndef FEAT_TOOLBAR
-	/* Always stick to right hand side. */
+	// Always stick to right hand side.
 	XtSetArg(al[ac], XmNrightOffset, 0); ac++;
 # endif
 	XtSetArg(al[ac], XmNmarginHeight, 0); ac++;
 	menuBar = XmCreateMenuBar(vimForm, "menuBar", al, ac);
 	XtManageChild(menuBar);
-	/* Remember the default colors, needed for ":hi clear". */
+	// Remember the default colors, needed for ":hi clear".
 	XtVaGetValues(menuBar,
 	    XmNbackground, &gui.menu_def_bg_pixel,
 	    XmNforeground, &gui.menu_def_fg_pixel,
 	    NULL);
 	gui_motif_menu_colors(menuBar);
 gui_motif_menu_colors(toolBar);
 #endif
 #ifdef FEAT_GUI_TABLINE
-/* Create the Vim GUI tabline */
+// Create the Vim GUI tabline
 n = 0;
 XtSetArg(args[n], XmNbindingType, XmNONE); n++;
 XtSetArg(args[n], XmNorientation, XmVERTICAL); n++;
 XtSetArg(args[n], XmNbackPageSize, XmNONE); n++;
 XtSetArg(args[n], XmNbackPageNumber, 0); n++;
 /*
 * Install the callbacks.
 */
 gui_x11_callbacks(textArea, vimForm);
-/* Pretend we don't have input focus, we will get an event if we do. */
+// Pretend we don't have input focus, we will get an event if we do.
 gui.in_focus = FALSE;
 }
 /*
 * Called when the GUI is not going to start after all.
 int	    y UNUSED,
 int	    w UNUSED,
 int	    h UNUSED)
 {
 #ifdef FEAT_TOOLBAR
-/* Give keyboard focus to the textArea instead of the toolbar. */
+// Give keyboard focus to the textArea instead of the toolbar.
 reset_focus();
 #endif
 }
 void
 unsigned int mask;
 unsigned int width, height, border_width, depth;
 int x, y, win_x, win_y, maxX, maxY;
 Boolean mappedWhenManaged;
-/* Temporarily set value of XmNmappedWhenManaged
+// Temporarily set value of XmNmappedWhenManaged
-to stop the dialog from popping up right away */
+// to stop the dialog from popping up right away
 XtVaGetValues(shell, XmNmappedWhenManaged, &mappedWhenManaged, NULL);
 XtVaSetValues(shell, XmNmappedWhenManaged, False, NULL);
 XtManageChild(dialog_child);
-/* Get the pointer position (x, y) */
+// Get the pointer position (x, y)
 XQueryPointer(XtDisplay(shell), XtWindow(shell), &root, &child,
 		  &x, &y, &win_x, &win_y, &mask);
-/* Translate the pointer position (x, y) into a position for the new
+// Translate the pointer position (x, y) into a position for the new
-window that will place the pointer at its center */
+// window that will place the pointer at its center
 XGetGeometry(XtDisplay(shell), XtWindow(shell), &root, &win_x, &win_y,
 		 &width, &height, &border_width, &depth);
 width += 2 * border_width;
 height += 2 * border_width;
 x -= width / 2;
 y -= height / 2;
-/* Ensure that the dialog remains on screen */
+// Ensure that the dialog remains on screen
 maxX = XtScreen(shell)->width - width;
 maxY = XtScreen(shell)->height - height;
 if (x < 0)
 	x = 0;
 if (x > maxX)
 if (y < 0)
 	y = 0;
 if (y > maxY)
 	y = maxY;
-/* Set desired window position in the DialogShell */
+// Set desired window position in the DialogShell
 XtVaSetValues(shell, XmNx, x, XmNy, y, NULL);
-/* Map the widget */
+// Map the widget
 XtMapWidget(shell);
-/* Restore the value of XmNmappedWhenManaged */
+// Restore the value of XmNmappedWhenManaged
 XtVaSetValues(shell, XmNmappedWhenManaged, mappedWhenManaged, NULL);
 }
 #if defined(FEAT_MENU) || defined(FEAT_GUI_DIALOG) || defined(PROTO)
 gui_motif_create_fontlist(XFontStruct *font)
 {
 XmFontList font_list;
 # if (XmVersion <= 1001)
-/* Motif 1.1 method */
+// Motif 1.1 method
 font_list = XmFontListCreate(font, STRING_TAG);
 # else
-/* Motif 1.2 method */
+// Motif 1.2 method
 XmFontListEntry font_list_entry;
 font_list_entry = XmFontListEntryCreate(STRING_TAG, XmFONT_IS_FONT,
 					    (XtPointer)font);
 font_list = XmFontListAppendEntry(NULL, font_list_entry);
 XmFontList
 gui_motif_fontset2fontlist(XFontSet *fontset)
 {
 XmFontList font_list;
-/* Motif 1.2 method */
+// Motif 1.2 method
 XmFontListEntry font_list_entry;
 font_list_entry = XmFontListEntryCreate(STRING_TAG,
 					    XmFONT_IS_FONTSET,
 					    (XtPointer)*fontset);
 {
 	XtManageChild(menuBar);
 #ifdef FEAT_TOOLBAR
 	if (XtIsManaged(XtParent(toolBar)))
 	{
-	    /* toolBar is attached to top form */
+	    // toolBar is attached to top form
 	    XtVaSetValues(XtParent(toolBar),
 		XmNtopAttachment, XmATTACH_WIDGET,
 		XmNtopWidget, menuBar,
 		NULL);
 #ifdef FEAT_GUI_TABLINE
 if (menu_is_popup(menu->name))
 {
 	Arg arg[2];
 	int n = 0;
-	/* Only create the popup menu when it's actually used, otherwise there
+	// Only create the popup menu when it's actually used, otherwise there
-	 * is a delay when using the right mouse button. */
+	// is a delay when using the right mouse button.
 # if (XmVersion <= 1002)
 	if (mouse_model_popup())
 # endif
 	{
 	    if (gui.menu_bg_pixel != INVALCOLOR)
 	    xmCascadeButtonWidgetClass,
 	    (parent == NULL) ? menuBar : parent->submenu_id,
 	    XmNlabelString, label,
 	    XmNmnemonic, p_wak[0] == 'n' ? NUL : menu->mnemonic,
 #if (XmVersion >= 1002)
-	    /* submenu: count the tearoff item (needed for LessTif) */
+	    // submenu: count the tearoff item (needed for LessTif)
 	    XmNpositionIndex, idx + (parent != NULL
 			   && tearoff_val == (int)XmTEAR_OFF_ENABLED ? 1 : 0),
 #endif
 	    NULL);
 gui_motif_menu_colors(menu->id);
 gui_motif_menu_fontlist(menu->id);
 XmStringFree(label);
-if (menu->id == (Widget)0)		/* failed */
+if (menu->id == (Widget)0)		// failed
 	return;
-/* add accelerator text */
+// add accelerator text
 gui_motif_add_actext(menu);
 shell = XtVaCreateWidget("subMenuShell",
 	xmMenuShellWidgetClass, menu->id,
 	XmNwidth, 1,
 	xmRowColumnWidgetClass, shell,
 	XmNrowColumnType, XmMENU_PULLDOWN,
 	NULL);
 gui_motif_menu_colors(menu->submenu_id);
-if (menu->submenu_id == (Widget)0)		/* failed */
+if (menu->submenu_id == (Widget)0)		// failed
 	return;
 #if (XmVersion >= 1002)
-/* Set the colors for the tear off widget */
+// Set the colors for the tear off widget
 toggle_tearoff(menu->submenu_id);
 #endif
 XtVaSetValues(menu->id,
 	XmNsubMenuId, menu->submenu_id,
 static void
 gui_motif_add_actext(vimmenu_T *menu)
 {
 XmString	label;
-/* Add accelerator text, if there is one */
+// Add accelerator text, if there is one
 if (menu->actext != NULL && menu->id != (Widget)0)
 {
 	label = XmStringCreate((char *)menu->actext, STRING_TAG);
 	if (label == NULL)
 	    return;
 * We need to check all the items for their position and height, for the case
 * there are several rows, and/or some characters extend higher or lower.
 */
 void
 gui_mch_compute_menu_height(
-Widget	id)		    /* can be NULL when deleting menu */
+Widget	id)		    // can be NULL when deleting menu
 {
 Dimension	y, maxy;
 Dimension	margin, shadow;
 vimmenu_T	*mp;
-static Dimension	height = 21;	/* normal height of a menu item */
+static Dimension	height = 21;	// normal height of a menu item
 /*
 * Get the height of the new item, before managing it, because it will
 * still reflect the font size.  After managing it depends on the menu
 * height, which is what we just wanted to get!.
 */
 if (id != (Widget)0)
 	XtVaGetValues(id, XmNheight, &height, NULL);
-/* Find any menu Widget, to be able to call XtManageChild() */
+// Find any menu Widget, to be able to call XtManageChild()
 else
 	for (mp = root_menu; mp != NULL; mp = mp->next)
 	    if (mp->id != (Widget)0 && menu_is_menubar(mp->name))
 	    {
 		id = mp->id;
 * margin = margin around the menu buttons;  Must be added.
 * Add 4 for the underlining of shortcut keys.
 */
 gui.menu_height = maxy + height - 2 * shadow + 2 * margin + 4;
-/* Somehow the menu bar doesn't resize automatically.  Set it here,
+// Somehow the menu bar doesn't resize automatically.  Set it here,
-* even though this is a catch 22.  Don't do this when starting up,
+// even though this is a catch 22.  Don't do this when starting up,
-* somehow the menu gets very high then. */
+// somehow the menu gets very high then.
 if (gui.shell_created)
 	XtVaSetValues(menuBar, XmNheight, gui.menu_height, NULL);
 }
 #ifdef FEAT_TOOLBAR
 Pixmap	mask;
 Pixmap	map;
 attrs.valuemask = 0;
-/* Create the "sensitive" pixmap */
+// Create the "sensitive" pixmap
 status = XpmReadFileToPixmap(gui.dpy,
 	    RootWindow(gui.dpy, DefaultScreen(gui.dpy)),
 	    (char *)path, &map, &mask, &attrs);
 XpmFreeAttributes(&attrs);
 * Return a blank pixmap if it fails.
 */
 static char **
 get_toolbar_pixmap(vimmenu_T *menu, char **fname)
 {
-char_u	buf[MAXPATHL];		/* buffer storing expanded pathname */
+char_u	buf[MAXPATHL];		// buffer storing expanded pathname
-char	**xpm = NULL;		/* xpm array */
+char	**xpm = NULL;		// xpm array
 int		res;
 *fname = NULL;
-buf[0] = NUL;			/* start with NULL path */
+buf[0] = NUL;			// start with NULL path
 if (menu->iconfile != NULL)
 {
-	/* Use the "icon="  argument. */
+	// Use the "icon="  argument.
 	gui_find_iconfile(menu->iconfile, buf, "xpm");
 	res = check_xpm(buf);
-	/* If it failed, try using the menu name. */
+	// If it failed, try using the menu name.
 	if (res == FAIL && gui_find_bitmap(menu->name, buf, "xpm") == OK)
 	    res = check_xpm(buf);
 	if (res == OK)
 	{
 	    *fname = (char *)vim_strsave(buf);
 	XtSetArg(args[n], XmNpixmapData, menu->xpm); n++;
 	XtSetArg(args[n], XmNlabelLocation, XmBOTTOM); n++;
 }
 return n;
 }
-#endif /* FEAT_TOOLBAR */
+#endif // FEAT_TOOLBAR
 void
 gui_mch_add_menu_item(vimmenu_T *menu, int idx)
 {
 XmString	label;
 # ifdef EBCDIC
 menu->mnemonic = 0;
 # endif
 # if (XmVersion <= 1002)
-/* Don't add Popup menu items when the popup menu isn't used. */
+// Don't add Popup menu items when the popup menu isn't used.
 if (menu_is_child_of_popup(menu) && !mouse_model_popup())
 	return;
 # endif
 # ifdef FEAT_TOOLBAR
 if (menu_is_toolbar(parent->name))
 {
 	WidgetClass	type;
-	XmString	xms = NULL;    /* fallback label if pixmap not found */
+	XmString	xms = NULL;    // fallback label if pixmap not found
 	int		n;
 	Arg		args[18];
 	n = 0;
 	if (menu_is_separator(menu->name))
 	    XtSetArg(args[n], XmNorientation, XmVERTICAL); n++;
 	    XtSetArg(args[n], XmNseparatorType, XmSHADOW_ETCHED_IN); n++;
 	}
 	else
 	{
-	    /* Without shadows one can't sense whatever the button has been
+	    // Without shadows one can't sense whatever the button has been
-	     * pressed or not! However we want to save a bit of space...
+	    // pressed or not! However we want to save a bit of space...
-	     * Need the highlightThickness to see the focus.
+	    // Need the highlightThickness to see the focus.
-	     */
 	    XtSetArg(args[n], XmNhighlightThickness, 1); n++;
 	    XtSetArg(args[n], XmNhighlightOnEnter, True); n++;
 	    XtSetArg(args[n], XmNmarginWidth, 0); n++;
 	    XtSetArg(args[n], XmNmarginHeight, 0); n++;
 	    XtSetArg(args[n], XmNtraversalOn, False); n++;
-	    /* Set the label here, so that we can switch between icons/text
+	    // Set the label here, so that we can switch between icons/text
-	     * by changing the XmNlabelType resource. */
+	    // by changing the XmNlabelType resource.
 	    xms = XmStringCreate((char *)menu->dname, STRING_TAG);
 	    XtSetArg(args[n], XmNlabelString, xms); n++;
 	    n = add_pixmap_args(menu, args, n);
 	gui_mch_menu_set_tip(menu);
 # endif
 	menu->parent = parent;
 	menu->submenu_id = NULL;
-	/* When adding first item to toolbar it might have to be enabled .*/
+	// When adding first item to toolbar it might have to be enabled .
 	if (!XtIsManaged(XtParent(toolBar))
 		    && vim_strchr(p_go, GO_TOOLBAR) != NULL)
 	    gui_mch_show_toolbar(TRUE);
 	gui.toolbar_height = gui_mch_compute_toolbar_height();
 	return;
-} /* toolbar menu item */
+} // toolbar menu item
 # endif
-/* No parent, must be a non-menubar menu */
+// No parent, must be a non-menubar menu
 if (parent->submenu_id == (Widget)0)
 	return;
 menu->submenu_id = (Widget)0;
-/* Add menu separator */
+// Add menu separator
 if (menu_is_separator(menu->name))
 {
 	menu->id = XtVaCreateWidget("subMenu",
 		xmSeparatorGadgetClass, parent->submenu_id,
 #if (XmVersion >= 1002)
-		/* count the tearoff item (needed for LessTif) */
+		// count the tearoff item (needed for LessTif)
 		XmNpositionIndex, idx + (tearoff_val == (int)XmTEAR_OFF_ENABLED
 								     ? 1 : 0),
 #endif
 		NULL);
 	gui_motif_menu_colors(menu->id);
 menu->id = XtVaCreateWidget("subMenu",
 	xmPushButtonWidgetClass, parent->submenu_id,
 	XmNlabelString, label,
 	XmNmnemonic, menu->mnemonic,
 #if (XmVersion >= 1002)
-	/* count the tearoff item (needed for LessTif) */
+	// count the tearoff item (needed for LessTif)
 	XmNpositionIndex, idx + (tearoff_val == (int)XmTEAR_OFF_ENABLED
 								     ? 1 : 0),
 #endif
 	NULL);
 gui_motif_menu_colors(menu->id);
 if (menu->id != (Widget)0)
 {
 	XtAddCallback(menu->id, XmNactivateCallback, gui_x11_menu_cb,
 		(XtPointer)menu);
-	/* add accelerator text */
+	// add accelerator text
 	gui_motif_add_actext(menu);
 }
 }
 #if (XmVersion <= 1002) || defined(PROTO)
 void
 gui_motif_update_mousemodel(vimmenu_T *menu)
 {
 int		idx = 0;
-/* When GUI hasn't started the menus have not been created. */
+// When GUI hasn't started the menus have not been created.
 if (!gui.in_use)
 return;
 while (menu)
 {
 {
 	  if (menu_is_popup(menu->name))
 	  {
 	      if (mouse_model_popup())
 	      {
-		  /* Popup menu will be used.  Create the popup menus. */
+		  // Popup menu will be used.  Create the popup menus.
 		  gui_mch_add_menu(menu, idx);
 		  gui_motif_update_mousemodel(menu->children);
 	      }
 	      else
 	      {
-		  /* Popup menu will not be used.  Destroy the popup menus. */
+		  // Popup menu will not be used.  Destroy the popup menus.
 		  gui_motif_update_mousemodel(menu->children);
 		  gui_mch_destroy_menu(menu);
 	      }
 	  }
 }
 #endif
 static void
 submenu_change(
 vimmenu_T	*menu,
-int		colors)		/* TRUE for colors, FALSE for font */
+int		colors)		// TRUE for colors, FALSE for font
 {
 vimmenu_T	*mp;
 for (mp = menu; mp != NULL; mp = mp->next)
 {
 	{
 	    if (colors)
 	    {
 		gui_motif_menu_colors(mp->id);
 #ifdef FEAT_TOOLBAR
-		/* For a toolbar item: Free the pixmap and allocate a new one,
+		// For a toolbar item: Free the pixmap and allocate a new one,
-		 * so that the background color is right. */
+		// so that the background color is right.
 		if (mp->xpm != NULL)
 		{
 		    int		n = 0;
 		    Arg		args[18];
 		    n = add_pixmap_args(mp, args, n);
 		    XtSetValues(mp->id, args, n);
 		}
 # ifdef FEAT_BEVAL_GUI
-		/* If we have a tooltip, then we need to change its font */
+		// If we have a tooltip, then we need to change its font
 		if (mp->tip != NULL)
 		{
 		    Arg args[2];
 		    args[0].name = XmNbackground;
 	    }
 	    else
 	    {
 		gui_motif_menu_fontlist(mp->id);
 #ifdef FEAT_BEVAL_GUI
-		/* If we have a tooltip, then we need to change its font */
+		// If we have a tooltip, then we need to change its font
 		if (mp->tip != NULL)
 		{
 		    Arg args[1];
 		    args[0].name = XmNfontList;
 	}
 	if (mp->children != NULL)
 	{
 #if (XmVersion >= 1002)
-	    /* Set the colors/font for the tear off widget */
+	    // Set the colors/font for the tear off widget
 	    if (mp->submenu_id != (Widget)0)
 	    {
 		if (colors)
 		    gui_motif_menu_colors(mp->submenu_id);
 		else
 		    gui_motif_menu_fontlist(mp->submenu_id);
 		toggle_tearoff(mp->submenu_id);
 	    }
 #endif
-	    /* Set the colors for the children */
+	    // Set the colors for the children
 	    submenu_change(mp->children, colors);
 	}
 }
 }
 * Destroy the machine specific menu widget.
 */
 void
 gui_mch_destroy_menu(vimmenu_T *menu)
 {
-/* Please be sure to destroy the parent widget first (i.e. menu->id).
+// Please be sure to destroy the parent widget first (i.e. menu->id).
-* On the other hand, problems have been reported that the submenu must be
+// On the other hand, problems have been reported that the submenu must be
-* deleted first...
+// deleted first...
-*
+//
-* This code should be basically identical to that in the file gui_athena.c
+// This code should be basically identical to that in the file gui_athena.c
-* because they are both Xt based.
+// because they are both Xt based.
-*/
 if (menu->submenu_id != (Widget)0)
 {
 	XtDestroyWidget(menu->submenu_id);
 	menu->submenu_id = (Widget)0;
 }
 	parent = XtParent(menu->id);
 #if defined(FEAT_TOOLBAR) && defined(FEAT_BEVAL_GUI)
 	if (parent == toolBar && menu->tip != NULL)
 	{
-	    /* We try to destroy this before the actual menu, because there are
+	    // We try to destroy this before the actual menu, because there are
-	     * callbacks, etc. that will be unregistered during the tooltip
+	    // callbacks, etc. that will be unregistered during the tooltip
-	     * destruction.
+	    // destruction.
-	     *
+	    //
-	     * If you call "gui_mch_destroy_beval_area()" after destroying
+	    // If you call "gui_mch_destroy_beval_area()" after destroying
-	     * menu->id, then the tooltip's window will have already been
+	    // menu->id, then the tooltip's window will have already been
-	     * deallocated by Xt, and unknown behaviour will ensue (probably
+	    // deallocated by Xt, and unknown behaviour will ensue (probably
-	     * a core dump).
+	    // a core dump).
-	     */
 	    gui_mch_destroy_beval_area(menu->tip);
 	    menu->tip = NULL;
 	}
 #endif
 	XtDestroyWidget(menu->id);
 #ifdef FEAT_TOOLBAR
 	else if (parent == toolBar)
 	{
 	    Cardinal    num_children;
-	    /* When removing last toolbar item, don't display the toolbar. */
+	    // When removing last toolbar item, don't display the toolbar.
 	    XtVaGetValues(toolBar, XmNnumChildren, &num_children, NULL);
 	    if (num_children == 0)
 		gui_mch_show_toolbar(FALSE);
 	    else
 		gui.toolbar_height = gui_mch_compute_toolbar_height();
 XmMenuPosition(menu->submenu_id, gui_x11_get_last_mouse_event());
 XtManageChild(menu->submenu_id);
 #endif
 }
-#endif /* FEAT_MENU */
+#endif // FEAT_MENU
 /*
 * Set the menu and scrollbar colors to their default values.
 */
 void
 gui_mch_def_colors(void)
 {
 if (gui.in_use)
 {
-	/* Use the values saved when starting up.  These should come from the
+	// Use the values saved when starting up.  These should come from the
-	 * window manager or a resources file. */
+	// window manager or a resources file.
 	gui.menu_fg_pixel = gui.menu_def_fg_pixel;
 	gui.menu_bg_pixel = gui.menu_def_bg_pixel;
 	gui.scroll_fg_pixel = gui.scroll_def_fg_pixel;
 	gui.scroll_bg_pixel = gui.scroll_def_bg_pixel;
 #ifdef FEAT_BEVAL_GUI
 if (sb->id != (Widget)0)
 	XtVaSetValues(sb->id,
 		  XmNvalue, val,
 		  XmNsliderSize, size,
 		  XmNpageIncrement, (size > 2 ? size - 2 : 1),
-		  XmNmaximum, max + 1,	    /* Motif has max one past the end */
+		  XmNmaximum, max + 1,	    // Motif has max one past the end
 		  NULL);
 }
 void
 gui_mch_set_scrollbar_pos(
 	}
 	else
 	{
 	    if (!gui.which_scrollbars[sb->type])
 	    {
-		/* The scrollbars of this type are all disabled, adjust the
+		// The scrollbars of this type are all disabled, adjust the
-		 * textArea attachment offset. */
+		// textArea attachment offset.
 		switch (sb->type)
 		{
 		    case SBAR_LEFT:
 			XtSetArg(args[n], XmNleftOffset, 0); n++;
 			break;
 }
 void
 gui_mch_create_scrollbar(
 scrollbar_T *sb,
-int		orient)	/* SBAR_VERT or SBAR_HORIZ */
+int		orient)	// SBAR_VERT or SBAR_HORIZ
 {
 Arg		args[16];
 int		n;
 n = 0;
 }
 sb->id = XtCreateWidget("scrollBar",
 	    xmScrollBarWidgetClass, textAreaForm, args, n);
-/* Remember the default colors, needed for ":hi clear". */
+// Remember the default colors, needed for ":hi clear".
 if (gui.scroll_def_bg_pixel == (guicolor_T)0
 	    && gui.scroll_def_fg_pixel == (guicolor_T)0)
 	XtVaGetValues(sb->id,
 		XmNbackground, &gui.scroll_def_bg_pixel,
 		XmNforeground, &gui.scroll_def_fg_pixel,
 		    XmNbackground, gui.scroll_fg_pixel,
 #endif
 		    NULL);
 }
-/* This is needed for the rectangle below the vertical scrollbars. */
+// This is needed for the rectangle below the vertical scrollbars.
 if (sb == &gui.bottom_sbar && textAreaForm != (Widget)0)
 	gui_motif_scroll_colors(textAreaForm);
 }
 /*
 	{
 	    if (XtIsManaged(id))
 	    {
 		XtUnmanageChild(id);
 		XtVaSetValues(id, XmNfontList, fl, NULL);
-		/* We should force the widget to recalculate its
+		// We should force the widget to recalculate its
-		 * geometry now. */
+		// geometry now.
 		XtManageChild(id);
 	    }
 	    else
 		XtVaSetValues(id, XmNfontList, fl, NULL);
 	    XmFontListFree(fl);
 	{
 	    if (XtIsManaged(id))
 	    {
 		XtUnmanageChild(id);
 		XtVaSetValues(id, XmNfontList, fl, NULL);
-		/* We should force the widget to recalculate its
+		// We should force the widget to recalculate its
-		 * geometry now. */
+		// geometry now.
 		XtManageChild(id);
 	    }
 	    else
 		XtVaSetValues(id, XmNfontList, fl, NULL);
 	    XmFontListFree(fl);
 #include <Xm/FileSB.h>
 #include <Xm/XmStrDefs.h>
 typedef struct dialog_callback_arg
 {
-char *  args;   /* not used right now */
+char *  args;   // not used right now
 int	    id;
 } dcbarg_T;
 static Widget dialog_wgt;
 static char *browse_fname = NULL;
 static XmStringCharSet charset = (XmStringCharSet) XmSTRING_DEFAULT_CHARSET;
-				/* used to set up XmStrings */
+				// used to set up XmStrings
 static void DialogCancelCB(Widget, XtPointer, XtPointer);
 static void DialogAcceptCB(Widget, XtPointer, XtPointer);
 /*
 * Put up a file requester.
 * Returns the selected name in allocated memory, or NULL for Cancel.
 */
 char_u *
 gui_mch_browse(
-int		saving UNUSED,	/* select file to write */
+int		saving UNUSED,	// select file to write
-char_u	*title,		/* title for the window */
+char_u	*title,		// title for the window
-char_u	*dflt,		/* default name */
+char_u	*dflt,		// default name
-char_u	*ext UNUSED,	/* not used (extension added) */
+char_u	*ext UNUSED,	// not used (extension added)
-char_u	*initdir,	/* initial directory, NULL for current dir */
+char_u	*initdir,	// initial directory, NULL for current dir
-char_u	*filter)	/* file name filter */
+char_u	*filter)	// file name filter
 {
 char_u	dirbuf[MAXPATHL];
 char_u	dfltbuf[MAXPATHL];
 char_u	*pattern;
 char_u	*tofree = NULL;
-/* There a difference between the resource name and value, Therefore, we
+// There a difference between the resource name and value, Therefore, we
-* avoid to (ab-)use the (maybe internationalized!) dialog title as a
+// avoid to (ab-)use the (maybe internationalized!) dialog title as a
-* dialog name.
+// dialog name.
-*/
 dialog_wgt = XmCreateFileSelectionDialog(vimShell, "browseDialog", NULL, 0);
 if (initdir == NULL || *initdir == NUL)
 {
 if (dflt == NULL)
 	dflt = (char_u *)"";
 else if (STRLEN(initdir) + STRLEN(dflt) + 2 < MAXPATHL)
 {
-	/* The default selection should be the full path, "dflt" is only the
+	// The default selection should be the full path, "dflt" is only the
-	 * file name. */
+	// file name.
 	STRCPY(dfltbuf, initdir);
 	add_pathsep(dfltbuf);
 	STRCAT(dfltbuf, dflt);
 	dflt = dfltbuf;
 }
-/* Can only use one pattern for a file name.  Get the first pattern out of
+// Can only use one pattern for a file name.  Get the first pattern out of
-* the filter.  An empty pattern means everything matches. */
+// the filter.  An empty pattern means everything matches.
 if (filter == NULL)
 	pattern = (char_u *)"";
 else
 {
 	char_u	*s, *p;
 	s = filter;
 	for (p = filter; *p != NUL; ++p)
 	{
-	    if (*p == '\t')	/* end of description, start of pattern */
+	    if (*p == '\t')	// end of description, start of pattern
 		s = p + 1;
-	    if (*p == ';' || *p == '\n')	/* end of (first) pattern */
+	    if (*p == ';' || *p == '\n')	// end of (first) pattern
 		break;
 	}
 	pattern = vim_strnsave(s, p - s);
 	tofree = pattern;
 	if (pattern == NULL)
 set_predefined_label(dialog_wgt, "Help", _("&Help"));
 set_predefined_label(dialog_wgt, "Items", _("Files"));
 set_predefined_label(dialog_wgt, "OK", _("&OK"));
 set_predefined_label(dialog_wgt, "Selection", _("Selection"));
-/* This is to save us from silly external settings using not fixed with
+// This is to save us from silly external settings using not fixed with
-* fonts for file selection.
+// fonts for file selection.
-*/
 set_predefined_fontlist(dialog_wgt, "DirListSW.DirList");
 set_predefined_fontlist(dialog_wgt, "ItemsListSW.ItemsList");
 gui_motif_menu_colors(dialog_wgt);
 if (gui.scroll_bg_pixel != INVALCOLOR)
 	XtVaSetValues(dialog_wgt, XmNtroughColor, gui.scroll_bg_pixel, NULL);
 XtAddCallback(dialog_wgt, XmNokCallback, DialogAcceptCB, (XtPointer)0);
 XtAddCallback(dialog_wgt, XmNcancelCallback, DialogCancelCB, (XtPointer)0);
-/* We have no help in this window, so hide help button */
+// We have no help in this window, so hide help button
 XtUnmanageChild(XmFileSelectionBoxGetChild(dialog_wgt,
 					(unsigned char)XmDIALOG_HELP_BUTTON));
 manage_centered(dialog_wgt);
 activate_dialog_mnemonics(dialog_wgt);
-/* sit in a loop until the dialog box has gone away */
+// sit in a loop until the dialog box has gone away
 do
 {
 	XtAppProcessEvent(XtWidgetToApplicationContext(dialog_wgt),
 	    (XtInputMask)XtIMAll);
 } while (XtIsManaged(dialog_wgt));
 /*
 * Process callback from Dialog cancel actions.
 */
 static void
 DialogCancelCB(
-Widget	w UNUSED,		/*  widget id		*/
+Widget	w UNUSED,		//  widget id
-XtPointer	client_data UNUSED,	/*  data from application   */
+XtPointer	client_data UNUSED,	//  data from application
-XtPointer	call_data UNUSED)	/*  data from widget class  */
+XtPointer	call_data UNUSED)	//  data from widget class
 {
 if (browse_fname != NULL)
 {
 	XtFree(browse_fname);
 	browse_fname = NULL;
 /*
 * Process callback from Dialog actions.
 */
 static void
 DialogAcceptCB(
-Widget	w UNUSED,		/*  widget id		*/
+Widget	w UNUSED,		//  widget id
-XtPointer	client_data UNUSED,	/*  data from application   */
+XtPointer	client_data UNUSED,	//  data from application
-XtPointer	call_data)		/*  data from widget class  */
+XtPointer	call_data)		//  data from widget class
 {
 XmFileSelectionBoxCallbackStruct *fcb;
 if (browse_fname != NULL)
 {
 	XtFree(browse_fname);
 	browse_fname = NULL;
 }
 fcb = (XmFileSelectionBoxCallbackStruct *)call_data;
-/* get the filename from the file selection box */
+// get the filename from the file selection box
 XmStringGetLtoR(fcb->value, charset, &browse_fname);
-/* popdown the file selection box */
+// popdown the file selection box
 XtUnmanageChild(dialog_wgt);
 }
-#endif /* FEAT_BROWSE */
+#endif // FEAT_BROWSE
 #if defined(FEAT_GUI_DIALOG) || defined(PROTO)
 static int	dialogStatus;
 int		type UNUSED,
 char_u	*title,
 char_u	*message,
 char_u	*button_names,
 int		dfltbutton,
-char_u	*textfield,		/* buffer of size IOSIZE */
+char_u	*textfield,		// buffer of size IOSIZE
 int		ex_cmd UNUSED)
 {
 char_u		*buts;
 char_u		*p, *next;
 XtAppContext	app;
 #endif
 if (title == NULL)
 	title = (char_u *)_("Vim dialog");
-/* if our pointer is currently hidden, then we should show it. */
+// if our pointer is currently hidden, then we should show it.
 gui_mch_mousehide(FALSE);
 dialogform = XmCreateFormDialog(vimShell, (char *)"dialog", NULL, 0);
-/* Check 'v' flag in 'guioptions': vertical button placement. */
+// Check 'v' flag in 'guioptions': vertical button placement.
 vertical = (vim_strchr(p_go, GO_VERTICAL) != NULL);
-/* Set the title of the Dialog window */
+// Set the title of the Dialog window
 label = XmStringCreateSimple((char *)title);
 if (label == NULL)
 	return -1;
 XtVaSetValues(dialogform,
 	    XmNdialogTitle, label,
 	    XmNhorizontalSpacing, 4,
 	    XmNverticalSpacing, vertical ? 0 : 4,
 	    NULL);
 XmStringFree(label);
-/* make a copy, so that we can insert NULs */
+// make a copy, so that we can insert NULs
 buts = vim_strsave(button_names);
 if (buts == NULL)
 	return -1;
-/* Count the number of buttons and allocate buttons[]. */
+// Count the number of buttons and allocate buttons[].
 butcount = 1;
 for (p = buts; *p; ++p)
 	if (*p == DLG_BUTTON_SEP)
 	    ++butcount;
 buttons = ALLOC_MULT(Widget, butcount);
 		XmNdefaultButtonShadowThickness, 1,
 		NULL);
 	XmStringFree(label);
 	gui_motif_menu_fontlist(buttons[butcount]);
-	/* Layout properly. */
+	// Layout properly.
 	if (butcount > 0)
 	{
 	    if (vertical)
 		XtVaSetValues(buttons[butcount],
 		    XtVaSetValues(buttons[butcount],
 			    XmNrightAttachment, XmATTACH_FORM,
 			    XmNrightOffset, 4,
 			    NULL);
-		    /* fill in a form as invisible separator */
+		    // fill in a form as invisible separator
 		    sep_form = XtVaCreateWidget("separatorForm",
 			    xmFormWidgetClass,	dialogform,
 			    XmNleftAttachment, XmATTACH_WIDGET,
 			    XmNleftWidget, buttons[butcount - 1],
 			    XmNrightAttachment, XmATTACH_WIDGET,
 		XtVaSetValues(buttons[0],
 			XmNrightAttachment, XmATTACH_FORM,
 			XmNrightOffset, 4,
 			NULL);
-		/* fill in a form as invisible separator */
+		// fill in a form as invisible separator
 		sep_form = XtVaCreateWidget("separatorForm",
 			xmFormWidgetClass, dialogform,
 			XmNleftAttachment, XmATTACH_FORM,
 			XmNleftOffset, 4,
 			XmNrightAttachment, XmATTACH_WIDGET,
 vim_free(buts);
 separator = (Widget) 0;
 if (butcount > 0)
 {
-	/* Create the separator for beauty. */
+	// Create the separator for beauty.
 	n = 0;
 	XtSetArg(args[n], XmNorientation, XmHORIZONTAL); n++;
 	XtSetArg(args[n], XmNbottomAttachment, XmATTACH_WIDGET); n++;
 	XtSetArg(args[n], XmNbottomWidget, buttons[0]); n++;
 	XtSetArg(args[n], XmNbottomOffset, 4); n++;
 	XtManageChild(dialogtextfield);
 	XtAddEventHandler(dialogtextfield, KeyPressMask, False,
 			    (XtEventHandler)keyhit_callback, (XtPointer)NULL);
 }
-/* Form holding both message and pixmap labels */
+// Form holding both message and pixmap labels
 form = XtVaCreateWidget("separatorForm",
 	    xmFormWidgetClass, dialogform,
 	    XmNleftAttachment, XmATTACH_FORM,
 	    XmNrightAttachment, XmATTACH_FORM,
 	    XmNtopAttachment, XmATTACH_FORM,
 	    NULL);
 XtManageChild(form);
 #ifdef HAVE_XPM
-/* Add a pixmap, left of the message. */
+// Add a pixmap, left of the message.
 switch (type)
 {
 	case VIM_GENERIC:
 	    icon_data = generic_xpm;
 	    break;
 dialogpixmap = create_pixmap_label(form, "dialogPixmap",
 	    icon_data, args, n);
 XtManageChild(dialogpixmap);
 #endif
-/* Create the dialog message.
+// Create the dialog message.
-* Since LessTif is apparently having problems with the creation of
+// Since LessTif is apparently having problems with the creation of
-* properly localized string, we use LtoR here. The symptom is that the
+// properly localized string, we use LtoR here. The symptom is that the
-* string sill not show properly in multiple lines as it does in native
+// string sill not show properly in multiple lines as it does in native
-* Motif.
+// Motif.
-*/
 label = XmStringCreateLtoR((char *)message, STRING_TAG);
 if (label == NULL)
 	return -1;
 w = XtVaCreateManagedWidget("dialogMessage",
 				xmLabelGadgetClass, form,
 manage_centered(dialogform);
 activate_dialog_mnemonics(dialogform);
 if (textfield != NULL && *textfield != NUL)
 {
-	/* This only works after the textfield has been realised. */
+	// This only works after the textfield has been realised.
 	XmTextFieldSetSelection(dialogtextfield,
 			 (XmTextPosition)0, (XmTextPosition)STRLEN(textfield),
 					   XtLastTimestampProcessed(gui.dpy));
 	XmTextFieldSetCursorPosition(dialogtextfield,
 					   (XmTextPosition)STRLEN(textfield));
 }
 app = XtWidgetToApplicationContext(dialogform);
-/* Loop until a button is pressed or the dialog is killed somehow. */
+// Loop until a button is pressed or the dialog is killed somehow.
 dialogStatus = -1;
 for (;;)
 {
 	XtAppProcessEvent(app, (XtInputMask)XtIMAll);
 	if (dialogStatus >= 0 || !XtIsManaged(dialogform))
 suppress_dialog_mnemonics(dialogform);
 XtDestroyWidget(dialogform);
 return dialogStatus;
 }
-#endif /* FEAT_GUI_DIALOG */
+#endif // FEAT_GUI_DIALOG
 #if defined(FEAT_FOOTER) || defined(PROTO)
 static int
 gui_mch_compute_footer_height(void)
 {
-Dimension	height;		    /* total Toolbar height */
+Dimension	height;		    // total Toolbar height
-Dimension	top;		    /* XmNmarginTop */
+Dimension	top;		    // XmNmarginTop
-Dimension	bottom;		    /* XmNmarginBottom */
+Dimension	bottom;		    // XmNmarginBottom
-Dimension	shadow;		    /* XmNshadowThickness */
+Dimension	shadow;		    // XmNshadowThickness
 XtVaGetValues(footer,
 	    XmNheight, &height,
 	    XmNmarginTop, &top,
 	    XmNmarginBottom, &bottom,
 #if defined(FEAT_TOOLBAR) || defined(PROTO)
 void
 gui_mch_show_toolbar(int showit)
 {
-Cardinal	numChildren;	    /* how many children toolBar has */
+Cardinal	numChildren;	    // how many children toolBar has
 if (toolBar == (Widget)0)
 	return;
 XtVaGetValues(toolBar, XmNnumChildren, &numChildren, NULL);
 if (showit && numChildren > 0)
 {
-	/* Assume that we want to show the toolbar if p_toolbar contains
+	// Assume that we want to show the toolbar if p_toolbar contains
-	 * valid option settings, therefore p_toolbar must not be NULL.
+	// valid option settings, therefore p_toolbar must not be NULL.
-	 */
 	WidgetList  children;
 	XtVaGetValues(toolBar, XmNchildren, &children, NULL);
 	{
 	    void    (*action)(BalloonEval *);
 		vimmenu_T   *cur;
 		for (toolbar = root_menu; toolbar; toolbar = toolbar->next)
 		    if (menu_is_toolbar(toolbar->dname))
 			break;
-		/* Assumption: toolbar is NULL if there is no toolbar,
+		// Assumption: toolbar is NULL if there is no toolbar,
-		 *	       otherwise it contains the toolbar menu structure.
+		//	       otherwise it contains the toolbar menu structure.
-		 *
+		//
-		 * Assumption: "numChildren" == the number of items in the list
+		// Assumption: "numChildren" == the number of items in the list
-		 *	       of items beginning with toolbar->children.
+		//	       of items beginning with toolbar->children.
-		 */
 		if (toolbar)
 		{
 		    for (cur = toolbar->children; cur; cur = cur->next)
 		    {
 			Arg	    args[1];
 			int	    n = 0;
-			/* Enable/Disable tooltip (OK to enable while
+			// Enable/Disable tooltip (OK to enable while
-			 * currently enabled). */
+			// currently enabled).
 			if (cur->tip != NULL)
 			    (*action)(cur->tip);
 			if (!menu_is_separator(cur->name))
 			{
 			    if (text == 1 || cur->xpm == NULL)
 int
 gui_mch_compute_toolbar_height(void)
 {
 Dimension	borders;
-Dimension	height;		    /* total Toolbar height */
+Dimension	height;		    // total Toolbar height
-Dimension	whgt;		    /* height of each widget */
+Dimension	whgt;		    // height of each widget
-WidgetList	children;	    /* list of toolBar's children */
+WidgetList	children;	    // list of toolBar's children
-Cardinal	numChildren;	    /* how many children toolBar has */
+Cardinal	numChildren;	    // how many children toolBar has
 int		i;
 borders = 0;
 height = 0;
 if (toolBar != (Widget)0 && toolBarFrame != (Widget)0)
-{				    /* get height of XmFrame parent */
+{				    // get height of XmFrame parent
 	Dimension	fst;
 	Dimension	fmh;
 	Dimension	tst;
 	Dimension	tmh;
 	    if (height < whgt)
 		height = whgt;
 	}
 }
 #ifdef LESSTIF_VERSION
-/* Hack: When starting up we get wrong dimensions. */
+// Hack: When starting up we get wrong dimensions.
 if (height < 10)
 	height = 24;
 #endif
 return (int)(height + (borders << 1));
 BalloonEval		*beval;
 if (tabLine == (Widget)0)
 	return;
-/* Add a label for each tab page.  They all contain the same text area. */
+// Add a label for each tab page.  They all contain the same text area.
 for (tp = first_tabpage; tp != NULL; tp = tp->tp_next, ++nr)
 {
 	if (tp == curtab)
 	    curtabidx = nr;
 	page_status = XmNotebookGetPageInfo(tabLine, nr, &page_info);
 	if (page_status == XmPAGE_INVALID
 		|| page_info.major_tab_widget == (Widget)0)
 	{
-	    /* Add the tab */
+	    // Add the tab
 	    n = 0;
 	    XtSetArg(args[n], XmNnotebookChildType, XmMAJOR_TAB); n++;
 	    XtSetArg(args[n], XmNtraversalOn, False); n++;
 	    XtSetArg(args[n], XmNalignment, XmALIGNMENT_BEGINNING); n++;
 	    XtSetArg(args[n], XmNhighlightThickness, 1); n++;
 tab_count = nr - 1;
 XtVaGetValues(tabLine, XmNlastPageNumber, &last_page, NULL);
-/* Remove any old labels. */
+// Remove any old labels.
 while (nr <= last_page)
 {
 	if (XmNotebookGetPageInfo(tabLine, nr, &page_info) != XmPAGE_INVALID
 	    && page_info.page_number == nr
 	    && page_info.major_tab_widget != (Widget)0)
 	{
 	    if (XtIsManaged(id))
 	    {
 		XtUnmanageChild(id);
 		XtVaSetValues(id, XmNfontList, fl, NULL);
-		/* We should force the widget to recalculate its
+		// We should force the widget to recalculate its
-		 * geometry now. */
+		// geometry now.
 		XtManageChild(id);
 	    }
 	    else
 		XtVaSetValues(id, XmNfontList, fl, NULL);
 	    XmFontListFree(fl);
 	{
 	    if (XtIsManaged(id))
 	    {
 		XtUnmanageChild(id);
 		XtVaSetValues(id, XmNfontList, fl, NULL);
-		/* We should force the widget to recalculate its
+		// We should force the widget to recalculate its
-		 * geometry now. */
+		// geometry now.
 		XtManageChild(id);
 	    }
 	    else
 		XtVaSetValues(id, XmNfontList, fl, NULL);
 	    XmFontListFree(fl);
 * We don't create it twice for the sake of speed.
 */
 typedef struct _SharedFindReplace
 {
-Widget dialog;	/* the main dialog widget */
+Widget dialog;	// the main dialog widget
-Widget wword;	/* 'Exact match' check button */
+Widget wword;	// 'Exact match' check button
-Widget mcase;	/* 'match case' check button */
+Widget mcase;	// 'match case' check button
-Widget up;		/* search direction 'Up' radio button */
+Widget up;		// search direction 'Up' radio button
-Widget down;	/* search direction 'Down' radio button */
+Widget down;	// search direction 'Down' radio button
-Widget what;	/* 'Find what' entry text widget */
+Widget what;	// 'Find what' entry text widget
-Widget with;	/* 'Replace with' entry text widget */
+Widget with;	// 'Replace with' entry text widget
-Widget find;	/* 'Find Next' action button */
+Widget find;	// 'Find Next' action button
-Widget replace;	/* 'Replace With' action button */
+Widget replace;	// 'Replace With' action button
-Widget all;		/* 'Replace All' action button */
+Widget all;		// 'Replace All' action button
-Widget undo;	/* 'Undo' action button */
+Widget undo;	// 'Undo' action button
 Widget cancel;
 } SharedFindReplace;
 static SharedFindReplace find_widgets = {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
 XtPointer	call_data UNUSED)
 {
 SharedFindReplace *cd = (SharedFindReplace *)client_data;
 if (cd != NULL)
-/* suppress_dialog_mnemonics(cd->dialog); */
+// suppress_dialog_mnemonics(cd->dialog);
 	cd->dialog = (Widget)0;
 }
 static void
 find_replace_dismiss_callback(
 if (flags == FRD_UNDO)
 {
 	char_u	*save_cpo = p_cpo;
-	/* No need to be Vi compatible here. */
+	// No need to be Vi compatible here.
 	p_cpo = (char_u *)"";
 	u_undo(1);
 	p_cpo = save_cpo;
 	gui_update_screen();
 	return;
 }
-/* Get the search/replace strings from the dialog */
+// Get the search/replace strings from the dialog
 if (flags == FRD_FINDNEXT)
 {
 	repl_text = NULL;
 	sfr = &find_widgets;
 }
 if (frdp == NULL)
 	return;
 keysym = XLookupKeysym(event, 0);
-/* the scape key pops the whole dialog down */
+// the scape key pops the whole dialog down
 if (keysym == XK_Escape)
 	XtUnmanageChild(frdp->dialog);
 }
 static void
 Dimension		widest;
 char_u		*entry_text;
 frdp = do_replace ? &repl_widgets : &find_widgets;
-/* Get the search string to use. */
+// Get the search string to use.
 entry_text = get_find_dialog_text(arg, &wword, &mcase);
-/* If the dialog already exists, just raise it. */
+// If the dialog already exists, just raise it.
 if (frdp->dialog)
 {
 	gui_motif_synch_fonts();
-	/* If the window is already up, just pop it to the top */
+	// If the window is already up, just pop it to the top
 	if (XtIsManaged(frdp->dialog))
 	    XMapRaised(XtDisplay(frdp->dialog),
 					    XtWindow(XtParent(frdp->dialog)));
 	else
 	    XtManageChild(frdp->dialog);
 	XtVaSetValues(frdp->wword, XmNset, wword, NULL);
 	return;
 }
-/* Create a fresh new dialog window */
+// Create a fresh new dialog window
 if (do_replace)
 	 str = XmStringCreateSimple(_("VIM - Search and Replace..."));
 else
 	 str = XmStringCreateSimple(_("VIM - Search..."));
 	}
 	XtAddEventHandler(frdp->what, KeyPressMask, False,
 			    (XtEventHandler)find_replace_keypress,
 			    (XtPointer)frdp);
-	/* Get the maximum width between the label widgets and line them up.
+	// Get the maximum width between the label widgets and line them up.
-	 */
 	n = 0;
 	XtSetArg(args[n], XmNwidth, &width); n++;
 	XtGetValues(label_what, args, n);
 	widest = width;
 	if (do_replace)
 SharedFindReplace *frdp;
 int		    do_replace;
 XFontStruct	    *font;
 XmFontList	    font_list;
-/* FIXME: Unless we find out how to create a XmFontList from a XFontSet,
+// FIXME: Unless we find out how to create a XmFontList from a XFontSet,
-* we just give up here on font synchronization. */
+// we just give up here on font synchronization.
 font = (XFontStruct *)gui.norm_font;
 if (font == NULL)
 	return;
 font_list = gui_motif_create_fontlist(font);
-/* OK this loop is a bit tricky... */
+// OK this loop is a bit tricky...
 for (do_replace = 0; do_replace <= 1; ++do_replace)
 {
 	frdp = (do_replace) ? (&repl_widgets) : (&find_widgets);
 	if (frdp->dialog)
 	{

Mercurial > vim

comparison src/gui_motif.c @ 18788:e1f4e9d78a6a v8.1.2383