thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.2-184

Browse Source
This commit is contained in:
Bram Moolenaar
2009-05-21 21:27:43 +00:00
parent 32f31b1a0f
commit 4bdbbf7066
16 changed files with 373 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/auto/configure vendored
View File

@@ -7977,6 +7977,82 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
LDFLAGS="$ac_save_LDFLAGS" LDFLAGS="$ac_save_LDFLAGS"
{ $as_echo "$as_me:$LINENO: checking size of wchar_t is 2 bytes" >&5
$as_echo_n "checking size of wchar_t is 2 bytes... " >&6; }
if test "${ac_cv_small_wchar_t+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then
{ { $as_echo "$as_me:$LINENO: error: failed to compile test program" >&5
$as_echo "$as_me: error: failed to compile test program" >&2;}
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <X11/Xlib.h>
#if STDC_HEADERS
# include <stdlib.h>
# include <stddef.h>
#endif
main()
{
if (sizeof(wchar_t) <= 2)
exit(1);
exit(0);
}
_ACEOF
rm -f conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>&5
ac_status=$?
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
{ (case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
$as_echo "$ac_try_echo") >&5
(eval "$ac_try") 2>&5
ac_status=$?
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_small_wchar_t="no"
else
$as_echo "$as_me: program exited with status $ac_status" >&5
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
ac_cv_small_wchar_t="yes"
fi
rm -rf conftest.dSYM
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_small_wchar_t" >&5
$as_echo "$ac_cv_small_wchar_t" >&6; }
if test "x$ac_cv_small_wchar_t" = "xyes" ; then
cat >>confdefs.h <<\_ACEOF
#define SMALL_WCHAR_T 1
_ACEOF
fi
fi fi
fi fi
@@ -15417,7 +15493,6 @@ _ACEOF
bcopy_test_prog=' bcopy_test_prog='
#include "confdefs.h" #include "confdefs.h"
#ifdef HAVE_STRING_H #ifdef HAVE_STRING_H

3
src/config.h.in
View File

@@ -39,6 +39,9 @@
/* Defined to the size of an int */ /* Defined to the size of an int */
#undef SIZEOF_INT #undef SIZEOF_INT
/* Define when wchar_t is only 2 bytes. */
#undef SMALL_WCHAR_T
/* /*
* If we cannot trust one of the following from the libraries, we use our * If we cannot trust one of the following from the libraries, we use our
* own safe but probably slower vim_memmove(). * own safe but probably slower vim_memmove().

23
src/configure.in
View File

@@ -1193,6 +1193,28 @@ else
LDFLAGS="$ac_save_LDFLAGS" LDFLAGS="$ac_save_LDFLAGS"
AC_MSG_CHECKING(size of wchar_t is 2 bytes)
AC_CACHE_VAL(ac_cv_small_wchar_t,
[AC_TRY_RUN([
#include <X11/Xlib.h>
#if STDC_HEADERS
# include <stdlib.h>
# include <stddef.h>
#endif
main()
{
if (sizeof(wchar_t) <= 2)
exit(1);
exit(0);
}],
ac_cv_small_wchar_t="no",
ac_cv_small_wchar_t="yes",
AC_MSG_ERROR(failed to compile test program))])
AC_MSG_RESULT($ac_cv_small_wchar_t)
if test "x$ac_cv_small_wchar_t" = "xyes" ; then
AC_DEFINE(SMALL_WCHAR_T)
fi
fi fi
fi fi
@@ -2881,7 +2903,6 @@ main()
AC_MSG_RESULT($ac_cv_sizeof_int) AC_MSG_RESULT($ac_cv_sizeof_int)
AC_DEFINE_UNQUOTED(SIZEOF_INT, $ac_cv_sizeof_int) AC_DEFINE_UNQUOTED(SIZEOF_INT, $ac_cv_sizeof_int)
dnl Check for memmove() before bcopy(), makes memmove() be used when both are dnl Check for memmove() before bcopy(), makes memmove() be used when both are
dnl present, fixes problem with incompatibility between Solaris 2.4 and 2.5. dnl present, fixes problem with incompatibility between Solaris 2.4 and 2.5.

10
src/gui.c
View File

@@ -3119,7 +3119,7 @@ static int prev_which_scrollbars[3];
*/ */
void void
gui_init_which_components(oldval) gui_init_which_components(oldval)
char_u *oldval; char_u *oldval UNUSED;
{ {
#ifdef FEAT_MENU #ifdef FEAT_MENU
static int prev_menu_is_active = -1; static int prev_menu_is_active = -1;
@@ -4668,8 +4668,8 @@ gui_mouse_correct()
*/ */
static win_T * static win_T *
xy2win(x, y) xy2win(x, y)
int x; int x UNUSED;
int y; int y UNUSED;
{ {
#ifdef FEAT_WINDOWS #ifdef FEAT_WINDOWS
int row; int row;
@@ -5121,8 +5121,8 @@ gui_wingoto_xy(x, y)
*/ */
void void
gui_handle_drop(x, y, modifiers, fnames, count) gui_handle_drop(x, y, modifiers, fnames, count)
int x; int x UNUSED;
int y; int y UNUSED;
int_u modifiers; int_u modifiers;
char_u **fnames; char_u **fnames;
int count; int count;

85
src/gui_at_fs.c
View File

@@ -829,7 +829,7 @@ SFsetText(path)
text.format = FMT8BIT; text.format = FMT8BIT;
#ifdef XtNinternational #ifdef XtNinternational
if (_XawTextFormat((TextWidget)selFileField) == XawFmtWide) if ((unsigned long)_XawTextFormat((TextWidget)selFileField) == XawFmtWide)
{ {
XawTextReplace(selFileField, (XawTextPosition)0, XawTextReplace(selFileField, (XawTextPosition)0,
(XawTextPosition)WcsLen((wchar_t *)&SFtextBuffer[0]), &text); (XawTextPosition)WcsLen((wchar_t *)&SFtextBuffer[0]), &text);
@@ -851,17 +851,15 @@ SFsetText(path)
#endif #endif
} }
/* ARGSUSED */
static void static void
SFbuttonPressList(w, n, event) SFbuttonPressList(w, n, event)
Widget w; Widget w UNUSED;
int n; int n UNUSED;
XButtonPressedEvent *event; XButtonPressedEvent *event UNUSED;
{ {
SFbuttonPressed = 1; SFbuttonPressed = 1;
} }
/* ARGSUSED */
static void static void
SFbuttonReleaseList(w, n, event) SFbuttonReleaseList(w, n, event)
Widget w; Widget w;
@@ -989,11 +987,10 @@ SFcheckFiles(dir)
return result; return result;
} }
/* ARGSUSED */
static void static void
SFdirModTimer(cl, id) SFdirModTimer(cl, id)
XtPointer cl; XtPointer cl UNUSED;
XtIntervalId *id; XtIntervalId *id UNUSED;
{ {
static int n = -1; static int n = -1;
static int f = 0; static int f = 0;
@@ -1596,11 +1593,10 @@ SFscrollTimerInterval()
static void SFscrollTimer __ARGS((XtPointer p, XtIntervalId *id)); static void SFscrollTimer __ARGS((XtPointer p, XtIntervalId *id));
/* ARGSUSED */
static void static void
SFscrollTimer(p, id) SFscrollTimer(p, id)
XtPointer p; XtPointer p;
XtIntervalId *id; XtIntervalId *id UNUSED;
{ {
SFDir *dir; SFDir *dir;
int save; int save;
@@ -1695,10 +1691,9 @@ SFnewInvertEntry(n, event)
} }
} }
/* ARGSUSED */
static void static void
SFenterList(w, n, event) SFenterList(w, n, event)
Widget w; Widget w UNUSED;
int n; int n;
XEnterWindowEvent *event; XEnterWindowEvent *event;
{ {
@@ -1719,12 +1714,11 @@ SFenterList(w, n, event)
} }
} }
/* ARGSUSED */
static void static void
SFleaveList(w, n, event) SFleaveList(w, n, event)
Widget w; Widget w UNUSED;
int n; int n;
XEvent *event; XEvent *event UNUSED;
{ {
if (SFcurrentInvert[n] != -1) if (SFcurrentInvert[n] != -1)
{ {
@@ -1733,10 +1727,9 @@ SFleaveList(w, n, event)
} }
} }
/* ARGSUSED */
static void static void
SFmotionList(w, n, event) SFmotionList(w, n, event)
Widget w; Widget w UNUSED;
int n; int n;
XMotionEvent *event; XMotionEvent *event;
{ {
@@ -1754,7 +1747,6 @@ SFmotionList(w, n, event)
} }
} }
/* ARGSUSED */
static void static void
SFvFloatSliderMovedCallback(w, n, fnew) SFvFloatSliderMovedCallback(w, n, fnew)
Widget w; Widget w;
@@ -1767,10 +1759,9 @@ SFvFloatSliderMovedCallback(w, n, fnew)
SFvSliderMovedCallback(w, (int)(long)n, nw); SFvSliderMovedCallback(w, (int)(long)n, nw);
} }
/* ARGSUSED */
static void static void
SFvSliderMovedCallback(w, n, nw) SFvSliderMovedCallback(w, n, nw)
Widget w; Widget w UNUSED;
int n; int n;
int nw; int nw;
{ {
@@ -1853,7 +1844,6 @@ SFvSliderMovedCallback(w, n, nw)
} }
} }
/* ARGSUSED */
static void static void
SFvAreaSelectedCallback(w, n, pnew) SFvAreaSelectedCallback(w, n, pnew)
Widget w; Widget w;
@@ -1914,10 +1904,9 @@ SFvAreaSelectedCallback(w, n, pnew)
SFvSliderMovedCallback(w, (int)(long)n, nw); SFvSliderMovedCallback(w, (int)(long)n, nw);
} }
/* ARGSUSED */
static void static void
SFhSliderMovedCallback(w, n, nw) SFhSliderMovedCallback(w, n, nw)
Widget w; Widget w UNUSED;
XtPointer n; XtPointer n;
XtPointer nw; XtPointer nw;
{ {
@@ -1933,7 +1922,6 @@ SFhSliderMovedCallback(w, n, nw)
SFdrawList((int)(long)n, SF_DO_NOT_SCROLL); SFdrawList((int)(long)n, SF_DO_NOT_SCROLL);
} }
/* ARGSUSED */
static void static void
SFhAreaSelectedCallback(w, n, pnew) SFhAreaSelectedCallback(w, n, pnew)
Widget w; Widget w;
@@ -1994,11 +1982,10 @@ SFhAreaSelectedCallback(w, n, pnew)
} }
} }
/* ARGSUSED */
static void static void
SFpathSliderMovedCallback(w, client_data, nw) SFpathSliderMovedCallback(w, client_data, nw)
Widget w; Widget w UNUSED;
XtPointer client_data; XtPointer client_data UNUSED;
XtPointer nw; XtPointer nw;
{ {
SFDir *dir; SFDir *dir;
@@ -2031,11 +2018,10 @@ SFpathSliderMovedCallback(w, client_data, nw)
XawTextSetInsertionPoint(selFileField, pos); XawTextSetInsertionPoint(selFileField, pos);
} }
/* ARGSUSED */
static void static void
SFpathAreaSelectedCallback(w, client_data, pnew) SFpathAreaSelectedCallback(w, client_data, pnew)
Widget w; Widget w;
XtPointer client_data; XtPointer client_data UNUSED;
XtPointer pnew; XtPointer pnew;
{ {
int nw = (int)(long)pnew; int nw = (int)(long)pnew;
@@ -2206,13 +2192,12 @@ static char *oneLineTextEditTranslations = "\
static void SFexposeList __ARGS((Widget w, XtPointer n, XEvent *event, Boolean *cont)); static void SFexposeList __ARGS((Widget w, XtPointer n, XEvent *event, Boolean *cont));
/* ARGSUSED */
static void static void
SFexposeList(w, n, event, cont) SFexposeList(w, n, event, cont)
Widget w; Widget w UNUSED;
XtPointer n; XtPointer n;
XEvent *event; XEvent *event;
Boolean *cont; Boolean *cont UNUSED;
{ {
if ((event->type == NoExpose) || event->xexpose.count) if ((event->type == NoExpose) || event->xexpose.count)
return; return;
@@ -2222,13 +2207,12 @@ SFexposeList(w, n, event, cont)
static void SFmodVerifyCallback __ARGS((Widget w, XtPointer client_data, XEvent *event, Boolean *cont)); static void SFmodVerifyCallback __ARGS((Widget w, XtPointer client_data, XEvent *event, Boolean *cont));
/* ARGSUSED */
static void static void
SFmodVerifyCallback(w, client_data, event, cont) SFmodVerifyCallback(w, client_data, event, cont)
Widget w; Widget w UNUSED;
XtPointer client_data; XtPointer client_data UNUSED;
XEvent *event; XEvent *event;
Boolean *cont; Boolean *cont UNUSED;
{ {
char buf[2]; char buf[2];
@@ -2241,11 +2225,11 @@ SFmodVerifyCallback(w, client_data, event, cont)
static void SFokCallback __ARGS((Widget w, XtPointer cl, XtPointer cd)); static void SFokCallback __ARGS((Widget w, XtPointer cl, XtPointer cd));
/* ARGSUSED */
static void static void
SFokCallback(w, cl, cd) SFokCallback(w, cl, cd)
Widget w; Widget w UNUSED;
XtPointer cl, cd; XtPointer cl UNUSED;
XtPointer cd UNUSED;
{ {
SFstatus = SEL_FILE_OK; SFstatus = SEL_FILE_OK;
} }
@@ -2258,11 +2242,11 @@ static XtCallbackRec SFokSelect[] =
static void SFcancelCallback __ARGS((Widget w, XtPointer cl, XtPointer cd)); static void SFcancelCallback __ARGS((Widget w, XtPointer cl, XtPointer cd));
/* ARGSUSED */
static void static void
SFcancelCallback(w, cl, cd) SFcancelCallback(w, cl, cd)
Widget w; Widget w UNUSED;
XtPointer cl, cd; XtPointer cl UNUSED;
XtPointer cd UNUSED;
{ {
SFstatus = SEL_FILE_CANCEL; SFstatus = SEL_FILE_CANCEL;
} }
@@ -2275,16 +2259,15 @@ static XtCallbackRec SFcancelSelect[] =
static void SFdismissAction __ARGS((Widget w, XEvent *event, String *params, Cardinal *num_params)); static void SFdismissAction __ARGS((Widget w, XEvent *event, String *params, Cardinal *num_params));
/* ARGSUSED */
static void static void
SFdismissAction(w, event, params, num_params) SFdismissAction(w, event, params, num_params)
Widget w; Widget w UNUSED;
XEvent *event; XEvent *event;
String *params; String *params UNUSED;
Cardinal *num_params; Cardinal *num_params UNUSED;
{ {
if (event->type == ClientMessage && if (event->type == ClientMessage
event->xclient.data.l[0] != SFwmDeleteWindow) && (Atom)event->xclient.data.l[0] != SFwmDeleteWindow)
return; return;
SFstatus = SEL_FILE_CANCEL; SFstatus = SEL_FILE_CANCEL;
@@ -2703,7 +2686,7 @@ SFcreateWidgets(toplevel, prompt, ok, cancel)
SFtextChanged() SFtextChanged()
{ {
#if defined(FEAT_XFONTSET) && defined(XtNinternational) #if defined(FEAT_XFONTSET) && defined(XtNinternational)
if (_XawTextFormat((TextWidget)selFileField) == XawFmtWide) if ((unsigned long)_XawTextFormat((TextWidget)selFileField) == XawFmtWide)
{ {
wchar_t *wcbuf=(wchar_t *)SFtextBuffer; wchar_t *wcbuf=(wchar_t *)SFtextBuffer;
@@ -2749,7 +2732,7 @@ SFgetText()
#if defined(FEAT_XFONTSET) && defined(XtNinternational) #if defined(FEAT_XFONTSET) && defined(XtNinternational)
char *buf; char *buf;
if (_XawTextFormat((TextWidget)selFileField) == XawFmtWide) if ((unsigned long)_XawTextFormat((TextWidget)selFileField) == XawFmtWide)
{ {
wchar_t *wcbuf; wchar_t *wcbuf;
int mbslength; int mbslength;

79
src/gui_at_sb.c
View File

@@ -198,10 +198,13 @@ ScrollbarClassRec vim_scrollbarClassRec =
/* extension */ NULL /* extension */ NULL
}, },
{ /* simple fields */ { /* simple fields */
/* change_sensitive */ XtInheritChangeSensitive /* change_sensitive */ XtInheritChangeSensitive,
#ifndef OLDXAW
/* extension */ NULL
#endif
}, },
{ /* scrollbar fields */ { /* scrollbar fields */
/* ignore */ 0 /* empty */ 0
} }
}; };
@@ -241,7 +244,8 @@ FillArea(sbw, top, bottom, fill, draw_shadow)
if (bottom <= 0 || bottom <= top) if (bottom <= 0 || bottom <= top)
return; return;
if ((sw = sbw->scrollbar.shadow_width) < 0) sw = sbw->scrollbar.shadow_width;
if (sw < 0)
sw = 0; sw = 0;
margin = MARGIN (sbw); margin = MARGIN (sbw);
floor = sbw->scrollbar.length - margin + 2; floor = sbw->scrollbar.length - margin + 2;
@@ -516,13 +520,12 @@ SetDimensions(sbw)
} }
} }
/* ARGSUSED */
static void static void
Initialize(request, new, args, num_args) Initialize(request, new, args, num_args)
Widget request; /* what the client asked for */ Widget request UNUSED; /* what the client asked for */
Widget new; /* what we're going to give him */ Widget new; /* what we're going to give him */
ArgList args; ArgList args UNUSED;
Cardinal *num_args; Cardinal *num_args UNUSED;
{ {
ScrollbarWidget sbw = (ScrollbarWidget) new; ScrollbarWidget sbw = (ScrollbarWidget) new;
@@ -556,14 +559,13 @@ Realize(w, valueMask, attributes)
(w, valueMask, attributes); (w, valueMask, attributes);
} }
/* ARGSUSED */
static Boolean static Boolean
SetValues(current, request, desired, args, num_args) SetValues(current, request, desired, args, num_args)
Widget current, /* what I am */ Widget current; /* what I am */
request, /* what he wants me to be */ Widget request UNUSED; /* what he wants me to be */
desired; /* what I will become */ Widget desired; /* what I will become */
ArgList args; ArgList args UNUSED;
Cardinal *num_args; Cardinal *num_args UNUSED;
{ {
ScrollbarWidget sbw = (ScrollbarWidget) current; ScrollbarWidget sbw = (ScrollbarWidget) current;
ScrollbarWidget dsbw = (ScrollbarWidget) desired; ScrollbarWidget dsbw = (ScrollbarWidget) desired;
@@ -609,7 +611,6 @@ Resize(w)
} }
/* ARGSUSED */
static void static void
Redisplay(w, event, region) Redisplay(w, event, region)
Widget w; Widget w;
@@ -789,11 +790,10 @@ HandleThumb(w, event, params, num_params)
} }
} }
/* ARGSUSED */
static void static void
RepeatNotify(client_data, idp) RepeatNotify(client_data, idp)
XtPointer client_data; XtPointer client_data;
XtIntervalId *idp; XtIntervalId *idp UNUSED;
{ {
ScrollbarWidget sbw = (ScrollbarWidget) client_data; ScrollbarWidget sbw = (ScrollbarWidget) client_data;
int call_data; int call_data;
@@ -839,46 +839,42 @@ FloatInRange(num, small, big)
return (num < small) ? small : ((num > big) ? big : num); return (num < small) ? small : ((num > big) ? big : num);
} }
/* ARGSUSED */
static void static void
ScrollOneLineUp(w, event, params, num_params) ScrollOneLineUp(w, event, params, num_params)
Widget w; Widget w;
XEvent *event; XEvent *event;
String *params; String *params UNUSED;
Cardinal *num_params; Cardinal *num_params UNUSED;
{ {
ScrollSome(w, event, -ONE_LINE_DATA); ScrollSome(w, event, -ONE_LINE_DATA);
} }
/* ARGSUSED */
static void static void
ScrollOneLineDown(w, event, params, num_params) ScrollOneLineDown(w, event, params, num_params)
Widget w; Widget w;
XEvent *event; XEvent *event;
String *params; String *params UNUSED;
Cardinal *num_params; Cardinal *num_params UNUSED;
{ {
ScrollSome(w, event, ONE_LINE_DATA); ScrollSome(w, event, ONE_LINE_DATA);
} }
/* ARGSUSED */
static void static void
ScrollPageDown(w, event, params, num_params) ScrollPageDown(w, event, params, num_params)
Widget w; Widget w;
XEvent *event; XEvent *event;
String *params; String *params UNUSED;
Cardinal *num_params; Cardinal *num_params UNUSED;
{ {
ScrollSome(w, event, ONE_PAGE_DATA); ScrollSome(w, event, ONE_PAGE_DATA);
} }
/* ARGSUSED */
static void static void
ScrollPageUp(w, event, params, num_params) ScrollPageUp(w, event, params, num_params)
Widget w; Widget w;
XEvent *event; XEvent *event;
String *params; String *params UNUSED;
Cardinal *num_params; Cardinal *num_params UNUSED;
{ {
ScrollSome(w, event, -ONE_PAGE_DATA); ScrollSome(w, event, -ONE_PAGE_DATA);
} }
@@ -901,13 +897,12 @@ ScrollSome(w, event, call_data)
XtCallCallbacks(w, XtNscrollProc, (XtPointer)call_data); XtCallCallbacks(w, XtNscrollProc, (XtPointer)call_data);
} }
/* ARGSUSED */
static void static void
NotifyScroll(w, event, params, num_params) NotifyScroll(w, event, params, num_params)
Widget w; Widget w;
XEvent *event; XEvent *event;
String *params; String *params UNUSED;
Cardinal *num_params; Cardinal *num_params UNUSED;
{ {
ScrollbarWidget sbw = (ScrollbarWidget) w; ScrollbarWidget sbw = (ScrollbarWidget) w;
Position x, y, loc; Position x, y, loc;
@@ -991,13 +986,12 @@ NotifyScroll(w, event, params, num_params)
delay, RepeatNotify, (XtPointer)w); delay, RepeatNotify, (XtPointer)w);
} }
/* ARGSUSED */
static void static void
EndScroll(w, event, params, num_params) EndScroll(w, event, params, num_params)
Widget w; Widget w;
XEvent *event; /* unused */ XEvent *event UNUSED;
String *params; /* unused */ String *params UNUSED;
Cardinal *num_params; /* unused */ Cardinal *num_params UNUSED;
{ {
ScrollbarWidget sbw = (ScrollbarWidget) w; ScrollbarWidget sbw = (ScrollbarWidget) w;
@@ -1023,13 +1017,12 @@ FractionLoc(sbw, x, y)
return PICKLENGTH(sbw, x / width, y / height); return PICKLENGTH(sbw, x / width, y / height);
} }
/* ARGSUSED */
static void static void
MoveThumb(w, event, params, num_params) MoveThumb(w, event, params, num_params)
Widget w; Widget w;
XEvent *event; XEvent *event;
String *params; /* unused */ String *params UNUSED;
Cardinal *num_params; /* unused */ Cardinal *num_params UNUSED;
{ {
ScrollbarWidget sbw = (ScrollbarWidget)w; ScrollbarWidget sbw = (ScrollbarWidget)w;
Position x, y; Position x, y;
@@ -1069,13 +1062,12 @@ MoveThumb(w, event, params, num_params)
} }
/* ARGSUSED */
static void static void
NotifyThumb(w, event, params, num_params) NotifyThumb(w, event, params, num_params)
Widget w; Widget w;
XEvent *event; XEvent *event;
String *params; /* unused */ String *params UNUSED;
Cardinal *num_params; /* unused */ Cardinal *num_params UNUSED;
{ {
ScrollbarWidget sbw = (ScrollbarWidget)w; ScrollbarWidget sbw = (ScrollbarWidget)w;
/* Use a union to avoid a warning for the weird conversion from float to /* Use a union to avoid a warning for the weird conversion from float to
@@ -1096,7 +1088,6 @@ NotifyThumb(w, event, params, num_params)
XtCallCallbacks(w, XtNjumpProc, (XtPointer)&sbw->scrollbar.top); XtCallCallbacks(w, XtNjumpProc, (XtPointer)&sbw->scrollbar.top);
} }
/* ARGSUSED */
static void static void
AllocTopShadowGC(w) AllocTopShadowGC(w)
Widget w; Widget w;
@@ -1110,7 +1101,6 @@ AllocTopShadowGC(w)
sbw->scrollbar.top_shadow_GC = XtGetGC(w, valuemask, &myXGCV); sbw->scrollbar.top_shadow_GC = XtGetGC(w, valuemask, &myXGCV);
} }
/* ARGSUSED */
static void static void
AllocBotShadowGC(w) AllocBotShadowGC(w)
Widget w; Widget w;
@@ -1124,11 +1114,10 @@ AllocBotShadowGC(w)
sbw->scrollbar.bot_shadow_GC = XtGetGC(w, valuemask, &myXGCV); sbw->scrollbar.bot_shadow_GC = XtGetGC(w, valuemask, &myXGCV);
} }
/* ARGSUSED */
static void static void
_Xaw3dDrawShadows(gw, event, region, out) _Xaw3dDrawShadows(gw, event, region, out)
Widget gw; Widget gw;
XEvent *event; XEvent *event UNUSED;
Region region; Region region;
int out; int out;
{ {

73
src/gui_athena.c
View File

@@ -86,10 +86,9 @@ static int puller_width = 0;
* Scrollbar callback (XtNjumpProc) for when the scrollbar is dragged with the * Scrollbar callback (XtNjumpProc) for when the scrollbar is dragged with the
* left or middle mouse button. * left or middle mouse button.
*/ */
/* ARGSUSED */
static void static void
gui_athena_scroll_cb_jump(w, client_data, call_data) gui_athena_scroll_cb_jump(w, client_data, call_data)
Widget w; Widget w UNUSED;
XtPointer client_data, call_data; XtPointer client_data, call_data;
{ {
scrollbar_T *sb, *sb_info; scrollbar_T *sb, *sb_info;
@@ -122,10 +121,9 @@ gui_athena_scroll_cb_jump(w, client_data, call_data)
* Scrollbar callback (XtNscrollProc) for paging up or down with the left or * Scrollbar callback (XtNscrollProc) for paging up or down with the left or
* right mouse buttons. * right mouse buttons.
*/ */
/* ARGSUSED */
static void static void
gui_athena_scroll_cb_scroll(w, client_data, call_data) gui_athena_scroll_cb_scroll(w, client_data, call_data)
Widget w; Widget w UNUSED;
XtPointer client_data, call_data; XtPointer client_data, call_data;
{ {
scrollbar_T *sb, *sb_info; scrollbar_T *sb, *sb_info;
@@ -492,7 +490,7 @@ get_toolbar_pixmap(menu, sen)
if (menu->icon_builtin || gui_find_bitmap(menu->name, buf, "xpm") == FAIL) if (menu->icon_builtin || gui_find_bitmap(menu->name, buf, "xpm") == FAIL)
{ {
if (menu->iconidx >= 0 && menu->iconidx if (menu->iconidx >= 0 && menu->iconidx
< (sizeof(built_in_pixmaps) / sizeof(built_in_pixmaps[0]))) < (int)(sizeof(built_in_pixmaps) / sizeof(built_in_pixmaps[0])))
xpm = built_in_pixmaps[menu->iconidx]; xpm = built_in_pixmaps[menu->iconidx];
else else
xpm = tb_blank_xpm; xpm = tb_blank_xpm;
@@ -763,7 +761,7 @@ athena_calculate_ins_pos(widget)
XtGetValues(XtParent(widget), args, n); XtGetValues(XtParent(widget), args, n);
retval = num_children; retval = num_children;
for (i = 0; i < num_children; ++i) for (i = 0; i < (int)num_children; ++i)
{ {
Widget current = children[i]; Widget current = children[i];
vimmenu_T *menu = NULL; vimmenu_T *menu = NULL;
@@ -780,11 +778,10 @@ athena_calculate_ins_pos(widget)
return retval; return retval;
} }
/* ARGSUSED */
void void
gui_mch_add_menu(menu, idx) gui_mch_add_menu(menu, idx)
vimmenu_T *menu; vimmenu_T *menu;
int idx; int idx UNUSED;
{ {
char_u *pullright_name; char_u *pullright_name;
Dimension height, space, border; Dimension height, space, border;
@@ -869,7 +866,7 @@ gui_mch_add_menu(menu, idx)
XtVaGetValues(parent->submenu_id, XtNchildren, &children, XtVaGetValues(parent->submenu_id, XtNchildren, &children,
XtNnumChildren, &num_children, XtNnumChildren, &num_children,
NULL); NULL);
for (i = 0; i < num_children; ++i) for (i = 0; i < (int)num_children; ++i)
{ {
XtVaSetValues(children[i], XtVaSetValues(children[i],
XtNrightMargin, puller_width, XtNrightMargin, puller_width,
@@ -913,7 +910,7 @@ gui_athena_menu_has_submenus(id, ignore)
XtVaGetValues(id, XtNchildren, &children, XtVaGetValues(id, XtNchildren, &children,
XtNnumChildren, &num_children, XtNnumChildren, &num_children,
NULL); NULL);
for (i = 0; i < num_children; ++i) for (i = 0; i < (int)num_children; ++i)
{ {
if (children[i] == ignore) if (children[i] == ignore)
continue; continue;
@@ -1175,11 +1172,10 @@ make_pull_name(name)
return pname; return pname;
} }
/* ARGSUSED */
void void
gui_mch_add_menu_item(menu, idx) gui_mch_add_menu_item(menu, idx)
vimmenu_T *menu; vimmenu_T *menu;
int idx; int idx UNUSED;
{ {
vimmenu_T *parent = menu->parent; vimmenu_T *parent = menu->parent;
@@ -1444,7 +1440,7 @@ gui_mch_compute_toolbar_height()
XtNchildren, &children, XtNchildren, &children,
XtNnumChildren, &numChildren, XtNnumChildren, &numChildren,
NULL); NULL);
for (i = 0; i < numChildren; i++) for (i = 0; i < (int)numChildren; i++)
{ {
whgt = 0; whgt = 0;
@@ -1473,10 +1469,9 @@ gui_mch_get_toolbar_colors(bgp, fgp, bsp, tsp, hsp)
#endif #endif
/* ARGSUSED */
void void
gui_mch_toggle_tearoffs(enable) gui_mch_toggle_tearoffs(enable)
int enable; int enable UNUSED;
{ {
/* no tearoff menus */ /* no tearoff menus */
} }
@@ -1537,7 +1532,7 @@ gui_mch_destroy_menu(menu)
else else
get_left_margin = True; get_left_margin = True;
for (i = 0; i < num_children; ++i) for (i = 0; i < (int)num_children; ++i)
{ {
if (children[i] == menu->id) if (children[i] == menu->id)
continue; continue;
@@ -1645,11 +1640,10 @@ gui_mch_destroy_menu(menu)
} }
} }
/*ARGSUSED*/
static void static void
gui_athena_menu_timeout(client_data, id) gui_athena_menu_timeout(client_data, id)
XtPointer client_data; XtPointer client_data;
XtIntervalId *id; XtIntervalId *id UNUSED;
{ {
Widget w = (Widget)client_data; Widget w = (Widget)client_data;
Widget popup; Widget popup;
@@ -1678,12 +1672,11 @@ gui_athena_menu_timeout(client_data, id)
* *
* This is called when XtPopup() is called. * This is called when XtPopup() is called.
*/ */
/*ARGSUSED*/
static void static void
gui_athena_popup_callback(w, client_data, call_data) gui_athena_popup_callback(w, client_data, call_data)
Widget w; Widget w;
XtPointer client_data; XtPointer client_data;
XtPointer call_data; XtPointer call_data UNUSED;
{ {
/* Assumption: XtIsSubclass(XtParent(w),simpleMenuWidgetClass) */ /* Assumption: XtIsSubclass(XtParent(w),simpleMenuWidgetClass) */
vimmenu_T *menu = (vimmenu_T *)client_data; vimmenu_T *menu = (vimmenu_T *)client_data;
@@ -1711,7 +1704,6 @@ gui_athena_popup_callback(w, client_data, call_data)
NULL); NULL);
} }
/* ARGSUSED */
static void static void
gui_athena_popdown_submenus_action(w, event, args, nargs) gui_athena_popdown_submenus_action(w, event, args, nargs)
Widget w; Widget w;
@@ -1756,7 +1748,6 @@ has_submenu(widget)
return False; return False;
} }
/* ARGSUSED */
static void static void
gui_athena_delayed_arm_action(w, event, args, nargs) gui_athena_delayed_arm_action(w, event, args, nargs)
Widget w; Widget w;
@@ -1837,7 +1828,6 @@ submenu_widget(widget)
* (XtIsSubclass(popup,simpleMenuWidgetClass) == True) */ * (XtIsSubclass(popup,simpleMenuWidgetClass) == True) */
} }
/* ARGSUSED */
void void
gui_mch_show_popupmenu(menu) gui_mch_show_popupmenu(menu)
vimmenu_T *menu; vimmenu_T *menu;
@@ -2046,15 +2036,14 @@ gui_x11_get_wid()
* Put up a file requester. * Put up a file requester.
* Returns the selected name in allocated memory, or NULL for Cancel. * Returns the selected name in allocated memory, or NULL for Cancel.
*/ */
/* ARGSUSED */
char_u * char_u *
gui_mch_browse(saving, title, dflt, ext, initdir, filter) gui_mch_browse(saving, title, dflt, ext, initdir, filter)
int saving; /* select file to write */ int saving UNUSED; /* select file to write */
char_u *title; /* not used (title for the window) */ char_u *title; /* title for the window */
char_u *dflt; /* not used (default name) */ char_u *dflt; /* default name */
char_u *ext; /* not used (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; /* not used (file name filter) */ char_u *filter UNUSED; /* file name filter */
{ {
Position x, y; Position x, y;
char_u dirbuf[MAXPATHL]; char_u dirbuf[MAXPATHL];
@@ -2100,13 +2089,12 @@ static void dialog_wm_handler __ARGS((Widget w, XtPointer client_data, XEvent *e
* Callback function for the textfield. When CR is hit this works like * Callback function for the textfield. When CR is hit this works like
* hitting the "OK" button, ESC like "Cancel". * hitting the "OK" button, ESC like "Cancel".
*/ */
/* ARGSUSED */
static void static void
keyhit_callback(w, client_data, event, cont) keyhit_callback(w, client_data, event, cont)
Widget w; Widget w UNUSED;
XtPointer client_data; XtPointer client_data UNUSED;
XEvent *event; XEvent *event;
Boolean *cont; Boolean *cont UNUSED;
{ {
char buf[2]; char buf[2];
@@ -2119,12 +2107,11 @@ keyhit_callback(w, client_data, event, cont)
} }
} }
/* ARGSUSED */
static void static void
butproc(w, client_data, call_data) butproc(w, client_data, call_data)
Widget w; Widget w UNUSED;
XtPointer client_data; XtPointer client_data;
XtPointer call_data; XtPointer call_data UNUSED;
{ {
dialogStatus = (int)(long)client_data + 1; dialogStatus = (int)(long)client_data + 1;
} }
@@ -2132,27 +2119,25 @@ butproc(w, client_data, call_data)
/* /*
* Function called when dialog window closed. * Function called when dialog window closed.
*/ */
/*ARGSUSED*/
static void static void
dialog_wm_handler(w, client_data, event, dum) dialog_wm_handler(w, client_data, event, dum)
Widget w; Widget w UNUSED;
XtPointer client_data; XtPointer client_data UNUSED;
XEvent *event; XEvent *event;
Boolean *dum; Boolean *dum UNUSED;
{ {
if (event->type == ClientMessage if (event->type == ClientMessage
&& ((XClientMessageEvent *)event)->data.l[0] == dialogatom) && (Atom)((XClientMessageEvent *)event)->data.l[0] == dialogatom)
dialogStatus = 0; dialogStatus = 0;
} }
/* ARGSUSED */
int int
gui_mch_dialog(type, title, message, buttons, dfltbutton, textfield) gui_mch_dialog(type, title, message, buttons, dfltbutton, textfield)
int type; int type UNUSED;
char_u *title; char_u *title;
char_u *message; char_u *message;
char_u *buttons; char_u *buttons;
int dfltbutton; int dfltbutton UNUSED;
char_u *textfield; char_u *textfield;
{ {
char_u *buts; char_u *buts;

8
src/gui_beval.c
View File

@@ -18,7 +18,7 @@
void void
general_beval_cb(beval, state) general_beval_cb(beval, state)
BalloonEval *beval; BalloonEval *beval;
int state; int state UNUSED;
{ {
win_T *wp; win_T *wp;
int col; int col;
@@ -726,10 +726,10 @@ removeEventHandler(beval)
*/ */
static void static void
pointerEventEH(w, client_data, event, unused) pointerEventEH(w, client_data, event, unused)
Widget w; Widget w UNUSED;
XtPointer client_data; XtPointer client_data;
XEvent *event; XEvent *event;
Boolean *unused; Boolean *unused UNUSED;
{ {
BalloonEval *beval = (BalloonEval *)client_data; BalloonEval *beval = (BalloonEval *)client_data;
pointerEvent(beval, event); pointerEvent(beval, event);
@@ -877,7 +877,7 @@ pointerEvent(beval, event)
static void static void
timerRoutine(dx, id) timerRoutine(dx, id)
XtPointer dx; XtPointer dx;
XtIntervalId *id; XtIntervalId *id UNUSED;
{ {
BalloonEval *beval = (BalloonEval *)dx; BalloonEval *beval = (BalloonEval *)dx;

119
src/gui_motif.c
View File

@@ -117,10 +117,9 @@ static void gui_motif_scroll_colors __ARGS((Widget id));
* Call-back routines. * Call-back routines.
*/ */
/* ARGSUSED */
static void static void
scroll_cb(w, client_data, call_data) scroll_cb(w, client_data, call_data)
Widget w; Widget w UNUSED;
XtPointer client_data, call_data; XtPointer client_data, call_data;
{ {
scrollbar_T *sb; scrollbar_T *sb;
@@ -136,11 +135,11 @@ scroll_cb(w, client_data, call_data)
} }
#ifdef FEAT_GUI_TABLINE #ifdef FEAT_GUI_TABLINE
/*ARGSUSED*/
static void static void
tabline_cb(w, client_data, call_data) tabline_cb(w, client_data, call_data)
Widget w; Widget w UNUSED;
XtPointer client_data, call_data; XtPointer client_data UNUSED;
XtPointer call_data;
{ {
XmNotebookCallbackStruct *nptr; XmNotebookCallbackStruct *nptr;
@@ -149,11 +148,11 @@ tabline_cb(w, client_data, call_data)
send_tabline_event(nptr->page_number); send_tabline_event(nptr->page_number);
} }
/*ARGSUSED*/
static void static void
tabline_button_cb(w, client_data, call_data) tabline_button_cb(w, client_data, call_data)
Widget w; Widget w;
XtPointer client_data, call_data; XtPointer client_data UNUSED;
XtPointer call_data UNUSED;
{ {
int cmd, tab_idx; int cmd, tab_idx;
@@ -166,11 +165,10 @@ tabline_button_cb(w, client_data, call_data)
/* /*
* Tabline single mouse click timeout handler * Tabline single mouse click timeout handler
*/ */
/*ARGSUSED*/
static void static void
motif_tabline_timer_cb (timed_out, interval_id) motif_tabline_timer_cb (timed_out, interval_id)
XtPointer timed_out; XtPointer timed_out;
XtIntervalId *interval_id; XtIntervalId *interval_id UNUSED;
{ {
*((int *)timed_out) = TRUE; *((int *)timed_out) = TRUE;
} }
@@ -203,13 +201,12 @@ tabline_scroller_clicked(scroller_name, event)
return FALSE; return FALSE;
} }
/*ARGSUSED*/
static void static void
tabline_menu_cb(w, closure, e, continue_dispatch) tabline_menu_cb(w, closure, e, continue_dispatch)
Widget w; Widget w;
XtPointer closure; XtPointer closure UNUSED;
XEvent *e; XEvent *e;
Boolean *continue_dispatch; Boolean *continue_dispatch UNUSED;
{ {
Widget tab_w; Widget tab_w;
XButtonPressedEvent *event; XButtonPressedEvent *event;
@@ -277,11 +274,10 @@ tabline_menu_cb(w, closure, e, continue_dispatch)
XtManageChild(tabLine_menu); XtManageChild(tabLine_menu);
} }
/*ARGSUSED*/
static void static void
tabline_balloon_cb(beval, state) tabline_balloon_cb(beval, state)
BalloonEval *beval; BalloonEval *beval;
int state; int state UNUSED;
{ {
int nr; int nr;
tabpage_T *tp; tabpage_T *tp;
@@ -642,13 +638,12 @@ gui_x11_destroy_widgets()
#endif #endif
} }
/*ARGSUSED*/
void void
gui_mch_set_text_area_pos(x, y, w, h) gui_mch_set_text_area_pos(x, y, w, h)
int x; int x UNUSED;
int y; int y UNUSED;
int w; int w UNUSED;
int h; int h UNUSED;
{ {
#ifdef FEAT_TOOLBAR #ifdef FEAT_TOOLBAR
/* Give keyboard focus to the textArea instead of the toolbar. */ /* Give keyboard focus to the textArea instead of the toolbar. */
@@ -1261,7 +1256,7 @@ get_toolbar_pixmap(menu, fname)
if (menu->icon_builtin || gui_find_bitmap(menu->name, buf, "xpm") == FAIL) if (menu->icon_builtin || gui_find_bitmap(menu->name, buf, "xpm") == FAIL)
{ {
if (menu->iconidx >= 0 && menu->iconidx if (menu->iconidx >= 0 && menu->iconidx
< (sizeof(built_in_pixmaps) / sizeof(built_in_pixmaps[0]))) < (int)(sizeof(built_in_pixmaps) / sizeof(built_in_pixmaps[0])))
xpm = built_in_pixmaps[menu->iconidx]; xpm = built_in_pixmaps[menu->iconidx];
else else
xpm = tb_blank_xpm; xpm = tb_blank_xpm;
@@ -1716,10 +1711,9 @@ gui_mch_destroy_menu(menu)
} }
} }
/* ARGSUSED */
void void
gui_mch_show_popupmenu(menu) gui_mch_show_popupmenu(menu)
vimmenu_T *menu; vimmenu_T *menu UNUSED;
{ {
#ifdef MOTIF_POPUP #ifdef MOTIF_POPUP
XmMenuPosition(menu->submenu_id, gui_x11_get_last_mouse_event()); XmMenuPosition(menu->submenu_id, gui_x11_get_last_mouse_event());
@@ -2046,9 +2040,8 @@ do_mnemonic(Widget w, unsigned int keycode)
/* /*
* Callback routine for dialog mnemonic processing. * Callback routine for dialog mnemonic processing.
*/ */
/*ARGSUSED*/
static void static void
mnemonic_event(Widget w, XtPointer call_data, XKeyEvent *event) mnemonic_event(Widget w, XtPointer call_data UNUSED, XKeyEvent *event)
{ {
do_mnemonic(w, event->keycode); do_mnemonic(w, event->keycode);
} }
@@ -2287,13 +2280,12 @@ set_predefined_fontlist(parent, name)
* Put up a file requester. * Put up a file requester.
* Returns the selected name in allocated memory, or NULL for Cancel. * Returns the selected name in allocated memory, or NULL for Cancel.
*/ */
/* ARGSUSED */
char_u * char_u *
gui_mch_browse(saving, title, dflt, ext, initdir, filter) gui_mch_browse(saving, title, dflt, ext, initdir, filter)
int saving; /* 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; /* 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 */
{ {
@@ -2413,12 +2405,11 @@ gui_mch_browse(saving, title, dflt, ext, initdir, filter)
/* /*
* Process callback from Dialog cancel actions. * Process callback from Dialog cancel actions.
*/ */
/* ARGSUSED */
static void static void
DialogCancelCB(w, client_data, call_data) DialogCancelCB(w, client_data, call_data)
Widget w; /* widget id */ Widget w UNUSED; /* widget id */
XtPointer client_data; /* data from application */ XtPointer client_data UNUSED; /* data from application */
XtPointer call_data; /* data from widget class */ XtPointer call_data UNUSED; /* data from widget class */
{ {
if (browse_fname != NULL) if (browse_fname != NULL)
{ {
@@ -2431,11 +2422,10 @@ DialogCancelCB(w, client_data, call_data)
/* /*
* Process callback from Dialog actions. * Process callback from Dialog actions.
*/ */
/* ARGSUSED */
static void static void
DialogAcceptCB(w, client_data, call_data) DialogAcceptCB(w, client_data, call_data)
Widget w; /* widget id */ Widget w UNUSED; /* widget id */
XtPointer client_data; /* 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; XmFileSelectionBoxCallbackStruct *fcb;
@@ -2467,13 +2457,12 @@ static void butproc __ARGS((Widget w, XtPointer client_data, XtPointer call_data
* Callback function for the textfield. When CR is hit this works like * Callback function for the textfield. When CR is hit this works like
* hitting the "OK" button, ESC like "Cancel". * hitting the "OK" button, ESC like "Cancel".
*/ */
/* ARGSUSED */
static void static void
keyhit_callback(w, client_data, event, cont) keyhit_callback(w, client_data, event, cont)
Widget w; Widget w;
XtPointer client_data; XtPointer client_data UNUSED;
XEvent *event; XEvent *event;
Boolean *cont; Boolean *cont UNUSED;
{ {
char buf[2]; char buf[2];
KeySym key_sym; KeySym key_sym;
@@ -2490,12 +2479,11 @@ keyhit_callback(w, client_data, event, cont)
XmTextFieldClearSelection(w, XtLastTimestampProcessed(gui.dpy)); XmTextFieldClearSelection(w, XtLastTimestampProcessed(gui.dpy));
} }
/* ARGSUSED */
static void static void
butproc(w, client_data, call_data) butproc(w, client_data, call_data)
Widget w; Widget w UNUSED;
XtPointer client_data; XtPointer client_data;
XtPointer call_data; XtPointer call_data UNUSED;
{ {
dialogStatus = (int)(long)client_data + 1; dialogStatus = (int)(long)client_data + 1;
} }
@@ -2567,10 +2555,9 @@ create_pixmap_label(parent, name, data, args, arg)
} }
#endif #endif
/* ARGSUSED */
int int
gui_mch_dialog(type, title, message, button_names, dfltbutton, textfield) gui_mch_dialog(type, title, message, button_names, dfltbutton, textfield)
int type; int type UNUSED;
char_u *title; char_u *title;
char_u *message; char_u *message;
char_u *button_names; char_u *button_names;
@@ -3197,7 +3184,7 @@ gui_mch_compute_toolbar_height()
XmNchildren, &children, XmNchildren, &children,
XmNnumChildren, &numChildren, NULL); XmNnumChildren, &numChildren, NULL);
borders += tst + tmh; borders += tst + tmh;
for (i = 0; i < numChildren; i++) for (i = 0; i < (int)numChildren; i++)
{ {
whgt = 0; whgt = 0;
XtVaGetValues(children[i], XmNheight, &whgt, NULL); XtVaGetValues(children[i], XmNheight, &whgt, NULL);
@@ -3237,13 +3224,12 @@ motif_get_toolbar_colors(bgp, fgp, bsp, tsp, hsp)
* I have to use footer help for backwards compatability. Hopefully both will * I have to use footer help for backwards compatability. Hopefully both will
* get implemented and the user will have a choice. * get implemented and the user will have a choice.
*/ */
/*ARGSUSED*/
static void static void
toolbarbutton_enter_cb(w, client_data, event, cont) toolbarbutton_enter_cb(w, client_data, event, cont)
Widget w; Widget w UNUSED;
XtPointer client_data; XtPointer client_data;
XEvent *event; XEvent *event UNUSED;
Boolean *cont; Boolean *cont UNUSED;
{ {
vimmenu_T *menu = (vimmenu_T *) client_data; vimmenu_T *menu = (vimmenu_T *) client_data;
@@ -3254,13 +3240,12 @@ toolbarbutton_enter_cb(w, client_data, event, cont)
} }
} }
/*ARGSUSED*/
static void static void
toolbarbutton_leave_cb(w, client_data, event, cont) toolbarbutton_leave_cb(w, client_data, event, cont)
Widget w; Widget w UNUSED;
XtPointer client_data; XtPointer client_data UNUSED;
XEvent *event; XEvent *event UNUSED;
Boolean *cont; Boolean *cont UNUSED;
{ {
gui_mch_set_footer((char_u *) ""); gui_mch_set_footer((char_u *) "");
} }
@@ -3492,10 +3477,9 @@ gui_motif_scroll_colors(id)
/* /*
* Set the fontlist for Widget "id" to use gui.menu_fontset or gui.menu_font. * Set the fontlist for Widget "id" to use gui.menu_fontset or gui.menu_font.
*/ */
/*ARGSUSED*/
void void
gui_motif_menu_fontlist(id) gui_motif_menu_fontlist(id)
Widget id; Widget id UNUSED;
{ {
#ifdef FEAT_MENU #ifdef FEAT_MENU
#ifdef FONTSET_ALWAYS #ifdef FONTSET_ALWAYS
@@ -3566,8 +3550,8 @@ typedef struct _SharedFindReplace
Widget cancel; Widget cancel;
} SharedFindReplace; } SharedFindReplace;
static SharedFindReplace find_widgets = { NULL }; static SharedFindReplace find_widgets = {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
static SharedFindReplace repl_widgets = { NULL }; static SharedFindReplace repl_widgets = {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
static void find_replace_destroy_callback __ARGS((Widget w, XtPointer client_data, XtPointer call_data)); static void find_replace_destroy_callback __ARGS((Widget w, XtPointer client_data, XtPointer call_data));
static void find_replace_dismiss_callback __ARGS((Widget w, XtPointer client_data, XtPointer call_data)); static void find_replace_dismiss_callback __ARGS((Widget w, XtPointer client_data, XtPointer call_data));
@@ -3576,12 +3560,11 @@ static void find_replace_callback __ARGS((Widget w, XtPointer client_data, XtPoi
static void find_replace_keypress __ARGS((Widget w, SharedFindReplace * frdp, XKeyEvent * event)); static void find_replace_keypress __ARGS((Widget w, SharedFindReplace * frdp, XKeyEvent * event));
static void find_replace_dialog_create __ARGS((char_u *entry_text, int do_replace)); static void find_replace_dialog_create __ARGS((char_u *entry_text, int do_replace));
/*ARGSUSED*/
static void static void
find_replace_destroy_callback(w, client_data, call_data) find_replace_destroy_callback(w, client_data, call_data)
Widget w; Widget w UNUSED;
XtPointer client_data; XtPointer client_data;
XtPointer call_data; XtPointer call_data UNUSED;
{ {
SharedFindReplace *cd = (SharedFindReplace *)client_data; SharedFindReplace *cd = (SharedFindReplace *)client_data;
@@ -3590,12 +3573,11 @@ find_replace_destroy_callback(w, client_data, call_data)
cd->dialog = (Widget)0; cd->dialog = (Widget)0;
} }
/*ARGSUSED*/
static void static void
find_replace_dismiss_callback(w, client_data, call_data) find_replace_dismiss_callback(w, client_data, call_data)
Widget w; Widget w UNUSED;
XtPointer client_data; XtPointer client_data;
XtPointer call_data; XtPointer call_data UNUSED;
{ {
SharedFindReplace *cd = (SharedFindReplace *)client_data; SharedFindReplace *cd = (SharedFindReplace *)client_data;
@@ -3603,22 +3585,20 @@ find_replace_dismiss_callback(w, client_data, call_data)
XtUnmanageChild(cd->dialog); XtUnmanageChild(cd->dialog);
} }
/*ARGSUSED*/
static void static void
entry_activate_callback(w, client_data, call_data) entry_activate_callback(w, client_data, call_data)
Widget w; Widget w UNUSED;
XtPointer client_data; XtPointer client_data;
XtPointer call_data; XtPointer call_data UNUSED;
{ {
XmProcessTraversal((Widget)client_data, XmTRAVERSE_CURRENT); XmProcessTraversal((Widget)client_data, XmTRAVERSE_CURRENT);
} }
/*ARGSUSED*/
static void static void
find_replace_callback(w, client_data, call_data) find_replace_callback(w, client_data, call_data)
Widget w; Widget w UNUSED;
XtPointer client_data; XtPointer client_data;
XtPointer call_data; XtPointer call_data UNUSED;
{ {
long_u flags = (long_u)client_data; long_u flags = (long_u)client_data;
char *find_text, *repl_text; char *find_text, *repl_text;
@@ -3668,10 +3648,9 @@ find_replace_callback(w, client_data, call_data)
XtFree(repl_text); XtFree(repl_text);
} }
/*ARGSUSED*/
static void static void
find_replace_keypress(w, frdp, event) find_replace_keypress(w, frdp, event)
Widget w; Widget w UNUSED;
SharedFindReplace *frdp; SharedFindReplace *frdp;
XKeyEvent *event; XKeyEvent *event;
{ {

123
src/gui_x11.c
View File

@@ -570,22 +570,20 @@ static char **gui_argv = NULL;
* Call-back routines. * Call-back routines.
*/ */
/* ARGSUSED */
static void static void
gui_x11_timer_cb(timed_out, interval_id) gui_x11_timer_cb(timed_out, interval_id)
XtPointer timed_out; XtPointer timed_out;
XtIntervalId *interval_id; XtIntervalId *interval_id UNUSED;
{ {
*((int *)timed_out) = TRUE; *((int *)timed_out) = TRUE;
} }
/* ARGSUSED */
static void static void
gui_x11_visibility_cb(w, dud, event, dum) gui_x11_visibility_cb(w, dud, event, dum)
Widget w; Widget w UNUSED;
XtPointer dud; XtPointer dud UNUSED;
XEvent *event; XEvent *event;
Boolean *dum; Boolean *dum UNUSED;
{ {
if (event->type != VisibilityNotify) if (event->type != VisibilityNotify)
return; return;
@@ -603,13 +601,12 @@ gui_x11_visibility_cb(w, dud, event, dum)
gui_mch_update(); gui_mch_update();
} }
/* ARGSUSED */
static void static void
gui_x11_expose_cb(w, dud, event, dum) gui_x11_expose_cb(w, dud, event, dum)
Widget w; Widget w UNUSED;
XtPointer dud; XtPointer dud UNUSED;
XEvent *event; XEvent *event;
Boolean *dum; Boolean *dum UNUSED;
{ {
XExposeEvent *gevent; XExposeEvent *gevent;
int new_x; int new_x;
@@ -680,13 +677,12 @@ shellRectangle(Widget shell, XRectangle *r)
} }
#endif #endif
/* ARGSUSED */
static void static void
gui_x11_resize_window_cb(w, dud, event, dum) gui_x11_resize_window_cb(w, dud, event, dum)
Widget w; Widget w UNUSED;
XtPointer dud; XtPointer dud UNUSED;
XEvent *event; XEvent *event;
Boolean *dum; Boolean *dum UNUSED;
{ {
static int lastWidth, lastHeight; static int lastWidth, lastHeight;
@@ -727,35 +723,32 @@ gui_x11_resize_window_cb(w, dud, event, dum)
#endif #endif
} }
/* ARGSUSED */
static void static void
gui_x11_focus_change_cb(w, data, event, dum) gui_x11_focus_change_cb(w, data, event, dum)
Widget w; Widget w UNUSED;
XtPointer data; XtPointer data UNUSED;
XEvent *event; XEvent *event;
Boolean *dum; Boolean *dum UNUSED;
{ {
gui_focus_change(event->type == FocusIn); gui_focus_change(event->type == FocusIn);
} }
/* ARGSUSED */
static void static void
gui_x11_enter_cb(w, data, event, dum) gui_x11_enter_cb(w, data, event, dum)
Widget w; Widget w UNUSED;
XtPointer data; XtPointer data UNUSED;
XEvent *event; XEvent *event UNUSED;
Boolean *dum; Boolean *dum UNUSED;
{ {
gui_focus_change(TRUE); gui_focus_change(TRUE);
} }
/* ARGSUSED */
static void static void
gui_x11_leave_cb(w, data, event, dum) gui_x11_leave_cb(w, data, event, dum)
Widget w; Widget w UNUSED;
XtPointer data; XtPointer data UNUSED;
XEvent *event; XEvent *event UNUSED;
Boolean *dum; Boolean *dum UNUSED;
{ {
gui_focus_change(FALSE); gui_focus_change(FALSE);
} }
@@ -766,13 +759,12 @@ gui_x11_leave_cb(w, data, event, dum)
# endif # endif
#endif #endif
/* ARGSUSED */
void void
gui_x11_key_hit_cb(w, dud, event, dum) gui_x11_key_hit_cb(w, dud, event, dum)
Widget w; Widget w UNUSED;
XtPointer dud; XtPointer dud UNUSED;
XEvent *event; XEvent *event;
Boolean *dum; Boolean *dum UNUSED;
{ {
XKeyPressedEvent *ev_press; XKeyPressedEvent *ev_press;
#ifdef FEAT_XIM #ifdef FEAT_XIM
@@ -1078,13 +1070,12 @@ theend:
#endif #endif
} }
/* ARGSUSED */
static void static void
gui_x11_mouse_cb(w, dud, event, dum) gui_x11_mouse_cb(w, dud, event, dum)
Widget w; Widget w UNUSED;
XtPointer dud; XtPointer dud UNUSED;
XEvent *event; XEvent *event;
Boolean *dum; Boolean *dum UNUSED;
{ {
static XtIntervalId timer = (XtIntervalId)0; static XtIntervalId timer = (XtIntervalId)0;
static int timed_out = TRUE; static int timed_out = TRUE;
@@ -1210,11 +1201,11 @@ gui_mch_prepare(argc, argv)
while (arg < *argc) while (arg < *argc)
{ {
/* Look for argv[arg] in cmdline_options[] table */ /* Look for argv[arg] in cmdline_options[] table */
for (i = 0; i < XtNumber(cmdline_options); i++) for (i = 0; i < (int)XtNumber(cmdline_options); i++)
if (strcmp(argv[arg], cmdline_options[i].option) == 0) if (strcmp(argv[arg], cmdline_options[i].option) == 0)
break; break;
if (i < XtNumber(cmdline_options)) if (i < (int)XtNumber(cmdline_options))
{ {
/* Remember finding "-rv" or "-reverse" */ /* Remember finding "-rv" or "-reverse" */
if (strcmp("-rv", argv[arg]) == 0 if (strcmp("-rv", argv[arg]) == 0
@@ -1319,12 +1310,11 @@ static XtInputId _xsmp_xtinputid;
static void local_xsmp_handle_requests __ARGS((XtPointer c, int *s, XtInputId *i)); static void local_xsmp_handle_requests __ARGS((XtPointer c, int *s, XtInputId *i));
/*ARGSUSED*/
static void static void
local_xsmp_handle_requests(c, s, i) local_xsmp_handle_requests(c, s, i)
XtPointer c; XtPointer c UNUSED;
int *s; int *s UNUSED;
XtInputId *i; XtInputId *i UNUSED;
{ {
if (xsmp_handle_requests() == FAIL) if (xsmp_handle_requests() == FAIL)
XtRemoveInput(_xsmp_xtinputid); XtRemoveInput(_xsmp_xtinputid);
@@ -1438,7 +1428,7 @@ gui_mch_init()
Columns = w; Columns = w;
if (mask & HeightValue) if (mask & HeightValue)
{ {
if (p_window > h - 1 || !option_was_set((char_u *)"window")) if (p_window > (long)h - 1 || !option_was_set((char_u *)"window"))
p_window = h - 1; p_window = h - 1;
Rows = h; Rows = h;
} }
@@ -1753,10 +1743,9 @@ gui_init_menu_font()
} }
#endif #endif
/*ARGSUSED*/
void void
gui_mch_exit(rc) gui_mch_exit(rc)
int rc; int rc UNUSED;
{ {
#if 0 #if 0
/* Lesstif gives an error message here, and so does Solaris. The man page /* Lesstif gives an error message here, and so does Solaris. The man page
@@ -1799,7 +1788,6 @@ gui_mch_set_winpos(x, y)
NULL); NULL);
} }
/*ARGSUSED*/
void void
gui_mch_set_shellsize(width, height, min_width, min_height, gui_mch_set_shellsize(width, height, min_width, min_height,
base_width, base_height, direction) base_width, base_height, direction)
@@ -1809,7 +1797,7 @@ gui_mch_set_shellsize(width, height, min_width, min_height,
int min_height; int min_height;
int base_width; int base_width;
int base_height; int base_height;
int direction; int direction UNUSED;
{ {
#ifdef FEAT_XIM #ifdef FEAT_XIM
height += xim_get_status_area_height(), height += xim_get_status_area_height(),
@@ -1847,11 +1835,10 @@ gui_mch_get_screen_dimensions(screen_w, screen_h)
* If "fontset" is TRUE, load the "font_name" as a fontset. * If "fontset" is TRUE, load the "font_name" as a fontset.
* Return FAIL if the font could not be loaded, OK otherwise. * Return FAIL if the font could not be loaded, OK otherwise.
*/ */
/*ARGSUSED*/
int int
gui_mch_init_font(font_name, do_fontset) gui_mch_init_font(font_name, do_fontset)
char_u *font_name; char_u *font_name;
int do_fontset; int do_fontset UNUSED;
{ {
XFontStruct *font = NULL; XFontStruct *font = NULL;
@@ -2029,10 +2016,9 @@ gui_mch_get_font(name, giveErrorIfMissing)
* Return the name of font "font" in allocated memory. * Return the name of font "font" in allocated memory.
* Don't know how to get the actual name, thus use the provided name. * Don't know how to get the actual name, thus use the provided name.
*/ */
/*ARGSUSED*/
char_u * char_u *
gui_mch_get_fontname(font, name) gui_mch_get_fontname(font, name)
GuiFont font; GuiFont font UNUSED;
char_u *name; char_u *name;
{ {
if (name == NULL) if (name == NULL)
@@ -2521,7 +2507,7 @@ draw_curl(row, col, cells)
{ {
int i; int i;
int offset; int offset;
const static int val[8] = {1, 0, 0, 0, 1, 2, 2, 2 }; static const int val[8] = {1, 0, 0, 0, 1, 2, 2, 2 };
XSetForeground(gui.dpy, gui.text_gc, prev_sp_color); XSetForeground(gui.dpy, gui.text_gc, prev_sp_color);
for (i = FILL_X(col); i < FILL_X(col + cells); ++i) for (i = FILL_X(col); i < FILL_X(col + cells); ++i)
@@ -2569,8 +2555,10 @@ gui_mch_draw_string(row, col, s, len, flags)
# ifdef FEAT_XFONTSET # ifdef FEAT_XFONTSET
if (current_fontset != NULL) if (current_fontset != NULL)
{ {
if (c >= 0x10000 && sizeof(wchar_t) <= 2) # ifdef SMALL_WCHAR_T
if (c >= 0x10000)
c = 0xbf; /* show chars > 0xffff as ? */ c = 0xbf; /* show chars > 0xffff as ? */
# endif
((wchar_t *)buf)[wlen] = c; ((wchar_t *)buf)[wlen] = c;
} }
else else
@@ -3136,11 +3124,11 @@ gui_mch_draw_menubar()
/* Nothing to do in X */ /* Nothing to do in X */
} }
/* ARGSUSED */
void void
gui_x11_menu_cb(w, client_data, call_data) gui_x11_menu_cb(w, client_data, call_data)
Widget w; Widget w UNUSED;
XtPointer client_data, call_data; XtPointer client_data;
XtPointer call_data UNUSED;
{ {
gui_menu_cb((vimmenu_T *)client_data); gui_menu_cb((vimmenu_T *)client_data);
} }
@@ -3153,13 +3141,12 @@ gui_x11_menu_cb(w, client_data, call_data)
* Function called when window closed. Works like ":qa". * Function called when window closed. Works like ":qa".
* Should put up a requester! * Should put up a requester!
*/ */
/*ARGSUSED*/
static void static void
gui_x11_wm_protocol_handler(w, client_data, event, dum) gui_x11_wm_protocol_handler(w, client_data, event, dum)
Widget w; Widget w UNUSED;
XtPointer client_data; XtPointer client_data UNUSED;
XEvent *event; XEvent *event;
Boolean *dum; Boolean *dum UNUSED;
{ {
/* /*
* Only deal with Client messages. * Only deal with Client messages.
@@ -3172,7 +3159,7 @@ gui_x11_wm_protocol_handler(w, client_data, event, dum)
* exit. That can be cancelled though, thus Vim shouldn't exit here. * exit. That can be cancelled though, thus Vim shouldn't exit here.
* Just sync our swap files. * Just sync our swap files.
*/ */
if (((XClientMessageEvent *)event)->data.l[0] == if ((Atom)((XClientMessageEvent *)event)->data.l[0] ==
wm_atoms[SAVE_YOURSELF_IDX]) wm_atoms[SAVE_YOURSELF_IDX])
{ {
out_flush(); out_flush();
@@ -3185,7 +3172,7 @@ gui_x11_wm_protocol_handler(w, client_data, event, dum)
return; return;
} }
if (((XClientMessageEvent *)event)->data.l[0] != if ((Atom)((XClientMessageEvent *)event)->data.l[0] !=
wm_atoms[DELETE_WINDOW_IDX]) wm_atoms[DELETE_WINDOW_IDX])
return; return;
@@ -3196,13 +3183,12 @@ gui_x11_wm_protocol_handler(w, client_data, event, dum)
/* /*
* Function called when property changed. Check for incoming commands * Function called when property changed. Check for incoming commands
*/ */
/*ARGSUSED*/
static void static void
gui_x11_send_event_handler(w, client_data, event, dum) gui_x11_send_event_handler(w, client_data, event, dum)
Widget w; Widget w UNUSED;
XtPointer client_data; XtPointer client_data UNUSED;
XEvent *event; XEvent *event;
Boolean *dum; Boolean *dum UNUSED;
{ {
XPropertyEvent *e = (XPropertyEvent *) event; XPropertyEvent *e = (XPropertyEvent *) event;
@@ -3277,11 +3263,10 @@ gui_mch_start_blink()
} }
} }
/* ARGSUSED */
static void static void
gui_x11_blink_cb(timed_out, interval_id) gui_x11_blink_cb(timed_out, interval_id)
XtPointer timed_out; XtPointer timed_out UNUSED;
XtIntervalId *interval_id; XtIntervalId *interval_id UNUSED;
{ {
if (blink_state == BLINK_ON) if (blink_state == BLINK_ON)
{ {

20
src/gui_xmdlg.c
View File

@@ -448,7 +448,7 @@ fill_lists(enum ListSpecifier fix, SharedFontSelData *data)
items[i] = XmStringCreateLocalized(list[ENCODING][i]); items[i] = XmStringCreateLocalized(list[ENCODING][i]);
if (i < n_items) if (i < (int)n_items)
{ {
/* recycle old button */ /* recycle old button */
XtVaSetValues(children[i], XtVaSetValues(children[i],
@@ -481,7 +481,7 @@ fill_lists(enum ListSpecifier fix, SharedFontSelData *data)
/* Destroy all the outstanding menu items. /* Destroy all the outstanding menu items.
*/ */
for (i = count[ENCODING]; i < n_items; ++i) for (i = count[ENCODING]; i < (int)n_items; ++i)
{ {
XtUnmanageChild(children[i]); XtUnmanageChild(children[i]);
XtDestroyWidget(children[i]); XtDestroyWidget(children[i]);
@@ -544,9 +544,8 @@ fill_lists(enum ListSpecifier fix, SharedFontSelData *data)
} }
} }
/*ARGSUSED*/
static void static void
stoggle_callback(Widget w, stoggle_callback(Widget w UNUSED,
SharedFontSelData *data, SharedFontSelData *data,
XmToggleButtonCallbackStruct *call_data) XmToggleButtonCallbackStruct *call_data)
{ {
@@ -709,11 +708,10 @@ do_choice(Widget w,
} }
} }
/*ARGSUSED*/
static void static void
encoding_callback(Widget w, encoding_callback(Widget w,
SharedFontSelData *data, SharedFontSelData *data,
XtPointer dummy) XtPointer dummy UNUSED)
{ {
XmString str; XmString str;
XmListCallbackStruct fake_data; XmListCallbackStruct fake_data;
@@ -752,11 +750,10 @@ size_callback(Widget w,
do_choice(w, data, call_data, SIZE); do_choice(w, data, call_data, SIZE);
} }
/*ARGSUSED*/
static void static void
cancel_callback(Widget w, cancel_callback(Widget w UNUSED,
SharedFontSelData *data, SharedFontSelData *data,
XmListCallbackStruct *call_data) XmListCallbackStruct *call_data UNUSED)
{ {
if (data->sel[ENCODING]) if (data->sel[ENCODING])
{ {
@@ -789,11 +786,10 @@ cancel_callback(Widget w,
data->exit = True; data->exit = True;
} }
/*ARGSUSED*/
static void static void
ok_callback(Widget w, ok_callback(Widget w UNUSED,
SharedFontSelData *data, SharedFontSelData *data,
XmPushButtonCallbackStruct *call_data) XmPushButtonCallbackStruct *call_data UNUSED)
{ {
char *pattern; char *pattern;
char **name; char **name;

34
src/gui_xmebw.c
View File

@@ -235,13 +235,12 @@ bump_color(unsigned short value)
return tmp; return tmp;
} }
/*ARGSUSED*/
static int static int
alloc_color(Display *display, alloc_color(Display *display,
Colormap colormap, Colormap colormap,
char *colorname, char *colorname,
XColor *xcolor, XColor *xcolor,
void *closure) void *closure UNUSED)
{ {
int status; int status;
@@ -595,9 +594,10 @@ draw_unhighlight(XmEnhancedButtonWidget eb)
XtHeight(eb), eb->primitive.highlight_thickness); XtHeight(eb), eb->primitive.highlight_thickness);
} }
/*ARGSUSED*/
static void static void
draw_pixmap(XmEnhancedButtonWidget eb, XEvent *event, Region region) draw_pixmap(XmEnhancedButtonWidget eb,
XEvent *event UNUSED,
Region region UNUSED)
{ {
Pixmap pix; Pixmap pix;
GC gc = eb->label.normal_GC; GC gc = eb->label.normal_GC;
@@ -641,7 +641,7 @@ draw_pixmap(XmEnhancedButtonWidget eb, XEvent *event, Region region)
height = eb->core.height - 2 * y; height = eb->core.height - 2 * y;
if (h < height) if (h < height)
height = h; height = h;
if (depth == eb->core.depth) if (depth == (int)eb->core.depth)
XCopyArea(XtDisplay(eb), pix, XtWindow(eb), gc, 0, 0, XCopyArea(XtDisplay(eb), pix, XtWindow(eb), gc, 0, 0,
width, height, x, y); width, height, x, y);
else if (depth == 1) else if (depth == 1)
@@ -731,9 +731,11 @@ draw_label(XmEnhancedButtonWidget eb, XEvent *event, Region region)
eb->label.normal_GC = tmp_gc; eb->label.normal_GC = tmp_gc;
} }
/*ARGSUSED*/
static void static void
Enter(Widget wid, XEvent *event, String *params, Cardinal *num_params) Enter(Widget wid,
XEvent *event,
String *params UNUSED,
Cardinal *num_params UNUSED)
{ {
XmEnhancedButtonWidget eb = (XmEnhancedButtonWidget) wid; XmEnhancedButtonWidget eb = (XmEnhancedButtonWidget) wid;
XmPushButtonCallbackStruct call_value; XmPushButtonCallbackStruct call_value;
@@ -818,9 +820,11 @@ Enter(Widget wid, XEvent *event, String *params, Cardinal *num_params)
} }
} }
/*ARGSUSED*/
static void static void
Leave(Widget wid, XEvent *event, String *params, Cardinal *num_params) Leave(Widget wid,
XEvent *event,
String *params UNUSED,
Cardinal *num_params UNUSED)
{ {
XmEnhancedButtonWidget eb = (XmEnhancedButtonWidget)wid; XmEnhancedButtonWidget eb = (XmEnhancedButtonWidget)wid;
XmPushButtonCallbackStruct call_value; XmPushButtonCallbackStruct call_value;
@@ -976,9 +980,8 @@ set_size(XmEnhancedButtonWidget newtb)
} }
} }
/*ARGSUSED*/
static void static void
Initialize(Widget rq, Widget ebw, ArgList args, Cardinal *n) Initialize(Widget rq, Widget ebw, ArgList args UNUSED, Cardinal *n UNUSED)
{ {
XmEnhancedButtonWidget request = (XmEnhancedButtonWidget)rq; XmEnhancedButtonWidget request = (XmEnhancedButtonWidget)rq;
XmEnhancedButtonWidget eb = (XmEnhancedButtonWidget)ebw; XmEnhancedButtonWidget eb = (XmEnhancedButtonWidget)ebw;
@@ -1056,9 +1059,12 @@ Destroy(Widget w)
free_pixmaps((XmEnhancedButtonWidget)w); free_pixmaps((XmEnhancedButtonWidget)w);
} }
/*ARGSUSED*/
static Boolean static Boolean
SetValues(Widget current, Widget request, Widget new, ArgList args, Cardinal *n) SetValues(Widget current,
Widget request UNUSED,
Widget new,
ArgList args UNUSED,
Cardinal *n UNUSED)
{ {
XmEnhancedButtonWidget cur = (XmEnhancedButtonWidget) current; XmEnhancedButtonWidget cur = (XmEnhancedButtonWidget) current;
XmEnhancedButtonWidget eb = (XmEnhancedButtonWidget) new; XmEnhancedButtonWidget eb = (XmEnhancedButtonWidget) new;
@@ -1108,7 +1114,7 @@ SetValues(Widget current, Widget request, Widget new, ArgList args, Cardinal *n)
if ((win_x < 0) || (win_y < 0)) if ((win_x < 0) || (win_y < 0))
return False; return False;
if ((win_x > r_width) || (win_y > r_height)) if ((win_x > (int)r_width) || (win_y > (int)r_height))
return False; return False;
draw_highlight(eb); draw_highlight(eb);
draw_shadows(eb); draw_shadows(eb);

24
src/if_python.c
View File

@@ -1096,9 +1096,8 @@ static struct PyMethodDef VimMethods[] = {
/* Vim module - Implementation /* Vim module - Implementation
*/ */
/*ARGSUSED*/
static PyObject * static PyObject *
VimCommand(PyObject *self, PyObject *args) VimCommand(PyObject *self UNUSED, PyObject *args)
{ {
char *cmd; char *cmd;
PyObject *result; PyObject *result;
@@ -1242,9 +1241,8 @@ VimToPython(typval_T *our_tv, int depth, PyObject *lookupDict)
} }
#endif #endif
/*ARGSUSED*/
static PyObject * static PyObject *
VimEval(PyObject *self, PyObject *args) VimEval(PyObject *self UNUSED, PyObject *args)
{ {
#ifdef FEAT_EVAL #ifdef FEAT_EVAL
char *expr; char *expr;
@@ -1894,9 +1892,8 @@ static PyTypeObject BufListType = {
/* Buffer list object - Implementation /* Buffer list object - Implementation
*/ */
/*ARGSUSED*/
static PyInt static PyInt
BufListLength(PyObject *self) BufListLength(PyObject *self UNUSED)
{ {
buf_T *b = firstbuf; buf_T *b = firstbuf;
PyInt n = 0; PyInt n = 0;
@@ -1910,9 +1907,8 @@ BufListLength(PyObject *self)
return n; return n;
} }
/*ARGSUSED*/
static PyObject * static PyObject *
BufListItem(PyObject *self, PyInt n) BufListItem(PyObject *self UNUSED, PyInt n)
{ {
buf_T *b; buf_T *b;
@@ -2210,9 +2206,8 @@ static PyTypeObject WinListType = {
/* Window list object - Implementation /* Window list object - Implementation
*/ */
/*ARGSUSED*/
static PyInt static PyInt
WinListLength(PyObject *self) WinListLength(PyObject *self UNUSED)
{ {
win_T *w = firstwin; win_T *w = firstwin;
PyInt n = 0; PyInt n = 0;
@@ -2226,9 +2221,8 @@ WinListLength(PyObject *self)
return n; return n;
} }
/*ARGSUSED*/
static PyObject * static PyObject *
WinListItem(PyObject *self, PyInt n) WinListItem(PyObject *self UNUSED, PyInt n)
{ {
win_T *w; win_T *w;
@@ -2274,9 +2268,8 @@ static PyTypeObject CurrentType = {
/* Current items object - Implementation /* Current items object - Implementation
*/ */
/*ARGSUSED*/
static PyObject * static PyObject *
CurrentGetattr(PyObject *self, char *name) CurrentGetattr(PyObject *self UNUSED, char *name)
{ {
if (strcmp(name, "buffer") == 0) if (strcmp(name, "buffer") == 0)
return (PyObject *)BufferNew(curbuf); return (PyObject *)BufferNew(curbuf);
@@ -2295,9 +2288,8 @@ CurrentGetattr(PyObject *self, char *name)
} }
} }
/*ARGSUSED*/
static int static int
CurrentSetattr(PyObject *self, char *name, PyObject *value) CurrentSetattr(PyObject *self UNUSED, char *name, PyObject *value)
{ {
if (strcmp(name, "line") == 0) if (strcmp(name, "line") == 0)
{ {

2
src/version.c
View File

@@ -676,6 +676,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
184,
/**/ /**/
183, 183,
/**/ /**/

18
src/window.c
View File

@@ -1163,12 +1163,11 @@ win_split_ins(size, flags, newwin, dir)
* WSP_NEWLOC may be specified in flags to prevent the location list from * WSP_NEWLOC may be specified in flags to prevent the location list from
* being copied. * being copied.
*/ */
/*ARGSUSED*/
static void static void
win_init(newp, oldp, flags) win_init(newp, oldp, flags)
win_T *newp; win_T *newp;
win_T *oldp; win_T *oldp;
int flags; int flags UNUSED;
{ {
int i; int i;
@@ -1268,11 +1267,10 @@ win_count()
* Must be called when there is just one window, filling the whole screen * Must be called when there is just one window, filling the whole screen
* (excluding the command line). * (excluding the command line).
*/ */
/*ARGSUSED*/
int int
make_windows(count, vertical) make_windows(count, vertical)
int count; int count;
int vertical; /* split windows vertically if TRUE */ int vertical UNUSED; /* split windows vertically if TRUE */
{ {
int maxcount; int maxcount;
int todo; int todo;
@@ -2353,11 +2351,10 @@ win_free_all()
* Remove a window and its frame from the tree of frames. * Remove a window and its frame from the tree of frames.
* Returns a pointer to the window that got the freed up space. * Returns a pointer to the window that got the freed up space.
*/ */
/*ARGSUSED*/
static win_T * static win_T *
winframe_remove(win, dirp, tp) winframe_remove(win, dirp, tp)
win_T *win; win_T *win;
int *dirp; /* set to 'v' or 'h' for direction if 'ea' */ int *dirp UNUSED; /* set to 'v' or 'h' for direction if 'ea' */
tabpage_T *tp; /* tab page "win" is in, NULL for current */ tabpage_T *tp; /* tab page "win" is in, NULL for current */
{ {
frame_T *frp, *frp2, *frp3; frame_T *frp, *frp2, *frp3;
@@ -3500,10 +3497,9 @@ tabpage_index(ftp)
* FAIL. * FAIL.
* Careful: When OK is returned need to get a new tab page very very soon! * Careful: When OK is returned need to get a new tab page very very soon!
*/ */
/*ARGSUSED*/
static int static int
leave_tabpage(new_curbuf) leave_tabpage(new_curbuf)
buf_T *new_curbuf; /* what is going to be the new curbuf, buf_T *new_curbuf UNUSED; /* what is going to be the new curbuf,
NULL if unknown */ NULL if unknown */
{ {
tabpage_T *tp = curtab; tabpage_T *tp = curtab;
@@ -3545,11 +3541,10 @@ leave_tabpage(new_curbuf)
* Start using tab page "tp". * Start using tab page "tp".
* Only to be used after leave_tabpage() or freeing the current tab page. * Only to be used after leave_tabpage() or freeing the current tab page.
*/ */
/*ARGSUSED*/
static void static void
enter_tabpage(tp, old_curbuf) enter_tabpage(tp, old_curbuf)
tabpage_T *tp; tabpage_T *tp;
buf_T *old_curbuf; buf_T *old_curbuf UNUSED;
{ {
int old_off = tp->tp_firstwin->w_winrow; int old_off = tp->tp_firstwin->w_winrow;
win_T *next_prevwin = tp->tp_prevwin; win_T *next_prevwin = tp->tp_prevwin;
@@ -4157,10 +4152,9 @@ buf_jump_open_tab(buf)
/* /*
* allocate a window structure and link it in the window list * allocate a window structure and link it in the window list
*/ */
/*ARGSUSED*/
static win_T * static win_T *
win_alloc(after) win_alloc(after)
win_T *after; win_T *after UNUSED;
{ {
win_T *newwin; win_T *newwin;

34
src/workshop.c
View File

@@ -204,12 +204,11 @@ workshop_get_editor_version()
* Function: * Function:
* Load a given file into the WorkShop buffer. * Load a given file into the WorkShop buffer.
*/ */
/*ARGSUSED*/
void void
workshop_load_file( workshop_load_file(
char *filename, /* the file to load */ char *filename, /* the file to load */
int line, /* an optional line number (or 0) */ int line, /* an optional line number (or 0) */
char *frameid) /* used for multi-frame support */ char *frameid UNUSED) /* used for multi-frame support */
{ {
#ifdef WSDEBUG_TRACE #ifdef WSDEBUG_TRACE
if (WSDLEVEL(WS_TRACE_VERBOSE | WS_TRACE)) if (WSDLEVEL(WS_TRACE_VERBOSE | WS_TRACE))
@@ -263,10 +262,9 @@ workshop_goto_line(
load_window(filename, lineno); load_window(filename, lineno);
} }
/*ARGSUSED*/
void void
workshop_front_file( workshop_front_file(
char *filename) char *filename UNUSED)
{ {
#ifdef WSDEBUG_TRACE #ifdef WSDEBUG_TRACE
if (WSDLEVEL(WS_TRACE_VERBOSE | WS_TRACE)) if (WSDLEVEL(WS_TRACE_VERBOSE | WS_TRACE))
@@ -538,9 +536,8 @@ workshop_adjust_marks(Widget *window, int pos,
* breakpoints have moved when a program has been recompiled and * breakpoints have moved when a program has been recompiled and
* reloaded into dbx. * reloaded into dbx.
*/ */
/*ARGSUSED*/
void void
workshop_moved_marks(char *filename) workshop_moved_marks(char *filename UNUSED)
{ {
#ifdef WSDEBUG_TRACE #ifdef WSDEBUG_TRACE
if (WSDLEVEL(WS_TRACE_VERBOSE | WS_TRACE)) if (WSDLEVEL(WS_TRACE_VERBOSE | WS_TRACE))
@@ -575,11 +572,10 @@ workshop_get_font_height()
return (int)h; return (int)h;
} }
/*ARGSUSED*/
void void
workshop_footer_message( workshop_footer_message(
char *message, char *message,
int severity) /* severity is currently unused */ int severity UNUSED) /* severity is currently unused */
{ {
#ifdef WSDEBUG_TRACE #ifdef WSDEBUG_TRACE
if (WSDLEVEL(WS_TRACE_VERBOSE | WS_TRACE)) if (WSDLEVEL(WS_TRACE_VERBOSE | WS_TRACE))
@@ -687,15 +683,14 @@ workshop_submenu_end()
* command. The globals curMenuName and curMenuPriority contain the name and * command. The globals curMenuName and curMenuPriority contain the name and
* priority of the parent menu tree. * priority of the parent menu tree.
*/ */
/*ARGSUSED*/
void void
workshop_menu_item( workshop_menu_item(
char *label, char *label,
char *verb, char *verb,
char *accelerator, char *accelerator UNUSED,
char *acceleratorText, char *acceleratorText,
char *name, char *name UNUSED,
char *filepos, char *filepos UNUSED,
char *sensitive) char *sensitive)
{ {
char cbuf[BUFSIZ]; char cbuf[BUFSIZ];
@@ -810,13 +805,12 @@ workshop_toolbar_end()
workshopInitDone = True; workshopInitDone = True;
} }
/*ARGSUSED*/
void void
workshop_toolbar_button( workshop_toolbar_button(
char *label, char *label,
char *verb, char *verb,
char *senseVerb, char *senseVerb UNUSED,
char *filepos, char *filepos UNUSED,
char *help, char *help,
char *sense, char *sense,
char *file, char *file,
@@ -968,7 +962,9 @@ workshop_set_option(
if (strcmp(option, "syntax") == 0) if (strcmp(option, "syntax") == 0)
vim_snprintf(cbuf, sizeof(cbuf), "syntax %s", value); vim_snprintf(cbuf, sizeof(cbuf), "syntax %s", value);
else if (strcmp(option, "savefiles") == 0) else if (strcmp(option, "savefiles") == 0)
; /* XXX - Not yet implemented */ {
/* XXX - Not yet implemented */
}
break; break;
case 'l': case 'l':
@@ -1098,10 +1094,9 @@ workshop_hotkeys(
/* /*
* A button in the toolbar has been pushed. * A button in the toolbar has been pushed.
*/ */
/*ARGSUSED*/
int int
workshop_get_positions( workshop_get_positions(
void *clientData, /* unused */ void *clientData UNUSED,
char **filename, /* output data */ char **filename, /* output data */
int *curLine, /* output data */ int *curLine, /* output data */
int *curCol, /* output data */ int *curCol, /* output data */
@@ -1526,9 +1521,8 @@ workshop_test_getselectedtext()
return NULL; return NULL;
} }
/*ARGSUSED*/
void void
workshop_save_sensitivity(char *filename) workshop_save_sensitivity(char *filename UNUSED)
{ {
} }