comparison src/gui_x11.c @ 7803:37c929c4a073 v7.4.1198

commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Jan 29 22:36:45 2016 +0100 patch 7.4.1198 Problem: Still using __ARGS. Solution: Remove __ARGS in several files. (script by Hirohito Higashi) Also remove use of HAVE_STDARG_H.
author Christian Brabandt <cb@256bit.org>
date Fri, 29 Jan 2016 22:45:06 +0100
parents 8ba562cb3e07
children bcef391c101c
comparison
equal deleted inserted replaced
7802:d9180d8cfe40 7803:37c929c4a073
121 XwcDrawImageString(dpy, win, current_fontset, gc, x, y, (wchar_t *)str, n); \ 121 XwcDrawImageString(dpy, win, current_fontset, gc, x, y, (wchar_t *)str, n); \
122 else \ 122 else \
123 XDrawImageString16(dpy, win, gc, x, y, (XChar2b *)str, n); \ 123 XDrawImageString16(dpy, win, gc, x, y, (XChar2b *)str, n); \
124 } while (0) 124 } while (0)
125 125
126 static int check_fontset_sanity __ARGS((XFontSet fs)); 126 static int check_fontset_sanity(XFontSet fs);
127 static int fontset_width __ARGS((XFontSet fs)); 127 static int fontset_width(XFontSet fs);
128 static int fontset_ascent __ARGS((XFontSet fs)); 128 static int fontset_ascent(XFontSet fs);
129 #endif 129 #endif
130 130
131 static guicolor_T prev_fg_color = INVALCOLOR; 131 static guicolor_T prev_fg_color = INVALCOLOR;
132 static guicolor_T prev_bg_color = INVALCOLOR; 132 static guicolor_T prev_bg_color = INVALCOLOR;
133 static guicolor_T prev_sp_color = INVALCOLOR; 133 static guicolor_T prev_sp_color = INVALCOLOR;
134 134
135 #if defined(FEAT_GUI_MOTIF) && defined(FEAT_MENU) 135 #if defined(FEAT_GUI_MOTIF) && defined(FEAT_MENU)
136 static XButtonPressedEvent last_mouse_event; 136 static XButtonPressedEvent last_mouse_event;
137 #endif 137 #endif
138 138
139 static int find_closest_color __ARGS((Colormap colormap, XColor *colorPtr)); 139 static int find_closest_color(Colormap colormap, XColor *colorPtr);
140 static void gui_x11_timer_cb __ARGS((XtPointer timed_out, XtIntervalId *interval_id)); 140 static void gui_x11_timer_cb(XtPointer timed_out, XtIntervalId *interval_id);
141 static void gui_x11_visibility_cb __ARGS((Widget w, XtPointer dud, XEvent *event, Boolean *dum)); 141 static void gui_x11_visibility_cb(Widget w, XtPointer dud, XEvent *event, Boolean *dum);
142 static void gui_x11_expose_cb __ARGS((Widget w, XtPointer dud, XEvent *event, Boolean *dum)); 142 static void gui_x11_expose_cb(Widget w, XtPointer dud, XEvent *event, Boolean *dum);
143 static void gui_x11_resize_window_cb __ARGS((Widget w, XtPointer dud, XEvent *event, Boolean *dum)); 143 static void gui_x11_resize_window_cb(Widget w, XtPointer dud, XEvent *event, Boolean *dum);
144 static void gui_x11_focus_change_cb __ARGS((Widget w, XtPointer data, XEvent *event, Boolean *dum)); 144 static void gui_x11_focus_change_cb(Widget w, XtPointer data, XEvent *event, Boolean *dum);
145 static void gui_x11_enter_cb __ARGS((Widget w, XtPointer data, XEvent *event, Boolean *dum)); 145 static void gui_x11_enter_cb(Widget w, XtPointer data, XEvent *event, Boolean *dum);
146 static void gui_x11_leave_cb __ARGS((Widget w, XtPointer data, XEvent *event, Boolean *dum)); 146 static void gui_x11_leave_cb(Widget w, XtPointer data, XEvent *event, Boolean *dum);
147 static void gui_x11_mouse_cb __ARGS((Widget w, XtPointer data, XEvent *event, Boolean *dum)); 147 static void gui_x11_mouse_cb(Widget w, XtPointer data, XEvent *event, Boolean *dum);
148 #ifdef FEAT_SNIFF 148 #ifdef FEAT_SNIFF
149 static void gui_x11_sniff_request_cb __ARGS((XtPointer closure, int *source, XtInputId *id)); 149 static void gui_x11_sniff_request_cb(XtPointer closure, int *source, XtInputId *id);
150 #endif 150 #endif
151 static void gui_x11_check_copy_area __ARGS((void)); 151 static void gui_x11_check_copy_area(void);
152 #ifdef FEAT_CLIENTSERVER 152 #ifdef FEAT_CLIENTSERVER
153 static void gui_x11_send_event_handler __ARGS((Widget, XtPointer, XEvent *, Boolean *)); 153 static void gui_x11_send_event_handler(Widget, XtPointer, XEvent *, Boolean *);
154 #endif 154 #endif
155 static void gui_x11_wm_protocol_handler __ARGS((Widget, XtPointer, XEvent *, Boolean *)); 155 static void gui_x11_wm_protocol_handler(Widget, XtPointer, XEvent *, Boolean *);
156 static void gui_x11_blink_cb __ARGS((XtPointer timed_out, XtIntervalId *interval_id)); 156 static void gui_x11_blink_cb(XtPointer timed_out, XtIntervalId *interval_id);
157 static Cursor gui_x11_create_blank_mouse __ARGS((void)); 157 static Cursor gui_x11_create_blank_mouse(void);
158 static void draw_curl __ARGS((int row, int col, int cells)); 158 static void draw_curl(int row, int col, int cells);
159 159
160 160
161 /* 161 /*
162 * Keycodes recognized by vim. 162 * Keycodes recognized by vim.
163 * NOTE: when changing this, the table in gui_gtk_x11.c probably needs the 163 * NOTE: when changing this, the table in gui_gtk_x11.c probably needs the
1310 /* 1310 /*
1311 * Handle XSMP processing, de-registering the attachment upon error 1311 * Handle XSMP processing, de-registering the attachment upon error
1312 */ 1312 */
1313 static XtInputId _xsmp_xtinputid; 1313 static XtInputId _xsmp_xtinputid;
1314 1314
1315 static void local_xsmp_handle_requests __ARGS((XtPointer c, int *s, XtInputId *i)); 1315 static void local_xsmp_handle_requests(XtPointer c, int *s, XtInputId *i);
1316 1316
1317 static void 1317 static void
1318 local_xsmp_handle_requests(c, s, i) 1318 local_xsmp_handle_requests(c, s, i)
1319 XtPointer c UNUSED; 1319 XtPointer c UNUSED;
1320 int *s UNUSED; 1320 int *s UNUSED;