|
 |
81c2858 |
To: vim-dev@vim.org
|
|
|
81c2858 |
Subject: Patch 7.2.181
|
|
|
81c2858 |
Fcc: outbox
|
|
|
81c2858 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
81c2858 |
Mime-Version: 1.0
|
|
|
81c2858 |
Content-Type: text/plain; charset=UTF-8
|
|
|
81c2858 |
Content-Transfer-Encoding: 8bit
|
|
|
81c2858 |
------------
|
|
|
81c2858 |
|
|
|
81c2858 |
Patch 7.2.181
|
|
|
81c2858 |
Problem: Some more compiler warnings when using gcc -Wextra.
|
|
|
81c2858 |
Solution: Add UNUSED and type casts.
|
|
|
81c2858 |
Files: src/if_mzsch.c, src/gui.c, src/gui_gtk.c, src/gui_gtk_x11.c,
|
|
|
81c2858 |
src/gui_gtk_f.c, src/gui_beval.c, src/netbeans.c
|
|
|
81c2858 |
|
|
|
81c2858 |
|
|
|
81c2858 |
*** ../vim-7.2.180/src/if_mzsch.c 2007-07-06 19:43:08.000000000 +0200
|
|
|
81c2858 |
--- src/if_mzsch.c 2009-05-16 22:24:18.000000000 +0200
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 667,679 ****
|
|
|
81c2858 |
static void CALLBACK
|
|
|
81c2858 |
timer_proc(HWND hwnd, UINT uMsg, UINT idEvent, DWORD dwTime)
|
|
|
81c2858 |
# elif defined(FEAT_GUI_GTK)
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static gint
|
|
|
81c2858 |
! timer_proc(gpointer data)
|
|
|
81c2858 |
# elif defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)
|
|
|
81c2858 |
- /* ARGSUSED */
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
! timer_proc(XtPointer timed_out, XtIntervalId *interval_id)
|
|
|
81c2858 |
# elif defined(FEAT_GUI_MAC)
|
|
|
81c2858 |
pascal void
|
|
|
81c2858 |
timer_proc(EventLoopTimerRef theTimer, void *userData)
|
|
|
81c2858 |
--- 667,677 ----
|
|
|
81c2858 |
static void CALLBACK
|
|
|
81c2858 |
timer_proc(HWND hwnd, UINT uMsg, UINT idEvent, DWORD dwTime)
|
|
|
81c2858 |
# elif defined(FEAT_GUI_GTK)
|
|
|
81c2858 |
static gint
|
|
|
81c2858 |
! timer_proc(gpointer data UNUSED)
|
|
|
81c2858 |
# elif defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
! timer_proc(XtPointer timed_out UNUSED, XtIntervalId *interval_id UNUSED)
|
|
|
81c2858 |
# elif defined(FEAT_GUI_MAC)
|
|
|
81c2858 |
pascal void
|
|
|
81c2858 |
timer_proc(EventLoopTimerRef theTimer, void *userData)
|
|
|
81c2858 |
*** ../vim-7.2.180/src/gui.c 2008-12-03 18:50:09.000000000 +0100
|
|
|
81c2858 |
--- src/gui.c 2009-05-17 15:52:18.000000000 +0200
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 678,688 ****
|
|
|
81c2858 |
* Return OK when able to set the font. When it failed FAIL is returned and
|
|
|
81c2858 |
* the fonts are unchanged.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
int
|
|
|
81c2858 |
gui_init_font(font_list, fontset)
|
|
|
81c2858 |
char_u *font_list;
|
|
|
81c2858 |
! int fontset;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
#define FONTLEN 320
|
|
|
81c2858 |
char_u font_name[FONTLEN];
|
|
|
81c2858 |
--- 678,687 ----
|
|
|
81c2858 |
* Return OK when able to set the font. When it failed FAIL is returned and
|
|
|
81c2858 |
* the fonts are unchanged.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
int
|
|
|
81c2858 |
gui_init_font(font_list, fontset)
|
|
|
81c2858 |
char_u *font_list;
|
|
|
81c2858 |
! int fontset UNUSED;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
#define FONTLEN 320
|
|
|
81c2858 |
char_u font_name[FONTLEN];
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 1138,1147 ****
|
|
|
81c2858 |
* Position the various GUI components (text area, menu). The vertical
|
|
|
81c2858 |
* scrollbars are NOT handled here. See gui_update_scrollbars().
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
gui_position_components(total_width)
|
|
|
81c2858 |
! int total_width;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
int text_area_x;
|
|
|
81c2858 |
int text_area_y;
|
|
|
81c2858 |
--- 1137,1145 ----
|
|
|
81c2858 |
* Position the various GUI components (text area, menu). The vertical
|
|
|
81c2858 |
* scrollbars are NOT handled here. See gui_update_scrollbars().
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
gui_position_components(total_width)
|
|
|
81c2858 |
! int total_width UNUSED;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
int text_area_x;
|
|
|
81c2858 |
int text_area_y;
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 1374,1383 ****
|
|
|
81c2858 |
* If "fit_to_display" is TRUE then the size may be reduced to fit the window
|
|
|
81c2858 |
* on the screen.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
void
|
|
|
81c2858 |
gui_set_shellsize(mustset, fit_to_display, direction)
|
|
|
81c2858 |
! int mustset; /* set by the user */
|
|
|
81c2858 |
int fit_to_display;
|
|
|
81c2858 |
int direction; /* RESIZE_HOR, RESIZE_VER */
|
|
|
81c2858 |
{
|
|
|
81c2858 |
--- 1372,1380 ----
|
|
|
81c2858 |
* If "fit_to_display" is TRUE then the size may be reduced to fit the window
|
|
|
81c2858 |
* on the screen.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
void
|
|
|
81c2858 |
gui_set_shellsize(mustset, fit_to_display, direction)
|
|
|
81c2858 |
! int mustset UNUSED; /* set by the user */
|
|
|
81c2858 |
int fit_to_display;
|
|
|
81c2858 |
int direction; /* RESIZE_HOR, RESIZE_VER */
|
|
|
81c2858 |
{
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 3120,3126 ****
|
|
|
81c2858 |
* If "oldval" is not NULL, "oldval" is the previous value, the new value is
|
|
|
81c2858 |
* in p_go.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
void
|
|
|
81c2858 |
gui_init_which_components(oldval)
|
|
|
81c2858 |
char_u *oldval;
|
|
|
81c2858 |
--- 3117,3122 ----
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 4411,4417 ****
|
|
|
81c2858 |
if (curwin->w_p_wrap)
|
|
|
81c2858 |
return FALSE;
|
|
|
81c2858 |
|
|
|
81c2858 |
! if (curwin->w_leftcol == scrollbar_value)
|
|
|
81c2858 |
return FALSE;
|
|
|
81c2858 |
|
|
|
81c2858 |
curwin->w_leftcol = (colnr_T)scrollbar_value;
|
|
|
81c2858 |
--- 4407,4413 ----
|
|
|
81c2858 |
if (curwin->w_p_wrap)
|
|
|
81c2858 |
return FALSE;
|
|
|
81c2858 |
|
|
|
81c2858 |
! if ((long_u)curwin->w_leftcol == scrollbar_value)
|
|
|
81c2858 |
return FALSE;
|
|
|
81c2858 |
|
|
|
81c2858 |
curwin->w_leftcol = (colnr_T)scrollbar_value;
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 4424,4430 ****
|
|
|
81c2858 |
&& longest_lnum < curwin->w_botline
|
|
|
81c2858 |
&& !virtual_active())
|
|
|
81c2858 |
{
|
|
|
81c2858 |
! if (scrollbar_value > scroll_line_len(curwin->w_cursor.lnum))
|
|
|
81c2858 |
{
|
|
|
81c2858 |
curwin->w_cursor.lnum = longest_lnum;
|
|
|
81c2858 |
curwin->w_cursor.col = 0;
|
|
|
81c2858 |
--- 4420,4426 ----
|
|
|
81c2858 |
&& longest_lnum < curwin->w_botline
|
|
|
81c2858 |
&& !virtual_active())
|
|
|
81c2858 |
{
|
|
|
81c2858 |
! if (scrollbar_value > (long_u)scroll_line_len(curwin->w_cursor.lnum))
|
|
|
81c2858 |
{
|
|
|
81c2858 |
curwin->w_cursor.lnum = longest_lnum;
|
|
|
81c2858 |
curwin->w_cursor.col = 0;
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 4670,4676 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Find window where the mouse pointer "y" coordinate is in.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static win_T *
|
|
|
81c2858 |
xy2win(x, y)
|
|
|
81c2858 |
int x;
|
|
|
81c2858 |
--- 4666,4671 ----
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 5124,5130 ****
|
|
|
81c2858 |
* of dropped files, they will be freed in this function, and caller can't use
|
|
|
81c2858 |
* fnames after call this function.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
void
|
|
|
81c2858 |
gui_handle_drop(x, y, modifiers, fnames, count)
|
|
|
81c2858 |
int x;
|
|
|
81c2858 |
--- 5119,5124 ----
|
|
|
81c2858 |
*** ../vim-7.2.180/src/gui_gtk.c 2008-07-31 22:29:28.000000000 +0200
|
|
|
81c2858 |
--- src/gui_gtk.c 2009-05-17 16:06:30.000000000 +0200
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 285,298 ****
|
|
|
81c2858 |
return image;
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static gint
|
|
|
81c2858 |
! toolbar_button_focus_in_event(GtkWidget *widget, GdkEventFocus *event, gpointer data)
|
|
|
81c2858 |
! {
|
|
|
81c2858 |
! /* When we're in a GtkPlug, we don't have window focus events, only widget focus.
|
|
|
81c2858 |
! * To emulate stand-alone gvim, if a button gets focus (e.g., <Tab> into GtkPlug)
|
|
|
81c2858 |
! * immediately pass it to mainwin.
|
|
|
81c2858 |
! */
|
|
|
81c2858 |
if (gtk_socket_id != 0)
|
|
|
81c2858 |
gtk_widget_grab_focus(gui.drawarea);
|
|
|
81c2858 |
|
|
|
81c2858 |
--- 285,298 ----
|
|
|
81c2858 |
return image;
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
static gint
|
|
|
81c2858 |
! toolbar_button_focus_in_event(GtkWidget *widget UNUSED,
|
|
|
81c2858 |
! GdkEventFocus *event UNUSED,
|
|
|
81c2858 |
! gpointer data UNUSED)
|
|
|
81c2858 |
! {
|
|
|
81c2858 |
! /* When we're in a GtkPlug, we don't have window focus events, only widget
|
|
|
81c2858 |
! * focus. To emulate stand-alone gvim, if a button gets focus (e.g.,
|
|
|
81c2858 |
! * <Tab> into GtkPlug) immediately pass it to mainwin. */
|
|
|
81c2858 |
if (gtk_socket_id != 0)
|
|
|
81c2858 |
gtk_widget_grab_focus(gui.drawarea);
|
|
|
81c2858 |
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 585,593 ****
|
|
|
81c2858 |
gtk_menu_prepend(GTK_MENU(menu->submenu_id), menu->tearoff_handle);
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
! menu_item_activate(GtkWidget *widget, gpointer data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
gui_menu_cb((vimmenu_T *)data);
|
|
|
81c2858 |
|
|
|
81c2858 |
--- 585,592 ----
|
|
|
81c2858 |
gtk_menu_prepend(GTK_MENU(menu->submenu_id), menu->tearoff_handle);
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
! menu_item_activate(GtkWidget *widget UNUSED, gpointer data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
gui_menu_cb((vimmenu_T *)data);
|
|
|
81c2858 |
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 1202,1210 ****
|
|
|
81c2858 |
#endif
|
|
|
81c2858 |
|
|
|
81c2858 |
#ifndef USE_FILE_CHOOSER
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
! browse_ok_cb(GtkWidget *widget, gpointer cbdata)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
gui_T *vw = (gui_T *)cbdata;
|
|
|
81c2858 |
|
|
|
81c2858 |
--- 1201,1208 ----
|
|
|
81c2858 |
#endif
|
|
|
81c2858 |
|
|
|
81c2858 |
#ifndef USE_FILE_CHOOSER
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
! browse_ok_cb(GtkWidget *widget UNUSED, gpointer cbdata)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
gui_T *vw = (gui_T *)cbdata;
|
|
|
81c2858 |
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 1218,1226 ****
|
|
|
81c2858 |
gtk_main_quit();
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
! browse_cancel_cb(GtkWidget *widget, gpointer cbdata)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
gui_T *vw = (gui_T *)cbdata;
|
|
|
81c2858 |
|
|
|
81c2858 |
--- 1216,1223 ----
|
|
|
81c2858 |
gtk_main_quit();
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
! browse_cancel_cb(GtkWidget *widget UNUSED, gpointer cbdata)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
gui_T *vw = (gui_T *)cbdata;
|
|
|
81c2858 |
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 1234,1242 ****
|
|
|
81c2858 |
gtk_main_quit();
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static gboolean
|
|
|
81c2858 |
! browse_destroy_cb(GtkWidget * widget)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
if (gui.browse_fname != NULL)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
--- 1231,1238 ----
|
|
|
81c2858 |
gtk_main_quit();
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
static gboolean
|
|
|
81c2858 |
! browse_destroy_cb(GtkWidget *widget UNUSED)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
if (gui.browse_fname != NULL)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 1262,1275 ****
|
|
|
81c2858 |
* initdir initial directory, NULL for current dir
|
|
|
81c2858 |
* filter not used (file name filter)
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
char_u *
|
|
|
81c2858 |
! gui_mch_browse(int saving,
|
|
|
81c2858 |
char_u *title,
|
|
|
81c2858 |
char_u *dflt,
|
|
|
81c2858 |
! char_u *ext,
|
|
|
81c2858 |
char_u *initdir,
|
|
|
81c2858 |
! char_u *filter)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
#ifdef USE_FILE_CHOOSER
|
|
|
81c2858 |
GtkWidget *fc;
|
|
|
81c2858 |
--- 1258,1270 ----
|
|
|
81c2858 |
* initdir initial directory, NULL for current dir
|
|
|
81c2858 |
* filter not used (file name filter)
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
char_u *
|
|
|
81c2858 |
! gui_mch_browse(int saving UNUSED,
|
|
|
81c2858 |
char_u *title,
|
|
|
81c2858 |
char_u *dflt,
|
|
|
81c2858 |
! char_u *ext UNUSED,
|
|
|
81c2858 |
char_u *initdir,
|
|
|
81c2858 |
! char_u *filter UNUSED)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
#ifdef USE_FILE_CHOOSER
|
|
|
81c2858 |
GtkWidget *fc;
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 1377,1383 ****
|
|
|
81c2858 |
* dflt default name
|
|
|
81c2858 |
* initdir initial directory, NULL for current dir
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
char_u *
|
|
|
81c2858 |
gui_mch_browsedir(
|
|
|
81c2858 |
char_u *title,
|
|
|
81c2858 |
--- 1372,1377 ----
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 1460,1466 ****
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
# ifdef FEAT_GUI_GNOME
|
|
|
81c2858 |
- /* ARGSUSED */
|
|
|
81c2858 |
static int
|
|
|
81c2858 |
gui_gnome_dialog( int type,
|
|
|
81c2858 |
char_u *title,
|
|
|
81c2858 |
--- 1454,1459 ----
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 1611,1617 ****
|
|
|
81c2858 |
GtkWidget *dialog;
|
|
|
81c2858 |
} CancelData;
|
|
|
81c2858 |
|
|
|
81c2858 |
- /* ARGSUSED */
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
dlg_button_clicked(GtkWidget * widget, ButtonData *data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
--- 1604,1609 ----
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 1622,1628 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* This makes the Escape key equivalent to the cancel button.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static int
|
|
|
81c2858 |
dlg_key_press_event(GtkWidget *widget, GdkEventKey *event, CancelData *data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
--- 1614,1619 ----
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 1655,1661 ****
|
|
|
81c2858 |
gtk_main_quit();
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
- /* ARGSUSED */
|
|
|
81c2858 |
int
|
|
|
81c2858 |
gui_mch_dialog( int type, /* type of dialog */
|
|
|
81c2858 |
char_u *title, /* title of dialog */
|
|
|
81c2858 |
--- 1646,1651 ----
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 2215,2221 ****
|
|
|
81c2858 |
GtkDialog *dialog; /* Widget of the dialog */
|
|
|
81c2858 |
} DialogInfo;
|
|
|
81c2858 |
|
|
|
81c2858 |
- /*ARGSUSED2*/
|
|
|
81c2858 |
static gboolean
|
|
|
81c2858 |
dialog_key_press_event_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
--- 2205,2210 ----
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 2398,2411 ****
|
|
|
81c2858 |
* Note: The push_in output argument seems to affect scrolling of huge
|
|
|
81c2858 |
* menus that don't fit on the screen. Leave it at the default for now.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED0*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
! popup_menu_position_func(GtkMenu *menu,
|
|
|
81c2858 |
gint *x, gint *y,
|
|
|
81c2858 |
# ifdef HAVE_GTK2
|
|
|
81c2858 |
! gboolean *push_in,
|
|
|
81c2858 |
# endif
|
|
|
81c2858 |
! gpointer user_data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
gdk_window_get_origin(gui.drawarea->window, x, y);
|
|
|
81c2858 |
|
|
|
81c2858 |
--- 2387,2399 ----
|
|
|
81c2858 |
* Note: The push_in output argument seems to affect scrolling of huge
|
|
|
81c2858 |
* menus that don't fit on the screen. Leave it at the default for now.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
! popup_menu_position_func(GtkMenu *menu UNUSED,
|
|
|
81c2858 |
gint *x, gint *y,
|
|
|
81c2858 |
# ifdef HAVE_GTK2
|
|
|
81c2858 |
! gboolean *push_in UNUSED,
|
|
|
81c2858 |
# endif
|
|
|
81c2858 |
! gpointer user_data UNUSED)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
gdk_window_get_origin(gui.drawarea->window, x, y);
|
|
|
81c2858 |
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 2464,2476 ****
|
|
|
81c2858 |
GtkWidget *all; /* 'Replace All' action button */
|
|
|
81c2858 |
} SharedFindReplace;
|
|
|
81c2858 |
|
|
|
81c2858 |
! static SharedFindReplace find_widgets = { NULL, };
|
|
|
81c2858 |
! static SharedFindReplace repl_widgets = { NULL, };
|
|
|
81c2858 |
|
|
|
81c2858 |
- /* ARGSUSED */
|
|
|
81c2858 |
static int
|
|
|
81c2858 |
find_key_press_event(
|
|
|
81c2858 |
! GtkWidget *widget,
|
|
|
81c2858 |
GdkEventKey *event,
|
|
|
81c2858 |
SharedFindReplace *frdp)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
--- 2452,2463 ----
|
|
|
81c2858 |
GtkWidget *all; /* 'Replace All' action button */
|
|
|
81c2858 |
} SharedFindReplace;
|
|
|
81c2858 |
|
|
|
81c2858 |
! static SharedFindReplace find_widgets = {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
|
|
|
81c2858 |
! static SharedFindReplace repl_widgets = {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
|
|
|
81c2858 |
|
|
|
81c2858 |
static int
|
|
|
81c2858 |
find_key_press_event(
|
|
|
81c2858 |
! GtkWidget *widget UNUSED,
|
|
|
81c2858 |
GdkEventKey *event,
|
|
|
81c2858 |
SharedFindReplace *frdp)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 2962,2970 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Callback for actions of the find and replace dialogs
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
! find_replace_cb(GtkWidget *widget, gpointer data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
int flags;
|
|
|
81c2858 |
char_u *find_text;
|
|
|
81c2858 |
--- 2949,2956 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Callback for actions of the find and replace dialogs
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
! find_replace_cb(GtkWidget *widget UNUSED, gpointer data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
int flags;
|
|
|
81c2858 |
char_u *find_text;
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 3010,3018 ****
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
/* our usual callback function */
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
! entry_activate_cb(GtkWidget *widget, gpointer data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
gtk_widget_grab_focus(GTK_WIDGET(data));
|
|
|
81c2858 |
}
|
|
|
81c2858 |
--- 2996,3003 ----
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
/* our usual callback function */
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
! entry_activate_cb(GtkWidget *widget UNUSED, gpointer data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
gtk_widget_grab_focus(GTK_WIDGET(data));
|
|
|
81c2858 |
}
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 3055,3064 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* ":helpfind"
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
void
|
|
|
81c2858 |
ex_helpfind(eap)
|
|
|
81c2858 |
! exarg_T *eap;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
/* This will fail when menus are not loaded. Well, it's only for
|
|
|
81c2858 |
* backwards compatibility anyway. */
|
|
|
81c2858 |
--- 3040,3048 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* ":helpfind"
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
void
|
|
|
81c2858 |
ex_helpfind(eap)
|
|
|
81c2858 |
! exarg_T *eap UNUSED;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
/* This will fail when menus are not loaded. Well, it's only for
|
|
|
81c2858 |
* backwards compatibility anyway. */
|
|
|
81c2858 |
*** ../vim-7.2.180/src/gui_gtk_x11.c 2008-11-28 21:26:50.000000000 +0100
|
|
|
81c2858 |
--- src/gui_gtk_x11.c 2009-05-17 15:53:02.000000000 +0200
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 619,627 ****
|
|
|
81c2858 |
* Doesn't seem possible, since check_copy_area() relies on
|
|
|
81c2858 |
* this information. --danielk
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static gint
|
|
|
81c2858 |
! visibility_event(GtkWidget *widget, GdkEventVisibility *event, gpointer data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
gui.visibility = event->state;
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
--- 625,634 ----
|
|
|
81c2858 |
* Doesn't seem possible, since check_copy_area() relies on
|
|
|
81c2858 |
* this information. --danielk
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static gint
|
|
|
81c2858 |
! visibility_event(GtkWidget *widget UNUSED,
|
|
|
81c2858 |
! GdkEventVisibility *event,
|
|
|
81c2858 |
! gpointer data UNUSED)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
gui.visibility = event->state;
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 638,646 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Redraw the corresponding portions of the screen.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static gint
|
|
|
81c2858 |
! expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
/* Skip this when the GUI isn't set up yet, will redraw later. */
|
|
|
81c2858 |
if (gui.starting)
|
|
|
81c2858 |
--- 645,654 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Redraw the corresponding portions of the screen.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static gint
|
|
|
81c2858 |
! expose_event(GtkWidget *widget UNUSED,
|
|
|
81c2858 |
! GdkEventExpose *event,
|
|
|
81c2858 |
! gpointer data UNUSED)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
/* Skip this when the GUI isn't set up yet, will redraw later. */
|
|
|
81c2858 |
if (gui.starting)
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 668,676 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Handle changes to the "Comm" property
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED2*/
|
|
|
81c2858 |
static gint
|
|
|
81c2858 |
! property_event(GtkWidget *widget, GdkEventProperty *event, gpointer data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
if (event->type == GDK_PROPERTY_NOTIFY
|
|
|
81c2858 |
&& event->state == (int)GDK_PROPERTY_NEW_VALUE
|
|
|
81c2858 |
--- 676,685 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Handle changes to the "Comm" property
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static gint
|
|
|
81c2858 |
! property_event(GtkWidget *widget,
|
|
|
81c2858 |
! GdkEventProperty *event,
|
|
|
81c2858 |
! gpointer data UNUSED)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
if (event->type == GDK_PROPERTY_NOTIFY
|
|
|
81c2858 |
&& event->state == (int)GDK_PROPERTY_NEW_VALUE
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 740,748 ****
|
|
|
81c2858 |
blink_state = BLINK_NONE;
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static gint
|
|
|
81c2858 |
! blink_cb(gpointer data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
if (blink_state == BLINK_ON)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
--- 749,756 ----
|
|
|
81c2858 |
blink_state = BLINK_NONE;
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
static gint
|
|
|
81c2858 |
! blink_cb(gpointer data UNUSED)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
if (blink_state == BLINK_ON)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 781,789 ****
|
|
|
81c2858 |
}
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static gint
|
|
|
81c2858 |
! enter_notify_event(GtkWidget *widget, GdkEventCrossing *event, gpointer data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
if (blink_state == BLINK_NONE)
|
|
|
81c2858 |
gui_mch_start_blink();
|
|
|
81c2858 |
--- 789,798 ----
|
|
|
81c2858 |
}
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
static gint
|
|
|
81c2858 |
! enter_notify_event(GtkWidget *widget UNUSED,
|
|
|
81c2858 |
! GdkEventCrossing *event UNUSED,
|
|
|
81c2858 |
! gpointer data UNUSED)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
if (blink_state == BLINK_NONE)
|
|
|
81c2858 |
gui_mch_start_blink();
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 795,803 ****
|
|
|
81c2858 |
return FALSE;
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static gint
|
|
|
81c2858 |
! leave_notify_event(GtkWidget *widget, GdkEventCrossing *event, gpointer data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
if (blink_state != BLINK_NONE)
|
|
|
81c2858 |
gui_mch_stop_blink();
|
|
|
81c2858 |
--- 804,813 ----
|
|
|
81c2858 |
return FALSE;
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
static gint
|
|
|
81c2858 |
! leave_notify_event(GtkWidget *widget UNUSED,
|
|
|
81c2858 |
! GdkEventCrossing *event UNUSED,
|
|
|
81c2858 |
! gpointer data UNUSED)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
if (blink_state != BLINK_NONE)
|
|
|
81c2858 |
gui_mch_stop_blink();
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 805,813 ****
|
|
|
81c2858 |
return FALSE;
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static gint
|
|
|
81c2858 |
! focus_in_event(GtkWidget *widget, GdkEventFocus *event, gpointer data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
gui_focus_change(TRUE);
|
|
|
81c2858 |
|
|
|
81c2858 |
--- 815,824 ----
|
|
|
81c2858 |
return FALSE;
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
static gint
|
|
|
81c2858 |
! focus_in_event(GtkWidget *widget,
|
|
|
81c2858 |
! GdkEventFocus *event UNUSED,
|
|
|
81c2858 |
! gpointer data UNUSED)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
gui_focus_change(TRUE);
|
|
|
81c2858 |
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 826,834 ****
|
|
|
81c2858 |
return TRUE;
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static gint
|
|
|
81c2858 |
! focus_out_event(GtkWidget *widget, GdkEventFocus *event, gpointer data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
gui_focus_change(FALSE);
|
|
|
81c2858 |
|
|
|
81c2858 |
--- 837,846 ----
|
|
|
81c2858 |
return TRUE;
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
static gint
|
|
|
81c2858 |
! focus_out_event(GtkWidget *widget UNUSED,
|
|
|
81c2858 |
! GdkEventFocus *event UNUSED,
|
|
|
81c2858 |
! gpointer data UNUSED)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
gui_focus_change(FALSE);
|
|
|
81c2858 |
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 956,964 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Main keyboard handler:
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static gint
|
|
|
81c2858 |
! key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
#ifdef HAVE_GTK2
|
|
|
81c2858 |
/* 256 bytes is way over the top, but for safety let's reduce it only
|
|
|
81c2858 |
--- 968,977 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Main keyboard handler:
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static gint
|
|
|
81c2858 |
! key_press_event(GtkWidget *widget UNUSED,
|
|
|
81c2858 |
! GdkEventKey *event,
|
|
|
81c2858 |
! gpointer data UNUSED)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
#ifdef HAVE_GTK2
|
|
|
81c2858 |
/* 256 bytes is way over the top, but for safety let's reduce it only
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 1225,1233 ****
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
#if defined(FEAT_XIM) && defined(HAVE_GTK2)
|
|
|
81c2858 |
- /*ARGSUSED0*/
|
|
|
81c2858 |
static gboolean
|
|
|
81c2858 |
! key_release_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* GTK+ 2 input methods may do fancy stuff on key release events too.
|
|
|
81c2858 |
--- 1238,1247 ----
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
#if defined(FEAT_XIM) && defined(HAVE_GTK2)
|
|
|
81c2858 |
static gboolean
|
|
|
81c2858 |
! key_release_event(GtkWidget *widget UNUSED,
|
|
|
81c2858 |
! GdkEventKey *event,
|
|
|
81c2858 |
! gpointer data UNUSED)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* GTK+ 2 input methods may do fancy stuff on key release events too.
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 1243,1253 ****
|
|
|
81c2858 |
* Selection handlers:
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static gint
|
|
|
81c2858 |
! selection_clear_event(GtkWidget *widget,
|
|
|
81c2858 |
GdkEventSelection *event,
|
|
|
81c2858 |
! gpointer user_data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
if (event->selection == clip_plus.gtk_sel_atom)
|
|
|
81c2858 |
clip_lose_selection(&clip_plus);
|
|
|
81c2858 |
--- 1257,1266 ----
|
|
|
81c2858 |
* Selection handlers:
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
|
|
|
81c2858 |
static gint
|
|
|
81c2858 |
! selection_clear_event(GtkWidget *widget UNUSED,
|
|
|
81c2858 |
GdkEventSelection *event,
|
|
|
81c2858 |
! gpointer user_data UNUSED)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
if (event->selection == clip_plus.gtk_sel_atom)
|
|
|
81c2858 |
clip_lose_selection(&clip_plus);
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 1265,1276 ****
|
|
|
81c2858 |
#define RS_FAIL 2 /* selection_received_cb() called and failed */
|
|
|
81c2858 |
static int received_selection = RS_NONE;
|
|
|
81c2858 |
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
! selection_received_cb(GtkWidget *widget,
|
|
|
81c2858 |
GtkSelectionData *data,
|
|
|
81c2858 |
! guint time_,
|
|
|
81c2858 |
! gpointer user_data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
VimClipboard *cbd;
|
|
|
81c2858 |
char_u *text;
|
|
|
81c2858 |
--- 1278,1288 ----
|
|
|
81c2858 |
#define RS_FAIL 2 /* selection_received_cb() called and failed */
|
|
|
81c2858 |
static int received_selection = RS_NONE;
|
|
|
81c2858 |
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
! selection_received_cb(GtkWidget *widget UNUSED,
|
|
|
81c2858 |
GtkSelectionData *data,
|
|
|
81c2858 |
! guint time_ UNUSED,
|
|
|
81c2858 |
! gpointer user_data UNUSED)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
VimClipboard *cbd;
|
|
|
81c2858 |
char_u *text;
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 1414,1426 ****
|
|
|
81c2858 |
* Prepare our selection data for passing it to the external selection
|
|
|
81c2858 |
* client.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
! selection_get_cb(GtkWidget *widget,
|
|
|
81c2858 |
GtkSelectionData *selection_data,
|
|
|
81c2858 |
guint info,
|
|
|
81c2858 |
! guint time_,
|
|
|
81c2858 |
! gpointer user_data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
char_u *string;
|
|
|
81c2858 |
char_u *tmpbuf;
|
|
|
81c2858 |
--- 1426,1437 ----
|
|
|
81c2858 |
* Prepare our selection data for passing it to the external selection
|
|
|
81c2858 |
* client.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
! selection_get_cb(GtkWidget *widget UNUSED,
|
|
|
81c2858 |
GtkSelectionData *selection_data,
|
|
|
81c2858 |
guint info,
|
|
|
81c2858 |
! guint time_ UNUSED,
|
|
|
81c2858 |
! gpointer user_data UNUSED)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
char_u *string;
|
|
|
81c2858 |
char_u *tmpbuf;
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 1678,1684 ****
|
|
|
81c2858 |
|
|
|
81c2858 |
offshoot = dx > dy ? dx : dy;
|
|
|
81c2858 |
|
|
|
81c2858 |
! /* Make a linearly declaying timer delay with a threshold of 5 at a
|
|
|
81c2858 |
* distance of 127 pixels from the main window.
|
|
|
81c2858 |
*
|
|
|
81c2858 |
* One could think endlessly about the most ergonomic variant here.
|
|
|
81c2858 |
--- 1689,1695 ----
|
|
|
81c2858 |
|
|
|
81c2858 |
offshoot = dx > dy ? dx : dy;
|
|
|
81c2858 |
|
|
|
81c2858 |
! /* Make a linearly decaying timer delay with a threshold of 5 at a
|
|
|
81c2858 |
* distance of 127 pixels from the main window.
|
|
|
81c2858 |
*
|
|
|
81c2858 |
* One could think endlessly about the most ergonomic variant here.
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 1707,1715 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Timer used to recognize multiple clicks of the mouse button.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED0*/
|
|
|
81c2858 |
static gint
|
|
|
81c2858 |
! motion_repeat_timer_cb(gpointer data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
int x;
|
|
|
81c2858 |
int y;
|
|
|
81c2858 |
--- 1718,1725 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Timer used to recognize multiple clicks of the mouse button.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static gint
|
|
|
81c2858 |
! motion_repeat_timer_cb(gpointer data UNUSED)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
int x;
|
|
|
81c2858 |
int y;
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 1749,1757 ****
|
|
|
81c2858 |
return FALSE;
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
- /*ARGSUSED2*/
|
|
|
81c2858 |
static gint
|
|
|
81c2858 |
! motion_notify_event(GtkWidget *widget, GdkEventMotion *event, gpointer data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
if (event->is_hint)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
--- 1759,1768 ----
|
|
|
81c2858 |
return FALSE;
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
static gint
|
|
|
81c2858 |
! motion_notify_event(GtkWidget *widget,
|
|
|
81c2858 |
! GdkEventMotion *event,
|
|
|
81c2858 |
! gpointer data UNUSED)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
if (event->is_hint)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 1777,1785 ****
|
|
|
81c2858 |
* by our own timeout mechanism instead of the one provided by GTK+ itself.
|
|
|
81c2858 |
* This is due to the way the generic VIM code is recognizing multiple clicks.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED2*/
|
|
|
81c2858 |
static gint
|
|
|
81c2858 |
! button_press_event(GtkWidget *widget, GdkEventButton *event, gpointer data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
int button;
|
|
|
81c2858 |
int repeated_click = FALSE;
|
|
|
81c2858 |
--- 1788,1797 ----
|
|
|
81c2858 |
* by our own timeout mechanism instead of the one provided by GTK+ itself.
|
|
|
81c2858 |
* This is due to the way the generic VIM code is recognizing multiple clicks.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static gint
|
|
|
81c2858 |
! button_press_event(GtkWidget *widget,
|
|
|
81c2858 |
! GdkEventButton *event,
|
|
|
81c2858 |
! gpointer data UNUSED)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
int button;
|
|
|
81c2858 |
int repeated_click = FALSE;
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 1855,1863 ****
|
|
|
81c2858 |
* GTK+ 2 doesn't handle mouse buttons 4, 5, 6 and 7 the same way as GTK+ 1.
|
|
|
81c2858 |
* Instead, it abstracts scrolling via the new GdkEventScroll.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED2*/
|
|
|
81c2858 |
static gboolean
|
|
|
81c2858 |
! scroll_event(GtkWidget *widget, GdkEventScroll *event, gpointer data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
int button;
|
|
|
81c2858 |
int_u vim_modifiers;
|
|
|
81c2858 |
--- 1867,1876 ----
|
|
|
81c2858 |
* GTK+ 2 doesn't handle mouse buttons 4, 5, 6 and 7 the same way as GTK+ 1.
|
|
|
81c2858 |
* Instead, it abstracts scrolling via the new GdkEventScroll.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static gboolean
|
|
|
81c2858 |
! scroll_event(GtkWidget *widget,
|
|
|
81c2858 |
! GdkEventScroll *event,
|
|
|
81c2858 |
! gpointer data UNUSED)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
int button;
|
|
|
81c2858 |
int_u vim_modifiers;
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 1896,1904 ****
|
|
|
81c2858 |
#endif /* HAVE_GTK2 */
|
|
|
81c2858 |
|
|
|
81c2858 |
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static gint
|
|
|
81c2858 |
! button_release_event(GtkWidget *widget, GdkEventButton *event, gpointer data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
int x, y;
|
|
|
81c2858 |
int_u vim_modifiers;
|
|
|
81c2858 |
--- 1909,1918 ----
|
|
|
81c2858 |
#endif /* HAVE_GTK2 */
|
|
|
81c2858 |
|
|
|
81c2858 |
|
|
|
81c2858 |
static gint
|
|
|
81c2858 |
! button_release_event(GtkWidget *widget UNUSED,
|
|
|
81c2858 |
! GdkEventButton *event,
|
|
|
81c2858 |
! gpointer data UNUSED)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
int x, y;
|
|
|
81c2858 |
int_u vim_modifiers;
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 2100,2106 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* DND receiver.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED2*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
drag_data_received_cb(GtkWidget *widget,
|
|
|
81c2858 |
GdkDragContext *context,
|
|
|
81c2858 |
--- 2114,2119 ----
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 2109,2115 ****
|
|
|
81c2858 |
GtkSelectionData *data,
|
|
|
81c2858 |
guint info,
|
|
|
81c2858 |
guint time_,
|
|
|
81c2858 |
! gpointer user_data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
GdkModifierType state;
|
|
|
81c2858 |
|
|
|
81c2858 |
--- 2122,2128 ----
|
|
|
81c2858 |
GtkSelectionData *data,
|
|
|
81c2858 |
guint info,
|
|
|
81c2858 |
guint time_,
|
|
|
81c2858 |
! gpointer user_data UNUSED)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
GdkModifierType state;
|
|
|
81c2858 |
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 2143,2149 ****
|
|
|
81c2858 |
* be abandoned and pop up a dialog asking the user for confirmation if
|
|
|
81c2858 |
* necessary.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED0*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
sm_client_check_changed_any(GnomeClient *client,
|
|
|
81c2858 |
gint key,
|
|
|
81c2858 |
--- 2156,2161 ----
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 2251,2257 ****
|
|
|
81c2858 |
* for confirmation if necessary. Save the current editing session and tell
|
|
|
81c2858 |
* the session manager how to restart Vim.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED1*/
|
|
|
81c2858 |
static gboolean
|
|
|
81c2858 |
sm_client_save_yourself(GnomeClient *client,
|
|
|
81c2858 |
gint phase,
|
|
|
81c2858 |
--- 2263,2268 ----
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 2339,2345 ****
|
|
|
81c2858 |
* here since "save_yourself" has been emitted before (unless serious trouble
|
|
|
81c2858 |
* is happening).
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED0*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
sm_client_die(GnomeClient *client, gpointer data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
--- 2350,2355 ----
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 2379,2388 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* GTK tells us that XSMP needs attention
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static gboolean
|
|
|
81c2858 |
local_xsmp_handle_requests(source, condition, data)
|
|
|
81c2858 |
! GIOChannel *source;
|
|
|
81c2858 |
GIOCondition condition;
|
|
|
81c2858 |
gpointer data;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
--- 2389,2397 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* GTK tells us that XSMP needs attention
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static gboolean
|
|
|
81c2858 |
local_xsmp_handle_requests(source, condition, data)
|
|
|
81c2858 |
! GIOChannel *source UNUSED;
|
|
|
81c2858 |
GIOCondition condition;
|
|
|
81c2858 |
gpointer data;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 2480,2495 ****
|
|
|
81c2858 |
* WM_SAVE_YOURSELF hack it actually stores the session... And yes,
|
|
|
81c2858 |
* it should work with KDE as well.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED1*/
|
|
|
81c2858 |
static GdkFilterReturn
|
|
|
81c2858 |
! global_event_filter(GdkXEvent *xev, GdkEvent *event, gpointer data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
XEvent *xevent = (XEvent *)xev;
|
|
|
81c2858 |
|
|
|
81c2858 |
if (xevent != NULL
|
|
|
81c2858 |
&& xevent->type == ClientMessage
|
|
|
81c2858 |
&& xevent->xclient.message_type == GET_X_ATOM(wm_protocols_atom)
|
|
|
81c2858 |
! && xevent->xclient.data.l[0] == GET_X_ATOM(save_yourself_atom))
|
|
|
81c2858 |
{
|
|
|
81c2858 |
out_flush();
|
|
|
81c2858 |
ml_sync_all(FALSE, FALSE); /* preserve all swap files */
|
|
|
81c2858 |
--- 2489,2506 ----
|
|
|
81c2858 |
* WM_SAVE_YOURSELF hack it actually stores the session... And yes,
|
|
|
81c2858 |
* it should work with KDE as well.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static GdkFilterReturn
|
|
|
81c2858 |
! global_event_filter(GdkXEvent *xev,
|
|
|
81c2858 |
! GdkEvent *event UNUSED,
|
|
|
81c2858 |
! gpointer data UNUSED)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
XEvent *xevent = (XEvent *)xev;
|
|
|
81c2858 |
|
|
|
81c2858 |
if (xevent != NULL
|
|
|
81c2858 |
&& xevent->type == ClientMessage
|
|
|
81c2858 |
&& xevent->xclient.message_type == GET_X_ATOM(wm_protocols_atom)
|
|
|
81c2858 |
! && (long_u)xevent->xclient.data.l[0]
|
|
|
81c2858 |
! == GET_X_ATOM(save_yourself_atom))
|
|
|
81c2858 |
{
|
|
|
81c2858 |
out_flush();
|
|
|
81c2858 |
ml_sync_all(FALSE, FALSE); /* preserve all swap files */
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 2512,2518 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* GDK handler for X ClientMessage events.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED2*/
|
|
|
81c2858 |
static GdkFilterReturn
|
|
|
81c2858 |
gdk_wm_protocols_filter(GdkXEvent *xev, GdkEvent *event, gpointer data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
--- 2523,2528 ----
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 2558,2566 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Setup the window icon & xcmdsrv comm after the main window has been realized.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
! mainwin_realize(GtkWidget *widget, gpointer data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
/* If you get an error message here, you still need to unpack the runtime
|
|
|
81c2858 |
* archive! */
|
|
|
81c2858 |
--- 2568,2575 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Setup the window icon & xcmdsrv comm after the main window has been realized.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
! mainwin_realize(GtkWidget *widget UNUSED, gpointer data UNUSED)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
/* If you get an error message here, you still need to unpack the runtime
|
|
|
81c2858 |
* archive! */
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 2712,2722 ****
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
#ifdef HAVE_GTK_MULTIHEAD
|
|
|
81c2858 |
- /*ARGSUSED1*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
mainwin_screen_changed_cb(GtkWidget *widget,
|
|
|
81c2858 |
! GdkScreen *previous_screen,
|
|
|
81c2858 |
! gpointer data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
if (!gtk_widget_has_screen(widget))
|
|
|
81c2858 |
return;
|
|
|
81c2858 |
--- 2721,2730 ----
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
#ifdef HAVE_GTK_MULTIHEAD
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
mainwin_screen_changed_cb(GtkWidget *widget,
|
|
|
81c2858 |
! GdkScreen *previous_screen UNUSED,
|
|
|
81c2858 |
! gpointer data UNUSED)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
if (!gtk_widget_has_screen(widget))
|
|
|
81c2858 |
return;
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 2757,2765 ****
|
|
|
81c2858 |
* Don't try to set any VIM scrollbar sizes anywhere here. I'm relying on the
|
|
|
81c2858 |
* fact that the main VIM engine doesn't take them into account anywhere.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED1*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
! drawarea_realize_cb(GtkWidget *widget, gpointer data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
GtkWidget *sbar;
|
|
|
81c2858 |
|
|
|
81c2858 |
--- 2765,2772 ----
|
|
|
81c2858 |
* Don't try to set any VIM scrollbar sizes anywhere here. I'm relying on the
|
|
|
81c2858 |
* fact that the main VIM engine doesn't take them into account anywhere.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
! drawarea_realize_cb(GtkWidget *widget, gpointer data UNUSED)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
GtkWidget *sbar;
|
|
|
81c2858 |
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 2789,2797 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Properly clean up on shutdown.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED0*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
! drawarea_unrealize_cb(GtkWidget *widget, gpointer data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
/* Don't write messages to the GUI anymore */
|
|
|
81c2858 |
full_screen = FALSE;
|
|
|
81c2858 |
--- 2796,2803 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Properly clean up on shutdown.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
! drawarea_unrealize_cb(GtkWidget *widget UNUSED, gpointer data UNUSED)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
/* Don't write messages to the GUI anymore */
|
|
|
81c2858 |
full_screen = FALSE;
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 2827,2837 ****
|
|
|
81c2858 |
#endif
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
- /*ARGSUSED0*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
! drawarea_style_set_cb(GtkWidget *widget,
|
|
|
81c2858 |
! GtkStyle *previous_style,
|
|
|
81c2858 |
! gpointer data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
gui_mch_new_colors();
|
|
|
81c2858 |
}
|
|
|
81c2858 |
--- 2833,2842 ----
|
|
|
81c2858 |
#endif
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
! drawarea_style_set_cb(GtkWidget *widget UNUSED,
|
|
|
81c2858 |
! GtkStyle *previous_style UNUSED,
|
|
|
81c2858 |
! gpointer data UNUSED)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
gui_mch_new_colors();
|
|
|
81c2858 |
}
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 2840,2848 ****
|
|
|
81c2858 |
* Callback routine for the "delete_event" signal on the toplevel window.
|
|
|
81c2858 |
* Tries to vim gracefully, or refuses to exit with changed buffers.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static gint
|
|
|
81c2858 |
! delete_event_cb(GtkWidget *widget, GdkEventAny *event, gpointer data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
gui_shell_closed();
|
|
|
81c2858 |
return TRUE;
|
|
|
81c2858 |
--- 2845,2854 ----
|
|
|
81c2858 |
* Callback routine for the "delete_event" signal on the toplevel window.
|
|
|
81c2858 |
* Tries to vim gracefully, or refuses to exit with changed buffers.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static gint
|
|
|
81c2858 |
! delete_event_cb(GtkWidget *widget UNUSED,
|
|
|
81c2858 |
! GdkEventAny *event UNUSED,
|
|
|
81c2858 |
! gpointer data UNUSED)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
gui_shell_closed();
|
|
|
81c2858 |
return TRUE;
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 2964,2970 ****
|
|
|
81c2858 |
|
|
|
81c2858 |
/* At start-up, don't try to set the hints until the initial
|
|
|
81c2858 |
* values have been used (those that dictate our initial size)
|
|
|
81c2858 |
! * Let forced (i.e., correct) values thruogh always.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
if (!(force_width && force_height) && init_window_hints_state > 0)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
--- 2970,2976 ----
|
|
|
81c2858 |
|
|
|
81c2858 |
/* At start-up, don't try to set the hints until the initial
|
|
|
81c2858 |
* values have been used (those that dictate our initial size)
|
|
|
81c2858 |
! * Let forced (i.e., correct) values through always.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
if (!(force_width && force_height) && init_window_hints_state > 0)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 3142,3150 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Handle selecting an item in the tab line popup menu.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
! tabline_menu_handler(GtkMenuItem *item, gpointer user_data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
/* Add the string cmd into input buffer */
|
|
|
81c2858 |
send_tabline_menu_event(clicked_page, (int)(long)user_data);
|
|
|
81c2858 |
--- 3148,3155 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Handle selecting an item in the tab line popup menu.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
! tabline_menu_handler(GtkMenuItem *item UNUSED, gpointer user_data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
/* Add the string cmd into input buffer */
|
|
|
81c2858 |
send_tabline_menu_event(clicked_page, (int)(long)user_data);
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 3244,3256 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Handle selecting one of the tabs.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
on_select_tab(
|
|
|
81c2858 |
! GtkNotebook *notebook,
|
|
|
81c2858 |
! GtkNotebookPage *page,
|
|
|
81c2858 |
gint idx,
|
|
|
81c2858 |
! gpointer data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
if (!ignore_tabline_evt)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
--- 3249,3260 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Handle selecting one of the tabs.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
on_select_tab(
|
|
|
81c2858 |
! GtkNotebook *notebook UNUSED,
|
|
|
81c2858 |
! GtkNotebookPage *page UNUSED,
|
|
|
81c2858 |
gint idx,
|
|
|
81c2858 |
! gpointer data UNUSED)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
if (!ignore_tabline_evt)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 3784,3790 ****
|
|
|
81c2858 |
#endif
|
|
|
81c2858 |
|
|
|
81c2858 |
if (gtk_socket_id != 0)
|
|
|
81c2858 |
! /* make sure keybord input can go to the drawarea */
|
|
|
81c2858 |
GTK_WIDGET_SET_FLAGS(gui.drawarea, GTK_CAN_FOCUS);
|
|
|
81c2858 |
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
--- 3788,3794 ----
|
|
|
81c2858 |
#endif
|
|
|
81c2858 |
|
|
|
81c2858 |
if (gtk_socket_id != 0)
|
|
|
81c2858 |
! /* make sure keyboard input can go to the drawarea */
|
|
|
81c2858 |
GTK_WIDGET_SET_FLAGS(gui.drawarea, GTK_CAN_FOCUS);
|
|
|
81c2858 |
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 3922,3931 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* This signal informs us about the need to rearrange our sub-widgets.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static gint
|
|
|
81c2858 |
! form_configure_event(GtkWidget *widget, GdkEventConfigure *event,
|
|
|
81c2858 |
! gpointer data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
int usable_height = event->height;
|
|
|
81c2858 |
|
|
|
81c2858 |
--- 3926,3935 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* This signal informs us about the need to rearrange our sub-widgets.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static gint
|
|
|
81c2858 |
! form_configure_event(GtkWidget *widget UNUSED,
|
|
|
81c2858 |
! GdkEventConfigure *event,
|
|
|
81c2858 |
! gpointer data UNUSED)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
int usable_height = event->height;
|
|
|
81c2858 |
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 3948,3956 ****
|
|
|
81c2858 |
* We can't do much more here than to trying to preserve what had been done,
|
|
|
81c2858 |
* since the window is already inevitably going away.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED0*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
! mainwin_destroy_cb(GtkObject *object, gpointer data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
/* Don't write messages to the GUI anymore */
|
|
|
81c2858 |
full_screen = FALSE;
|
|
|
81c2858 |
--- 3952,3959 ----
|
|
|
81c2858 |
* We can't do much more here than to trying to preserve what had been done,
|
|
|
81c2858 |
* since the window is already inevitably going away.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
! mainwin_destroy_cb(GtkObject *object UNUSED, gpointer data UNUSED)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
/* Don't write messages to the GUI anymore */
|
|
|
81c2858 |
full_screen = FALSE;
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 3980,3988 ****
|
|
|
81c2858 |
* scrollbar init.), actually do the standard hinst and stop the timer.
|
|
|
81c2858 |
* We'll not let the default hints be set while this timer's active.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static gboolean
|
|
|
81c2858 |
! check_startup_plug_hints(gpointer data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
if (init_window_hints_state == 1)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
--- 3983,3990 ----
|
|
|
81c2858 |
* scrollbar init.), actually do the standard hinst and stop the timer.
|
|
|
81c2858 |
* We'll not let the default hints be set while this timer's active.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static gboolean
|
|
|
81c2858 |
! check_startup_plug_hints(gpointer data UNUSED)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
if (init_window_hints_state == 1)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 4055,4061 ****
|
|
|
81c2858 |
Columns = w;
|
|
|
81c2858 |
if (mask & HeightValue)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
! if (p_window > h - 1 || !option_was_set((char_u *)"window"))
|
|
|
81c2858 |
p_window = h - 1;
|
|
|
81c2858 |
Rows = h;
|
|
|
81c2858 |
}
|
|
|
81c2858 |
--- 4057,4063 ----
|
|
|
81c2858 |
Columns = w;
|
|
|
81c2858 |
if (mask & HeightValue)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
! if (p_window > (long)h - 1 || !option_was_set((char_u *)"window"))
|
|
|
81c2858 |
p_window = h - 1;
|
|
|
81c2858 |
Rows = h;
|
|
|
81c2858 |
}
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 4229,4237 ****
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
|
|
|
81c2858 |
- /*ARGSUSED0*/
|
|
|
81c2858 |
void
|
|
|
81c2858 |
! gui_mch_exit(int rc)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
if (gui.mainwin != NULL)
|
|
|
81c2858 |
gtk_widget_destroy(gui.mainwin);
|
|
|
81c2858 |
--- 4231,4238 ----
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
|
|
|
81c2858 |
void
|
|
|
81c2858 |
! gui_mch_exit(int rc UNUSED)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
if (gui.mainwin != NULL)
|
|
|
81c2858 |
gtk_widget_destroy(gui.mainwin);
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 4286,4292 ****
|
|
|
81c2858 |
* report the new size through form_configure_event(). That caused the window
|
|
|
81c2858 |
* layout to be messed up.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED0*/
|
|
|
81c2858 |
static gboolean
|
|
|
81c2858 |
force_shell_resize_idle(gpointer data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
--- 4287,4292 ----
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 4314,4325 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Set the windows size.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED2*/
|
|
|
81c2858 |
void
|
|
|
81c2858 |
gui_mch_set_shellsize(int width, int height,
|
|
|
81c2858 |
! int min_width, int min_height,
|
|
|
81c2858 |
! int base_width, int base_height,
|
|
|
81c2858 |
! int direction)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
#ifndef HAVE_GTK2
|
|
|
81c2858 |
/* Hack: When the form already is at the desired size, the window might
|
|
|
81c2858 |
--- 4314,4324 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Set the windows size.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
void
|
|
|
81c2858 |
gui_mch_set_shellsize(int width, int height,
|
|
|
81c2858 |
! int min_width UNUSED, int min_height UNUSED,
|
|
|
81c2858 |
! int base_width UNUSED, int base_height UNUSED,
|
|
|
81c2858 |
! int direction UNUSED)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
#ifndef HAVE_GTK2
|
|
|
81c2858 |
/* Hack: When the form already is at the desired size, the window might
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 4413,4421 ****
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
#if defined(FEAT_TITLE) || defined(PROTO)
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
void
|
|
|
81c2858 |
! gui_mch_settitle(char_u *title, char_u *icon)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
# ifdef HAVE_GTK2
|
|
|
81c2858 |
if (title != NULL && output_conv.vc_type != CONV_NONE)
|
|
|
81c2858 |
--- 4412,4419 ----
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
#if defined(FEAT_TITLE) || defined(PROTO)
|
|
|
81c2858 |
void
|
|
|
81c2858 |
! gui_mch_settitle(char_u *title, char_u *icon UNUSED)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
# ifdef HAVE_GTK2
|
|
|
81c2858 |
if (title != NULL && output_conv.vc_type != CONV_NONE)
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 4493,4499 ****
|
|
|
81c2858 |
* Get a font structure for highlighting.
|
|
|
81c2858 |
* "cbdata" is a pointer to the global gui structure.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
font_sel_ok(GtkWidget *wgt, gpointer cbdata)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
--- 4491,4496 ----
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 4509,4515 ****
|
|
|
81c2858 |
gtk_main_quit();
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
font_sel_cancel(GtkWidget *wgt, gpointer cbdata)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
--- 4506,4511 ----
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 4520,4526 ****
|
|
|
81c2858 |
gtk_main_quit();
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
font_sel_destroy(GtkWidget *wgt, gpointer cbdata)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
--- 4516,4521 ----
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 4620,4626 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Try to load the requested fontset.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED2*/
|
|
|
81c2858 |
GuiFontset
|
|
|
81c2858 |
gui_mch_get_fontset(char_u *name, int report_error, int fixed_width)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
--- 4615,4620 ----
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 4863,4869 ****
|
|
|
81c2858 |
styled_font[1] = &gui.ital_font;
|
|
|
81c2858 |
styled_font[2] = &gui.boldital_font;
|
|
|
81c2858 |
|
|
|
81c2858 |
! /* First free whatever was freviously there. */
|
|
|
81c2858 |
for (i = 0; i < 3; ++i)
|
|
|
81c2858 |
if (*styled_font[i])
|
|
|
81c2858 |
{
|
|
|
81c2858 |
--- 4857,4863 ----
|
|
|
81c2858 |
styled_font[1] = &gui.ital_font;
|
|
|
81c2858 |
styled_font[2] = &gui.boldital_font;
|
|
|
81c2858 |
|
|
|
81c2858 |
! /* First free whatever was previously there. */
|
|
|
81c2858 |
for (i = 0; i < 3; ++i)
|
|
|
81c2858 |
if (*styled_font[i])
|
|
|
81c2858 |
{
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 5012,5020 ****
|
|
|
81c2858 |
* Initialize Vim to use the font or fontset with the given name.
|
|
|
81c2858 |
* Return FAIL if the font could not be loaded, OK otherwise.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED1*/
|
|
|
81c2858 |
int
|
|
|
81c2858 |
! gui_mch_init_font(char_u *font_name, int fontset)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
#ifdef HAVE_GTK2
|
|
|
81c2858 |
PangoFontDescription *font_desc;
|
|
|
81c2858 |
--- 5006,5013 ----
|
|
|
81c2858 |
* Initialize Vim to use the font or fontset with the given name.
|
|
|
81c2858 |
* Return FAIL if the font could not be loaded, OK otherwise.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
int
|
|
|
81c2858 |
! gui_mch_init_font(char_u *font_name, int fontset UNUSED)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
#ifdef HAVE_GTK2
|
|
|
81c2858 |
PangoFontDescription *font_desc;
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 5326,5334 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Return the name of font "font" in allocated memory.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
char_u *
|
|
|
81c2858 |
! gui_mch_get_fontname(GuiFont font, char_u *name)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
# ifdef HAVE_GTK2
|
|
|
81c2858 |
if (font != NOFONT)
|
|
|
81c2858 |
--- 5319,5326 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Return the name of font "font" in allocated memory.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
char_u *
|
|
|
81c2858 |
! gui_mch_get_fontname(GuiFont font, char_u *name UNUSED)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
# ifdef HAVE_GTK2
|
|
|
81c2858 |
if (font != NOFONT)
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 5732,5738 ****
|
|
|
81c2858 |
{
|
|
|
81c2858 |
int i;
|
|
|
81c2858 |
int offset;
|
|
|
81c2858 |
! const static int val[8] = {1, 0, 0, 0, 1, 2, 2, 2 };
|
|
|
81c2858 |
int y = FILL_Y(row + 1) - 1;
|
|
|
81c2858 |
|
|
|
81c2858 |
/* Undercurl: draw curl at the bottom of the character cell. */
|
|
|
81c2858 |
--- 5724,5730 ----
|
|
|
81c2858 |
{
|
|
|
81c2858 |
int i;
|
|
|
81c2858 |
int offset;
|
|
|
81c2858 |
! static const int val[8] = {1, 0, 0, 0, 1, 2, 2, 2 };
|
|
|
81c2858 |
int y = FILL_Y(row + 1) - 1;
|
|
|
81c2858 |
|
|
|
81c2858 |
/* Undercurl: draw curl at the bottom of the character cell. */
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 6402,6408 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Callback function, used when data is available on the SNiFF connection.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /* ARGSUSED */
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
sniff_request_cb(
|
|
|
81c2858 |
gpointer data,
|
|
|
81c2858 |
--- 6394,6399 ----
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 6711,6719 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Disown the selection.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
void
|
|
|
81c2858 |
! clip_mch_lose_selection(VimClipboard *cbd)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
/* WEIRD: when using NULL to actually disown the selection, we lose the
|
|
|
81c2858 |
* selection the first time we own it. */
|
|
|
81c2858 |
--- 6702,6709 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Disown the selection.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
void
|
|
|
81c2858 |
! clip_mch_lose_selection(VimClipboard *cbd UNUSED)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
/* WEIRD: when using NULL to actually disown the selection, we lose the
|
|
|
81c2858 |
* selection the first time we own it. */
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 6741,6749 ****
|
|
|
81c2858 |
* Send the current selection to the clipboard. Do nothing for X because we
|
|
|
81c2858 |
* will fill in the selection only when requested by another app.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
void
|
|
|
81c2858 |
! clip_mch_set_selection(VimClipboard *cbd)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
--- 6731,6738 ----
|
|
|
81c2858 |
* Send the current selection to the clipboard. Do nothing for X because we
|
|
|
81c2858 |
* will fill in the selection only when requested by another app.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
void
|
|
|
81c2858 |
! clip_mch_set_selection(VimClipboard *cbd UNUSED)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 6950,6956 ****
|
|
|
81c2858 |
else
|
|
|
81c2858 |
id &= ~1; /* they are always even (why?) */
|
|
|
81c2858 |
}
|
|
|
81c2858 |
! else if (shape < sizeof(mshape_ids) / sizeof(int))
|
|
|
81c2858 |
id = mshape_ids[shape];
|
|
|
81c2858 |
else
|
|
|
81c2858 |
return;
|
|
|
81c2858 |
--- 6939,6945 ----
|
|
|
81c2858 |
else
|
|
|
81c2858 |
id &= ~1; /* they are always even (why?) */
|
|
|
81c2858 |
}
|
|
|
81c2858 |
! else if (shape < (int)(sizeof(mshape_ids) / sizeof(int)))
|
|
|
81c2858 |
id = mshape_ids[shape];
|
|
|
81c2858 |
else
|
|
|
81c2858 |
return;
|
|
|
81c2858 |
*** ../vim-7.2.180/src/gui_gtk_f.c 2007-05-10 19:50:33.000000000 +0200
|
|
|
81c2858 |
--- src/gui_gtk_f.c 2009-05-17 15:48:51.000000000 +0200
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 227,240 ****
|
|
|
81c2858 |
|
|
|
81c2858 |
if (!form_type)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
! GtkTypeInfo form_info =
|
|
|
81c2858 |
! {
|
|
|
81c2858 |
! "GtkForm",
|
|
|
81c2858 |
! sizeof(GtkForm),
|
|
|
81c2858 |
! sizeof(GtkFormClass),
|
|
|
81c2858 |
! (GtkClassInitFunc) gtk_form_class_init,
|
|
|
81c2858 |
! (GtkObjectInitFunc) gtk_form_init
|
|
|
81c2858 |
! };
|
|
|
81c2858 |
|
|
|
81c2858 |
form_type = gtk_type_unique(GTK_TYPE_CONTAINER, &form_info);
|
|
|
81c2858 |
}
|
|
|
81c2858 |
--- 227,239 ----
|
|
|
81c2858 |
|
|
|
81c2858 |
if (!form_type)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
! GtkTypeInfo form_info;
|
|
|
81c2858 |
!
|
|
|
81c2858 |
! form_info.type_name = "GtkForm";
|
|
|
81c2858 |
! form_info.object_size = sizeof(GtkForm);
|
|
|
81c2858 |
! form_info.class_size = sizeof(GtkFormClass);
|
|
|
81c2858 |
! form_info.class_init_func = (GtkClassInitFunc)gtk_form_class_init;
|
|
|
81c2858 |
! form_info.object_init_func = (GtkObjectInitFunc)gtk_form_init;
|
|
|
81c2858 |
|
|
|
81c2858 |
form_type = gtk_type_unique(GTK_TYPE_CONTAINER, &form_info);
|
|
|
81c2858 |
}
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 611,620 ****
|
|
|
81c2858 |
}
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
- /*ARGSUSED1*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
gtk_form_forall(GtkContainer *container,
|
|
|
81c2858 |
! gboolean include_internals,
|
|
|
81c2858 |
GtkCallback callback,
|
|
|
81c2858 |
gpointer callback_data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
--- 610,618 ----
|
|
|
81c2858 |
}
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
gtk_form_forall(GtkContainer *container,
|
|
|
81c2858 |
! gboolean include_internals UNUSED,
|
|
|
81c2858 |
GtkCallback callback,
|
|
|
81c2858 |
gpointer callback_data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 786,794 ****
|
|
|
81c2858 |
* them or discards them, depending on whether we are obscured
|
|
|
81c2858 |
* or not.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED1*/
|
|
|
81c2858 |
static GdkFilterReturn
|
|
|
81c2858 |
! gtk_form_filter(GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
XEvent *xevent;
|
|
|
81c2858 |
GtkForm *form;
|
|
|
81c2858 |
--- 784,791 ----
|
|
|
81c2858 |
* them or discards them, depending on whether we are obscured
|
|
|
81c2858 |
* or not.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static GdkFilterReturn
|
|
|
81c2858 |
! gtk_form_filter(GdkXEvent *gdk_xevent, GdkEvent *event UNUSED, gpointer data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
XEvent *xevent;
|
|
|
81c2858 |
GtkForm *form;
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 821,829 ****
|
|
|
81c2858 |
* there is no corresponding event in GTK, so we have
|
|
|
81c2858 |
* to get the events from a filter
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED1*/
|
|
|
81c2858 |
static GdkFilterReturn
|
|
|
81c2858 |
! gtk_form_main_filter(GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
XEvent *xevent;
|
|
|
81c2858 |
GtkForm *form;
|
|
|
81c2858 |
--- 818,827 ----
|
|
|
81c2858 |
* there is no corresponding event in GTK, so we have
|
|
|
81c2858 |
* to get the events from a filter
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static GdkFilterReturn
|
|
|
81c2858 |
! gtk_form_main_filter(GdkXEvent *gdk_xevent,
|
|
|
81c2858 |
! GdkEvent *event UNUSED,
|
|
|
81c2858 |
! gpointer data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
XEvent *xevent;
|
|
|
81c2858 |
GtkForm *form;
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 911,919 ****
|
|
|
81c2858 |
#endif
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
- /*ARGSUSED0*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
! gtk_form_child_map(GtkWidget *widget, gpointer user_data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
GtkFormChild *child;
|
|
|
81c2858 |
|
|
|
81c2858 |
--- 909,916 ----
|
|
|
81c2858 |
#endif
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
! gtk_form_child_map(GtkWidget *widget UNUSED, gpointer user_data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
GtkFormChild *child;
|
|
|
81c2858 |
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 923,931 ****
|
|
|
81c2858 |
gdk_window_show(child->window);
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
- /*ARGSUSED0*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
! gtk_form_child_unmap(GtkWidget *widget, gpointer user_data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
GtkFormChild *child;
|
|
|
81c2858 |
|
|
|
81c2858 |
--- 920,927 ----
|
|
|
81c2858 |
gdk_window_show(child->window);
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
! gtk_form_child_unmap(GtkWidget *widget UNUSED, gpointer user_data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
GtkFormChild *child;
|
|
|
81c2858 |
|
|
|
81c2858 |
*** ../vim-7.2.180/src/gui_beval.c 2009-03-18 12:20:35.000000000 +0100
|
|
|
81c2858 |
--- src/gui_beval.c 2009-05-17 15:53:22.000000000 +0200
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 15,21 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Common code, invoked when the mouse is resting for a moment.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
void
|
|
|
81c2858 |
general_beval_cb(beval, state)
|
|
|
81c2858 |
BalloonEval *beval;
|
|
|
81c2858 |
--- 15,20 ----
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 551,559 ****
|
|
|
81c2858 |
return FALSE; /* continue emission */
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static gint
|
|
|
81c2858 |
! mainwin_event_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
BalloonEval *beval = (BalloonEval *)data;
|
|
|
81c2858 |
|
|
|
81c2858 |
--- 550,557 ----
|
|
|
81c2858 |
return FALSE; /* continue emission */
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
static gint
|
|
|
81c2858 |
! mainwin_event_cb(GtkWidget *widget UNUSED, GdkEvent *event, gpointer data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
BalloonEval *beval = (BalloonEval *)data;
|
|
|
81c2858 |
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 663,671 ****
|
|
|
81c2858 |
return FALSE; /* don't call me again */
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
- /*ARGSUSED2*/
|
|
|
81c2858 |
static gint
|
|
|
81c2858 |
! balloon_expose_event_cb(GtkWidget *widget, GdkEventExpose *event, gpointer data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
gtk_paint_flat_box(widget->style, widget->window,
|
|
|
81c2858 |
GTK_STATE_NORMAL, GTK_SHADOW_OUT,
|
|
|
81c2858 |
--- 661,670 ----
|
|
|
81c2858 |
return FALSE; /* don't call me again */
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
static gint
|
|
|
81c2858 |
! balloon_expose_event_cb(GtkWidget *widget,
|
|
|
81c2858 |
! GdkEventExpose *event,
|
|
|
81c2858 |
! gpointer data UNUSED)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
gtk_paint_flat_box(widget->style, widget->window,
|
|
|
81c2858 |
GTK_STATE_NORMAL, GTK_SHADOW_OUT,
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 676,682 ****
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
# ifndef HAVE_GTK2
|
|
|
81c2858 |
- /*ARGSUSED2*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
balloon_draw_cb(GtkWidget *widget, GdkRectangle *area, gpointer data)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
--- 675,680 ----
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 726,732 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* The X event handler. All it does is call the real event handler.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
pointerEventEH(w, client_data, event, unused)
|
|
|
81c2858 |
Widget w;
|
|
|
81c2858 |
--- 724,729 ----
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 877,883 ****
|
|
|
81c2858 |
}
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
timerRoutine(dx, id)
|
|
|
81c2858 |
XtPointer dx;
|
|
|
81c2858 |
--- 874,879 ----
|
|
|
81c2858 |
*** ../vim-7.2.180/src/netbeans.c 2009-02-21 22:12:43.000000000 +0100
|
|
|
81c2858 |
--- src/netbeans.c 2009-05-17 15:51:14.000000000 +0200
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 700,706 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Read and process a command from netbeans.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
#if defined(FEAT_GUI_W32) || defined(PROTO)
|
|
|
81c2858 |
/* Use this one when generating prototypes, the others are static. */
|
|
|
81c2858 |
void
|
|
|
81c2858 |
--- 700,705 ----
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 708,719 ****
|
|
|
81c2858 |
#else
|
|
|
81c2858 |
# ifdef FEAT_GUI_MOTIF
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
! messageFromNetbeans(XtPointer clientData, int *unused1, XtInputId *unused2)
|
|
|
81c2858 |
# endif
|
|
|
81c2858 |
# ifdef FEAT_GUI_GTK
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
! messageFromNetbeans(gpointer clientData, gint unused1,
|
|
|
81c2858 |
! GdkInputCondition unused2)
|
|
|
81c2858 |
# endif
|
|
|
81c2858 |
#endif
|
|
|
81c2858 |
{
|
|
|
81c2858 |
--- 707,721 ----
|
|
|
81c2858 |
#else
|
|
|
81c2858 |
# ifdef FEAT_GUI_MOTIF
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
! messageFromNetbeans(XtPointer clientData UNUSED
|
|
|
81c2858 |
! int *unused1 UNUSED,
|
|
|
81c2858 |
! XtInputId *unused2 UNUSED)
|
|
|
81c2858 |
# endif
|
|
|
81c2858 |
# ifdef FEAT_GUI_GTK
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
! messageFromNetbeans(gpointer clientData UNUSED,
|
|
|
81c2858 |
! gint unused1 UNUSED,
|
|
|
81c2858 |
! GdkInputCondition unused2 UNUSED)
|
|
|
81c2858 |
# endif
|
|
|
81c2858 |
#endif
|
|
|
81c2858 |
{
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 1585,1591 ****
|
|
|
81c2858 |
--- 1587,1595 ----
|
|
|
81c2858 |
buf_delsign(buf->bufp, id);
|
|
|
81c2858 |
}
|
|
|
81c2858 |
else
|
|
|
81c2858 |
+ {
|
|
|
81c2858 |
nbdebug((" No sign on line %d\n", i));
|
|
|
81c2858 |
+ }
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
nbdebug((" Deleting lines %d through %d\n", del_from_lnum, del_to_lnum));
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 2144,2150 ****
|
|
|
81c2858 |
--- 2148,2156 ----
|
|
|
81c2858 |
#endif
|
|
|
81c2858 |
}
|
|
|
81c2858 |
else
|
|
|
81c2858 |
+ {
|
|
|
81c2858 |
nbdebug((" BAD POSITION in setDot: %s\n", s));
|
|
|
81c2858 |
+ }
|
|
|
81c2858 |
|
|
|
81c2858 |
/* gui_update_cursor(TRUE, FALSE); */
|
|
|
81c2858 |
/* update_curbuf(NOT_VALID); */
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 2744,2754 ****
|
|
|
81c2858 |
* cursor and sends it to the debugger for evaluation. The debugger should
|
|
|
81c2858 |
* respond with a showBalloon command when there is a useful result.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
void
|
|
|
81c2858 |
netbeans_beval_cb(
|
|
|
81c2858 |
BalloonEval *beval,
|
|
|
81c2858 |
! int state)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
win_T *wp;
|
|
|
81c2858 |
char_u *text;
|
|
|
81c2858 |
--- 2750,2759 ----
|
|
|
81c2858 |
* cursor and sends it to the debugger for evaluation. The debugger should
|
|
|
81c2858 |
* respond with a showBalloon command when there is a useful result.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
void
|
|
|
81c2858 |
netbeans_beval_cb(
|
|
|
81c2858 |
BalloonEval *beval,
|
|
|
81c2858 |
! int state UNUSED)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
win_T *wp;
|
|
|
81c2858 |
char_u *text;
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 3061,3069 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Send netbeans an unmodufied command.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
void
|
|
|
81c2858 |
! netbeans_unmodified(buf_T *bufp)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
#if 0
|
|
|
81c2858 |
char_u buf[128];
|
|
|
81c2858 |
--- 3066,3073 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Send netbeans an unmodufied command.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
void
|
|
|
81c2858 |
! netbeans_unmodified(buf_T *bufp UNUSED)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
#if 0
|
|
|
81c2858 |
char_u buf[128];
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 3370,3382 ****
|
|
|
81c2858 |
* buf->signmapused[] maps buffer-local annotation IDs to an index in
|
|
|
81c2858 |
* globalsignmap[].
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
addsigntype(
|
|
|
81c2858 |
nbbuf_T *buf,
|
|
|
81c2858 |
int typeNum,
|
|
|
81c2858 |
char_u *typeName,
|
|
|
81c2858 |
! char_u *tooltip,
|
|
|
81c2858 |
char_u *glyphFile,
|
|
|
81c2858 |
int use_fg,
|
|
|
81c2858 |
int fg,
|
|
|
81c2858 |
--- 3374,3385 ----
|
|
|
81c2858 |
* buf->signmapused[] maps buffer-local annotation IDs to an index in
|
|
|
81c2858 |
* globalsignmap[].
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
addsigntype(
|
|
|
81c2858 |
nbbuf_T *buf,
|
|
|
81c2858 |
int typeNum,
|
|
|
81c2858 |
char_u *typeName,
|
|
|
81c2858 |
! char_u *tooltip UNUSED,
|
|
|
81c2858 |
char_u *glyphFile,
|
|
|
81c2858 |
int use_fg,
|
|
|
81c2858 |
int fg,
|
|
|
81c2858 |
*** ../vim-7.2.180/src/version.c 2009-05-17 13:30:58.000000000 +0200
|
|
|
81c2858 |
--- src/version.c 2009-05-17 16:07:26.000000000 +0200
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 678,679 ****
|
|
|
81c2858 |
--- 678,681 ----
|
|
|
81c2858 |
{ /* Add new patch number below this line */
|
|
|
81c2858 |
+ /**/
|
|
|
81c2858 |
+ 181,
|
|
|
81c2858 |
/**/
|
|
|
81c2858 |
|
|
|
81c2858 |
--
|
|
|
81c2858 |
I am always surprised in the Linux world how quickly solutions can be
|
|
|
81c2858 |
obtained. (Imagine sending an email to Bill Gates, asking why Windows
|
|
|
81c2858 |
crashed, and how to fix it... and then getting an answer that fixed the
|
|
|
81c2858 |
problem... <0>_<0> !) -- Mark Langdon
|
|
|
81c2858 |
|
|
|
81c2858 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
81c2858 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
81c2858 |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
81c2858 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|