vim: src/gui_athena.c comparison

comparison src/gui_athena.c @ 7821:81794242a275 v7.4.1207

commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jan 30 16:39:25 2016 +0100 patch 7.4.1207 Problem: Using old style function declarations. Solution: Change to new style function declarations. (script by Hirohito Higashi)

author	Christian Brabandt <cb@256bit.org>
date	Sat, 30 Jan 2016 16:45:04 +0100
parents	a1e71a01dbd6
children	7898da204b98

comparison

equal deleted inserted replaced

-:38d22ab3d9a0
+:81794242a275
 /*
 * Scrollbar callback (XtNjumpProc) for when the scrollbar is dragged with the
 * left or middle mouse button.
 */
 static void
-gui_athena_scroll_cb_jump(w, client_data, call_data)
+gui_athena_scroll_cb_jump(
-Widget	w UNUSED;
+Widget	w UNUSED,
-XtPointer	client_data, call_data;
+XtPointer	client_data, call_data)
 {
 scrollbar_T *sb, *sb_info;
 long	value;
 sb = gui_find_scrollbar((long)client_data);
 /*
 * Scrollbar callback (XtNscrollProc) for paging up or down with the left or
 * right mouse buttons.
 */
 static void
-gui_athena_scroll_cb_scroll(w, client_data, call_data)
+gui_athena_scroll_cb_scroll(
-Widget	w UNUSED;
+Widget	w UNUSED,
-XtPointer	client_data, call_data;
+XtPointer	client_data, call_data)
 {
 scrollbar_T *sb, *sb_info;
 long	value;
 int		data = (int)(long)call_data;
 int		page;
 /*
 * Create all the Athena widgets necessary.
 */
 void
-gui_x11_create_widgets()
+gui_x11_create_widgets(void)
 {
 /*
 * We don't have any borders handled internally by the textArea to worry
 * about so only skip over the configured border width.
 */
 #ifdef FEAT_MENU
 /*
 * Calculates the Pixmap based on the size of the current menu font.
 */
 static Pixmap
-gui_athena_create_pullright_pixmap(w)
+gui_athena_create_pullright_pixmap(Widget w)
-Widget  w;
 {
 Pixmap  retval;
 #ifdef FONTSET_ALWAYS
 XFontSet	font = None;
 #else
 /*
 * Called when the GUI is not going to start after all.
 */
 void
-gui_x11_destroy_widgets()
+gui_x11_destroy_widgets(void)
 {
 textArea = NULL;
 #ifdef FEAT_MENU
 menuBar = NULL;
 #endif
 /*
 * Allocated a pixmap for toolbar menu "menu".
 * Return in "sen".
 */
 static void
-get_toolbar_pixmap(menu, sen)
+get_toolbar_pixmap(vimmenu_T *menu, Pixmap *sen)
-vimmenu_T	*menu;
-Pixmap	*sen;
 {
 char_u	buf[MAXPATHL];		/* buffer storing expanded pathname */
 char	**xpm = NULL;		/* xpm array */
 buf[0] = NUL;			/* start with NULL path */
 * background colors. If there is an error reading a color xpm file,
 * drop back and read the monochrome file. If successful, create the
 * insensitive Pixmap too.
 */
 static void
-createXpmImages(path, xpm, sen)
+createXpmImages(char_u *path, char **xpm, Pixmap *sen)
-char_u	*path;
-char	**xpm;
-Pixmap	*sen;
 {
 Window	rootWindow;
 XpmAttributes attrs;
 XpmColorSymbol color[5] =
 {
 XpmFreeAttributes(&attrs);
 }
 void
-gui_mch_set_toolbar_pos(x, y, w, h)
+gui_mch_set_toolbar_pos(
-int	    x;
+int	    x,
-int	    y;
+int	    y,
-int	    w;
+int	    w,
-int	    h;
+int	    h)
 {
 Dimension	border;
 int		height;
 if (!XtIsManaged(toolBar))	/* nothing to do */
 XtManageChild(toolBar);
 }
 #endif
 void
-gui_mch_set_text_area_pos(x, y, w, h)
+gui_mch_set_text_area_pos(
-int	    x;
+int	    x,
-int	    y;
+int	    y,
-int	    w;
+int	    w,
-int	    h;
+int	    h)
 {
 XtUnmanageChild(textArea);
 XtVaSetValues(textArea,
 		  XtNhorizDistance, x,
 		  XtNvertDistance, y,
 * A toolbar button has been pushed; now reset the input focus
 * such that the user can type page up/down etc. and have the
 * input go to the editor window, not the button
 */
 static void
-gui_mch_reset_focus()
+gui_mch_reset_focus(void)
 {
 XtSetKeyboardFocus(vimForm, textArea);
 }
 #endif
 void
-gui_x11_set_back_color()
+gui_x11_set_back_color(void)
 {
 if (textArea != NULL)
 	XtVaSetValues(textArea,
 		  XtNbackground, gui.back_pixel,
 		  NULL);
 static void gui_mch_submenu_change(vimmenu_T *mp, int colors);
 static void gui_athena_menu_font(Widget id);
 static Boolean	gui_athena_menu_has_submenus(Widget, Widget);
 void
-gui_mch_enable_menu(flag)
+gui_mch_enable_menu(int flag)
-int	    flag;
 {
 if (flag)
 {
 	XtManageChild(menuBar);
 # ifdef FEAT_TOOLBAR
 # endif
 }
 }
 void
-gui_mch_set_menu_pos(x, y, w, h)
+gui_mch_set_menu_pos(
-int	    x;
+int	    x,
-int	    y;
+int	    y,
-int	    w;
+int	    w,
-int	    h;
+int	    h)
 {
 Dimension	border;
 int		height;
 XtUnmanageChild(menuBar);
 *
 * Valid range of return values is: 0 (beginning of children) to
 *				    numChildren (end of children).
 */
 static Cardinal
-athena_calculate_ins_pos(widget)
+athena_calculate_ins_pos(Widget widget)
-Widget	widget;
 {
 /* Assume that if the parent of the vimmenu_T is NULL, then we can get
 * to this menu by traversing "next", starting at "root_menu".
 *
 * This holds true for popup menus, toolbar, and toplevel menu items.
 }
 return retval;
 }
 void
-gui_mch_add_menu(menu, idx)
+gui_mch_add_menu(vimmenu_T *menu, int idx UNUSED)
-vimmenu_T	*menu;
-int		idx UNUSED;
 {
 char_u	*pullright_name;
 Dimension	height, space, border;
 vimmenu_T	*parent = menu->parent;
 *
 * "id" is the parent of the menu items.
 * Ignore widget "ignore" in the pane.
 */
 static Boolean
-gui_athena_menu_has_submenus(id, ignore)
+gui_athena_menu_has_submenus(Widget id, Widget ignore)
-Widget	id;
-Widget	ignore;
 {
 WidgetList	children;
 Cardinal	num_children;
 int		i;
 }
 return False;
 }
 static void
-gui_athena_menu_font(id)
+gui_athena_menu_font(Widget id)
-Widget	id;
 {
 #ifdef FONTSET_ALWAYS
 if (gui.menu_fontset != NOFONTSET)
 {
 	if (XtIsManaged(id))
 #endif
 }
 void
-gui_mch_new_menu_font()
+gui_mch_new_menu_font(void)
 {
 Pixmap oldpuller = None;
 if (menuBar == (Widget)0)
 	return;
 	XFreePixmap(gui.dpy, oldpuller);
 }
 #if defined(FEAT_BEVAL) || defined(PROTO)
 void
-gui_mch_new_tooltip_font()
+gui_mch_new_tooltip_font(void)
 {
 #  ifdef FEAT_TOOLBAR
 vimmenu_T   *menu;
 if (toolBar == (Widget)0)
 	gui_mch_submenu_change(menu, FALSE);
 #  endif
 }
 void
-gui_mch_new_tooltip_colors()
+gui_mch_new_tooltip_colors(void)
 {
 # ifdef FEAT_TOOLBAR
 vimmenu_T   *menu;
 if (toolBar == (Widget)0)
 # endif
 }
 #endif
 static void
-gui_mch_submenu_change(menu, colors)
+gui_mch_submenu_change(
-vimmenu_T	*menu;
+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)
 {
 /*
 * Make a submenu name into a pullright name.
 * Replace '.' by '_', can't include '.' in the submenu name.
 */
 static char_u *
-make_pull_name(name)
+make_pull_name(char_u * name)
-char_u * name;
 {
 char_u  *pname;
 char_u  *p;
 pname = vim_strnsave(name, STRLEN(name) + strlen("-pullright"));
 }
 return pname;
 }
 void
-gui_mch_add_menu_item(menu, idx)
+gui_mch_add_menu_item(vimmenu_T *menu, int idx UNUSED)
-vimmenu_T	*menu;
-int		idx UNUSED;
 {
 vimmenu_T	*parent = menu->parent;
 a_cur_menu = menu;
 # ifdef FEAT_TOOLBAR
 gui_set_shellsize(FALSE, FALSE, RESIZE_VERT);
 }
 int
-gui_mch_compute_toolbar_height()
+gui_mch_compute_toolbar_height(void)
 {
 Dimension	height;		    /* total Toolbar height */
 Dimension	whgt;		    /* height of each widget */
 Dimension	marginHeight;	    /* XmNmarginHeight of toolBar */
 Dimension	shadowThickness;    /* thickness of Xtparent(toolBar) */
 return (int)(height + (marginHeight << 1) + (shadowThickness << 1));
 }
 void
-gui_mch_get_toolbar_colors(bgp, fgp, bsp, tsp, hsp)
+gui_mch_get_toolbar_colors(
-Pixel	*bgp;
+Pixel	*bgp,
-Pixel	*fgp;
+Pixel	*fgp,
-Pixel       *bsp;
+Pixel       *bsp,
-Pixel	*tsp;
+Pixel	*tsp,
-Pixel	*hsp;
+Pixel	*hsp)
 {
 XtVaGetValues(toolBar, XtNbackground, bgp, XtNborderColor, fgp, NULL);
 *bsp = *bgp;
 *tsp = *fgp;
 *hsp = *tsp;
 }
 #endif
 void
-gui_mch_toggle_tearoffs(enable)
+gui_mch_toggle_tearoffs(int enable UNUSED)
-int		enable UNUSED;
 {
 /* no tearoff menus */
 }
 void
-gui_mch_new_menu_colors()
+gui_mch_new_menu_colors(void)
 {
 if (menuBar == (Widget)0)
 	return;
 if (gui.menu_fg_pixel != INVALCOLOR)
 	XtVaSetValues(menuBar, XtNborderColor,	gui.menu_fg_pixel, NULL);
 /*
 * Destroy the machine specific menu widget.
 */
 void
-gui_mch_destroy_menu(menu)
+gui_mch_destroy_menu(vimmenu_T *menu)
-vimmenu_T *menu;
 {
 Widget	parent;
 /* There is no item for the toolbar. */
 if (menu->id == (Widget)0)
 	menu->submenu_id = (Widget)0;
 }
 }
 static void
-gui_athena_menu_timeout(client_data, id)
+gui_athena_menu_timeout(
-XtPointer	    client_data;
+XtPointer	    client_data,
-XtIntervalId    *id UNUSED;
+XtIntervalId    *id UNUSED)
 {
 Widget  w = (Widget)client_data;
 Widget  popup;
 timer = 0;
 * rightmost end of the menu entry that caused the popup.
 *
 * This is called when XtPopup() is called.
 */
 static void
-gui_athena_popup_callback(w, client_data, call_data)
+gui_athena_popup_callback(
-Widget	w;
+Widget	w,
-XtPointer	client_data;
+XtPointer	client_data,
-XtPointer	call_data UNUSED;
+XtPointer	call_data UNUSED)
 {
 /* Assumption: XtIsSubclass(XtParent(w),simpleMenuWidgetClass) */
 vimmenu_T	*menu = (vimmenu_T *)client_data;
 Dimension	width;
 Position	root_x, root_y;
 		     XtNy, root_y,
 		     NULL);
 }
 static void
-gui_athena_popdown_submenus_action(w, event, args, nargs)
+gui_athena_popdown_submenus_action(
-Widget	w;
+Widget	w,
-XEvent	*event;
+XEvent	*event,
-String	*args;
+String	*args,
-Cardinal	*nargs;
+Cardinal	*nargs)
 {
 WidgetList	children;
 Cardinal	num_children;
 XtVaGetValues(w, XtNchildren, &children,
 }
 }
 /* Used to determine if the given widget has a submenu that can be popped up. */
 static Boolean
-has_submenu(widget)
+has_submenu(Widget widget)
-Widget  widget;
 {
 if ((widget != NULL) && XtIsSubclass(widget,smeBSBObjectClass))
 {
 	Pixmap p;
 }
 return False;
 }
 static void
-gui_athena_delayed_arm_action(w, event, args, nargs)
+gui_athena_delayed_arm_action(
-Widget	w;
+Widget	w,
-XEvent	*event;
+XEvent	*event,
-String	*args;
+String	*args,
-Cardinal	*nargs;
+Cardinal	*nargs)
 {
 Dimension	width, height;
 if (event->type != MotionNotify)
 	return;
 	}
 }
 }
 static Widget
-get_popup_entry(w)
+get_popup_entry(Widget w)
-Widget  w;
 {
 Widget	menuw;
 /* Get the active entry for the current menu */
 if ((menuw = XawSimpleMenuGetActiveEntry(w)) == (Widget)0)
 /* Given the widget that has been determined to have a submenu, return the submenu widget
 * that is to be popped up.
 */
 static Widget
-submenu_widget(widget)
+submenu_widget(Widget widget)
-Widget  widget;
 {
 /* Precondition: has_submenu(widget) == True
 *	    XtIsSubclass(XtParent(widget),simpleMenuWidgetClass) == True
 */
 /* Postcondition: (popup != NULL) implies
 * (XtIsSubclass(popup,simpleMenuWidgetClass) == True) */
 }
 void
-gui_mch_show_popupmenu(menu)
+gui_mch_show_popupmenu(vimmenu_T *menu)
-vimmenu_T *menu;
 {
 int		rootx, rooty, winx, winy;
 Window	root, child;
 unsigned int mask;
 /*
 * Set the menu and scrollbar colors to their default values.
 */
 void
-gui_mch_def_colors()
+gui_mch_def_colors(void)
 {
 /*
 * Get the colors ourselves.  Using the automatic conversion doesn't
 * handle looking for approximate colors.
 */
 /*
 * Scrollbar stuff.
 */
 void
-gui_mch_set_scrollbar_thumb(sb, val, size, max)
+gui_mch_set_scrollbar_thumb(
-scrollbar_T	*sb;
+scrollbar_T	*sb,
-long	val;
+long	val,
-long	size;
+long	size,
-long	max;
+long	max)
 {
 double	v, s;
 if (sb->id == (Widget)0)
 	return;
 #endif
 }
 }
 void
-gui_mch_set_scrollbar_pos(sb, x, y, w, h)
+gui_mch_set_scrollbar_pos(
-scrollbar_T *sb;
+scrollbar_T *sb,
-int		x;
+int		x,
-int		y;
+int		y,
-int		w;
+int		w,
-int		h;
+int		h)
 {
 if (sb->id == (Widget)0)
 	return;
 XtUnmanageChild(sb->id);
 		  NULL);
 XtManageChild(sb->id);
 }
 void
-gui_mch_enable_scrollbar(sb, flag)
+gui_mch_enable_scrollbar(scrollbar_T *sb, int flag)
-scrollbar_T	*sb;
-int		flag;
 {
 if (sb->id != (Widget)0)
 {
 	if (flag)
 	    XtManageChild(sb->id);
 	    XtUnmanageChild(sb->id);
 }
 }
 void
-gui_mch_create_scrollbar(sb, orient)
+gui_mch_create_scrollbar(
-scrollbar_T *sb;
+scrollbar_T *sb,
-int		orient;	/* SBAR_VERT or SBAR_HORIZ */
+int		orient)	/* SBAR_VERT or SBAR_HORIZ */
 {
 sb->id = XtVaCreateWidget("scrollBar",
 #ifdef FEAT_GUI_NEXTAW
 	    scrollbarWidgetClass, vimForm,
 #else
 #endif
 }
 #if defined(FEAT_WINDOWS) || defined(PROTO)
 void
-gui_mch_destroy_scrollbar(sb)
+gui_mch_destroy_scrollbar(scrollbar_T *sb)
-scrollbar_T *sb;
 {
 if (sb->id != (Widget)0)
 	XtDestroyWidget(sb->id);
 }
 #endif
 void
-gui_mch_set_scrollbar_colors(sb)
+gui_mch_set_scrollbar_colors(scrollbar_T *sb)
-scrollbar_T *sb;
 {
 if (sb->id != (Widget)0)
 	XtVaSetValues(sb->id,
 	    XtNforeground, gui.scroll_fg_pixel,
 	    XtNbackground, gui.scroll_bg_pixel,
 /*
 * Miscellaneous stuff:
 */
 Window
-gui_x11_get_wid()
+gui_x11_get_wid(void)
 {
 return XtWindow(textArea);
 }
 #if defined(FEAT_BROWSE) || defined(PROTO)
 /*
 * Put up a file requester.
 * Returns the selected name in allocated memory, or NULL for Cancel.
 */
 char_u *
-gui_mch_browse(saving, title, dflt, ext, initdir, filter)
+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;	/* extension added */
+char_u	*ext UNUSED,	/* extension added */
-char_u	*initdir;	/* initial directory, NULL for current dir */
+char_u	*initdir,	/* initial directory, NULL for current dir */
-char_u	*filter UNUSED;	/* file name filter */
+char_u	*filter UNUSED)	/* file name filter */
 {
 Position x, y;
 char_u	dirbuf[MAXPATHL];
 /* Concatenate "initdir" and "dflt". */
 /*
 * Callback function for the textfield.  When CR is hit this works like
 * hitting the "OK" button, ESC like "Cancel".
 */
 static void
-keyhit_callback(w, client_data, event, cont)
+keyhit_callback(
-Widget		w UNUSED;
+Widget		w UNUSED,
-XtPointer		client_data UNUSED;
+XtPointer		client_data UNUSED,
-XEvent		*event;
+XEvent		*event,
-Boolean		*cont UNUSED;
+Boolean		*cont UNUSED)
 {
 char	buf[2];
 if (XLookupString(&(event->xkey), buf, 2, NULL, NULL) == 1)
 {
 	    dialogStatus = 0;
 }
 }
 static void
-butproc(w, client_data, call_data)
+butproc(
-Widget	w UNUSED;
+Widget	w UNUSED,
-XtPointer	client_data;
+XtPointer	client_data,
-XtPointer	call_data UNUSED;
+XtPointer	call_data UNUSED)
 {
 dialogStatus = (int)(long)client_data + 1;
 }
 /*
 * Function called when dialog window closed.
 */
 static void
-dialog_wm_handler(w, client_data, event, dum)
+dialog_wm_handler(
-Widget	w UNUSED;
+Widget	w UNUSED,
-XtPointer	client_data UNUSED;
+XtPointer	client_data UNUSED,
-XEvent	*event;
+XEvent	*event,
-Boolean	*dum UNUSED;
+Boolean	*dum UNUSED)
 {
 if (event->type == ClientMessage
 	    && (Atom)((XClientMessageEvent *)event)->data.l[0] == dialogatom)
 	dialogStatus = 0;
 }
 int
-gui_mch_dialog(type, title, message, buttons, dfltbutton, textfield, ex_cmd)
+gui_mch_dialog(
-int		type UNUSED;
+int		type UNUSED,
-char_u	*title;
+char_u	*title,
-char_u	*message;
+char_u	*message,
-char_u	*buttons;
+char_u	*buttons,
-int		dfltbutton UNUSED;
+int		dfltbutton UNUSED,
-char_u	*textfield;
+char_u	*textfield,
-int		ex_cmd UNUSED;
+int		ex_cmd UNUSED)
 {
 char_u		*buts;
 char_u		*p, *next;
 XtAppContext	app;
 XEvent		event;
 #if defined(FEAT_GUI_DIALOG) || defined(FEAT_MENU)
 /*
 * Set the colors of Widget "id" to the menu colors.
 */
 static void
-gui_athena_menu_colors(id)
+gui_athena_menu_colors(Widget id)
-Widget  id;
 {
 if (gui.menu_bg_pixel != INVALCOLOR)
 	XtVaSetValues(id, XtNbackground, gui.menu_bg_pixel, NULL);
 if (gui.menu_fg_pixel != INVALCOLOR)
 	XtVaSetValues(id, XtNforeground, gui.menu_fg_pixel, NULL);
 /*
 * Set the colors of Widget "id" to the scroll colors.
 */
 static void
-gui_athena_scroll_colors(id)
+gui_athena_scroll_colors(Widget id)
-Widget  id;
 {
 if (gui.scroll_bg_pixel != INVALCOLOR)
 	XtVaSetValues(id, XtNbackground, gui.scroll_bg_pixel, NULL);
 if (gui.scroll_fg_pixel != INVALCOLOR)
 	XtVaSetValues(id, XtNforeground, gui.scroll_fg_pixel, NULL);

Mercurial > vim

comparison src/gui_athena.c @ 7821:81794242a275 v7.4.1207