aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-28 04:24:06 -04:00
Code Activity

updated for version 7.3.016

Browse Source 
Problem:    Netbeans doesn't work under Athena.
Solution:   Support Athena, just like Motif. (Xavier de Gaye)
This commit is contained in:
Bram Moolenaar
2010-09-29 17:27:01 +02:00
parent 3967692f9e
commit 173c98550f
5 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/netbeans.c
View File

@@ -87,7 +87,7 @@ static int getConnInfo __ARGS((char *file, char **host, char **port, char **pass
static void nb_init_graphics __ARGS((void));
static void coloncmd __ARGS((char *cmd, ...));
static void nb_set_curbuf __ARGS((buf_T *buf));
#ifdef FEAT_GUI_MOTIF
#ifdef FEAT_GUI_X11
static void messageFromNetbeans __ARGS((XtPointer, int *, XtInputId *));
#endif
#ifdef FEAT_GUI_GTK
@@ -112,7 +112,7 @@ typedef int NBSOCK;
static NBSOCK nbsock = -1; /* socket fd for Netbeans connection */
#define NETBEANS_OPEN (nbsock != -1)
#ifdef FEAT_GUI_MOTIF
#ifdef FEAT_GUI_X11
static XtInputId inputHandler = (XtInputId)NULL; /* Cookie for input */
#endif
#ifdef FEAT_GUI_GTK
@@ -143,7 +143,7 @@ netbeans_close(void)
netbeans_send_disconnect();
#ifdef FEAT_GUI_MOTIF
#ifdef FEAT_GUI_X11
if (inputHandler != (XtInputId)NULL)
{
XtRemoveInput(inputHandler);
@@ -700,7 +700,7 @@ netbeans_parse_messages(void)
/*
* Read a command from netbeans.
*/
#ifdef FEAT_GUI_MOTIF
#ifdef FEAT_GUI_X11
static void
messageFromNetbeans(XtPointer clientData UNUSED,
int *unused1 UNUSED,
@@ -2937,7 +2937,7 @@ netbeans_gui_register(void)
if (!NB_HAS_GUI || !NETBEANS_OPEN)
return;
# ifdef FEAT_GUI_MOTIF
# ifdef FEAT_GUI_X11
/* tell notifier we are interested in being called
* when there is input on the editor connection socket
*/
@@ -3027,7 +3027,7 @@ netbeans_send_disconnect()
}
}
#if defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_W32) || defined(PROTO)
#if defined(FEAT_GUI_X11) || defined(FEAT_GUI_W32) || defined(PROTO)
/*
* Tell netbeans that the window was moved or resized.
*/
@@ -3458,7 +3458,7 @@ netbeans_is_guarded(linenr_T top, linenr_T bot)
return FALSE;
}
#if defined(FEAT_GUI_MOTIF) || defined(PROTO)
#if defined(FEAT_GUI_X11) || defined(PROTO)
/*
* We have multiple signs to draw at the same location. Draw the
* multi-sign indicator instead. This is the Motif version.
@@ -3487,7 +3487,7 @@ netbeans_draw_multisign_indicator(int row)
XDrawPoint(gui.dpy, gui.wid, gui.text_gc, x+3, y++);
XDrawPoint(gui.dpy, gui.wid, gui.text_gc, x+2, y);
}
#endif /* FEAT_GUI_MOTIF */
#endif /* FEAT_GUI_X11 */
#if defined(FEAT_GUI_GTK) && !defined(PROTO)
/*