aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00
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

123
src/gui_x11.c
View File

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