updated for version 7.3.016
Problem: Netbeans doesn't work under Athena.
Solution: Support Athena, just like Motif. (Xavier de Gaye)
diff --git a/src/netbeans.c b/src/netbeans.c
index d75fcbb..f39111d 100644
--- a/src/netbeans.c
+++ b/src/netbeans.c
@@ -87,7 +87,7 @@
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 @@
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_send_disconnect();
-#ifdef FEAT_GUI_MOTIF
+#ifdef FEAT_GUI_X11
if (inputHandler != (XtInputId)NULL)
{
XtRemoveInput(inputHandler);
@@ -700,7 +700,7 @@
/*
* 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 @@
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 @@
}
}
-#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 @@
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 @@
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)
/*