vim: src/netbeans.c comparison

comparison src/netbeans.c @ 2210:8c6a66e2b3cc vim73

Add :nbstart and :nbclose.

author	Bram Moolenaar <bram@vim.org>
date	Sat, 22 May 2010 21:34:09 +0200
parents	d0ddf7ba1630
children	0e0e99d1092e

comparison

equal deleted inserted replaced

-:d0ddf7ba1630
+:8c6a66e2b3cc
 #endif
 #include "vim.h"
 #if defined(FEAT_NETBEANS_INTG) || defined(PROTO)
+/* TODO: when should this not be defined? */
+#define INET_SOCKETS
 /* Note: when making changes here also adjust configure.in. */
 #ifdef WIN32
 # ifdef DEBUG
 #  include <tchar.h>	/* for _T definition for TRACEn macros */
 # define sock_write(sd, buf, len) send(sd, buf, len, 0)
 # define sock_read(sd, buf, len) recv(sd, buf, len, 0)
 # define sock_close(sd) closesocket(sd)
 # define sleep(t) Sleep(t*1000) /* WinAPI Sleep() accepts milliseconds */
 #else
-# include <netdb.h>
+# ifdef INET_SOCKETS
-# include <netinet/in.h>
+#  include <netdb.h>
+#  include <netinet/in.h>
+# else
+#  include <sys/un.h>
+# endif
 # include <sys/socket.h>
 # ifdef HAVE_LIBGEN_H
 #  include <libgen.h>
 # endif
 # define sock_errno errno
 # define sock_close(sd) close(sd)
 #endif
 #include "version.h"
-#define INET_SOCKETS
 #define GUARDED		10000 /* typenr for "guarded" annotation */
 #define GUARDEDOFFSET 1000000 /* base for "guarded" sign id's */
 #define MAX_COLOR_LENGTH 32 /* max length of color name in defineAnnoType */
 /* The first implementation (working only with Netbeans) returned "1.1".  The
 static long get_buf_size __ARGS((buf_T *));
 static int netbeans_keystring __ARGS((char_u *keystr));
 static void postpone_keycommand __ARGS((char_u *keystr));
 static void special_keys __ARGS((char_u *args));
-static void netbeans_connect __ARGS((void));
+static int netbeans_connect __ARGS((char *, int));
 static int getConnInfo __ARGS((char *file, char **host, char **port, char **password));
 static void nb_init_graphics __ARGS((void));
 static void coloncmd __ARGS((char *cmd, ...));
 static void nb_set_curbuf __ARGS((buf_T *buf));
 static void messageFromNetbeans __ARGS((gpointer, gint, GdkInputCondition));
 #endif
 static void nb_parse_cmd __ARGS((char_u *));
 static int  nb_do_cmd __ARGS((int, char_u *, int, int, char_u *));
 static void nb_send __ARGS((char *buf, char *fun));
+static void nb_free __ARGS((void));
 /* TRUE when netbeans is running with a GUI. */
 #ifdef FEAT_GUI
 # define NB_HAS_GUI (gui.in_use || gui.starting)
 #endif
 typedef __int64 NBSOCK;
 #else
 typedef int NBSOCK;
 #endif
-static NBSOCK sd = -1;			/* socket fd for Netbeans connection */
+static NBSOCK nbsock = -1;		/* socket fd for Netbeans connection */
+#define NETBEANS_OPEN (nbsock != -1)
 #ifdef FEAT_GUI_MOTIF
-static XtInputId inputHandler;		/* Cookie for input */
+static XtInputId inputHandler = (XtInputId)NULL;  /* Cookie for input */
 #endif
 #ifdef FEAT_GUI_GTK
-static gint inputHandler;		/* Cookie for input */
+static gint inputHandler = 0;		/* Cookie for input */
 #endif
 #ifdef FEAT_GUI_W32
 static int  inputHandler = -1;		/* simply ret.value of WSAAsyncSelect() */
 extern HWND s_hwnd;			/* Gvim's Window handle */
 #endif
 static int r_cmdno;			/* current command number for reply */
-static int haveConnection = FALSE;	/* socket is connected and
-					   initialization is done */
 static int dosetvisible = FALSE;
 /*
 * Include the debugging code if wanted.
 */
 #ifdef NBDEBUG
 # include "nbdebug.c"
 #endif
-/* Connect back to Netbeans process */
+static int needupdate = 0;
+static int inAtomic = 0;
 static void
-netbeans_disconnect(void)
+netbeans_close(void)
 {
+if (!NETBEANS_OPEN)
+	return;
+netbeans_send_disconnect();
 #ifdef FEAT_GUI_MOTIF
 if (inputHandler != (XtInputId)NULL)
 {
 	XtRemoveInput(inputHandler);
 	inputHandler = (XtInputId)NULL;
 }
 # else
 #  ifdef FEAT_GUI_W32
 if (inputHandler == 0)
 {
-	WSAAsyncSelect(sd, s_hwnd, 0, 0);
+	WSAAsyncSelect(nbsock, s_hwnd, 0, 0);
 	inputHandler = -1;
 }
 #  endif
 # endif
 #endif
-sd = -1;
-haveConnection = FALSE;
 #ifdef FEAT_BEVAL
 bevalServers &= ~BEVAL_NETBEANS;
+#endif
+sock_close(nbsock);
+nbsock = -1;
+needupdate = 0;
+inAtomic = 0;
+nb_free();
+/* remove all signs and update the screen after gutter removal */
+coloncmd(":sign unplace *");
+changed_window_setting();
+update_screen(CLEAR);
+setcursor();
+out_flush();
+#ifdef FEAT_GUI
+gui_update_cursor(TRUE, FALSE);
+gui_mch_flush();
 #endif
 }
 #define NB_DEF_HOST "localhost"
 #define NB_DEF_ADDR "3219"
 #define NB_DEF_PASS "changeme"
-static void
+static int
-netbeans_connect(void)
+netbeans_connect(char *params, int abort)
 {
 #ifdef INET_SOCKETS
 struct sockaddr_in	server;
 struct hostent *	host;
 # ifdef FEAT_GUI_W32
 int			port;
 # endif
 #else
 struct sockaddr_un	server;
 #endif
+int		sd;
 char	buf[32];
 char	*hostname = NULL;
 char	*address = NULL;
 char	*password = NULL;
 char	*fname;
 char	*arg = NULL;
-if (netbeansArg[3] == '=')
+if (*params == '=')
 {
-	/* "-nb=fname": Read info from specified file. */
+	/* "=fname": Read info from specified file. */
-	if (getConnInfo(netbeansArg + 4, &hostname, &address, &password)
+	if (getConnInfo(params + 1, &hostname, &address, &password)
 								      == FAIL)
-	    return;
+	    return FAIL;
 }
 else
 {
-	if (netbeansArg[3] == ':')
+	if (*params == ':')
-	    /* "-nb:<host>:<addr>:<password>": get info from argument */
+	    /* ":<host>:<addr>:<password>": get info from argument */
-	    arg = netbeansArg + 4;
+	    arg = params + 1;
 	if (arg == NULL && (fname = getenv("__NETBEANS_CONINFO")) != NULL)
 	{
-	    /* "-nb": get info from file specified in environment */
+	    /* "": get info from file specified in environment */
 	    if (getConnInfo(fname, &hostname, &address, &password) == FAIL)
-		return;
+		return FAIL;
 	}
 	else
 	{
 	    if (arg != NULL)
 	    {
-		/* "-nb:<host>:<addr>:<password>": get info from argument */
+		/* ":<host>:<addr>:<password>": get info from argument */
 		hostname = arg;
 		address = strchr(hostname, ':');
 		if (address != NULL)
 		{
 		    *address++ = '\0';
 	password = (char *)vim_strsave((char_u *)NB_DEF_PASS);
 }
 if (hostname == NULL || address == NULL || password == NULL)
 	goto theend;	    /* out of memory */
+#ifdef FEAT_GUI_W32
+netbeans_init_winsock();
+#endif
 #ifdef INET_SOCKETS
 port = atoi(address);
 if ((sd = (NBSOCK)socket(AF_INET, SOCK_STREAM, 0)) == (NBSOCK)-1)
 {
 	    sd = mch_open(hostname, O_RDONLY, 0);
 	    goto theend;
 	}
 	nbdebug(("error in gethostbyname() in netbeans_connect()\n"));
 	PERROR("gethostbyname() in netbeans_connect()");
-	sd = -1;
 	goto theend;
 }
 memcpy((char *)&server.sin_addr, host->h_addr, host->h_length);
 #else
 if ((sd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1)
 		while (retries--
 			     && ((sock_errno == ECONNREFUSED) || (sock_errno == EINTR)))
 		{
 		    nbdebug(("retrying...\n"));
 		    sleep(5);
+		    if (!abort)
+		    {
+			ui_breakcheck();
+			if (got_int)
+			{
+			    sock_errno = EINTR;
+			    break;
+			}
+		    }
 		    if (connect(sd, (struct sockaddr *)&server,
 				sizeof(server)) == 0)
 		    {
 			success = TRUE;
 			break;
 		if (!success)
 		{
 		    /* Get here when the server can't be found. */
 		    nbdebug(("Cannot connect to Netbeans #2\n"));
 		    PERROR(_("Cannot connect to Netbeans #2"));
-		    getout(1);
+		    if (abort)
+			getout(1);
+		    goto theend;
 		}
 	    }
 	}
 	else
 	{
 	    nbdebug(("Cannot connect to Netbeans\n"));
 	    PERROR(_("Cannot connect to Netbeans"));
-	    getout(1);
+	    if (abort)
-	}
+		getout(1);
-}
+	    goto theend;
+	}
+}
+nbsock = sd;
 vim_snprintf(buf, sizeof(buf), "AUTH %s\n", password);
 nb_send(buf, "netbeans_connect");
 sprintf(buf, "0:version=0 \"%s\"\n", ExtEdProtocolVersion);
 nb_send(buf, "externaleditor_version");
-/*    nb_init_graphics();  delay until needed */
-haveConnection = TRUE;
 theend:
 vim_free(hostname);
 vim_free(address);
 vim_free(password);
-return;
+return NETBEANS_OPEN ? OK : FAIL;
 }
 /*
 * Obtain the NetBeans hostname, port address and password from a file.
 * Return the strings in allocated memory.
 void
 netbeans_parse_messages(void)
 {
 char_u	*p;
 queue_T	*node;
+if (!NETBEANS_OPEN)
+	return;
 while (head.next != NULL && head.next != &head)
 {
 	node = head.next;
 # ifdef HAVE_POLL
 struct pollfd	fds;
 # endif
 #endif
-if (sd < 0)
+if (!NETBEANS_OPEN)
 {
 	nbdebug(("messageFromNetbeans() called without a socket\n"));
 	return;
 }
 * MAXMSGSIZE long. */
 for (;;)
 {
 #ifdef HAVE_SELECT
 	FD_ZERO(&rfds);
-	FD_SET(sd, &rfds);
+	FD_SET(nbsock, &rfds);
 	tval.tv_sec = 0;
 	tval.tv_usec = 0;
-	if (select(sd + 1, &rfds, NULL, NULL, &tval) <= 0)
+	if (select(nbsock + 1, &rfds, NULL, NULL, &tval) <= 0)
 	    break;
 #else
 # ifdef HAVE_POLL
-	fds.fd = sd;
+	fds.fd = nbsock;
 	fds.events = POLLIN;
 	if (poll(&fds, 1, 0) <= 0)
 	    break;
 # endif
 #endif
-	len = sock_read(sd, buf, MAXMSGSIZE);
+	len = sock_read(nbsock, buf, MAXMSGSIZE);
 	if (len <= 0)
 	    break;	/* error or nothing more to read */
 	/* Store the read message in the queue. */
 	save(buf, len);
 }
 if (readlen <= 0)
 {
 	/* read error or didn't read anything */
-	netbeans_disconnect();
+	netbeans_close();
 	nbdebug(("messageFromNetbeans: Error in read() from socket\n"));
 	if (len < 0)
 	{
 	    nbdebug(("read from Netbeans socket\n"));
 	    PERROR(_("read from Netbeans socket"));
 int		isfunc = -1;
 if (STRCMP(cmd, "DISCONNECT") == 0)
 {
 	/* We assume the server knows that we can safely exit! */
-	if (sd >= 0)
-	    sock_close(sd);
 	/* Disconnect before exiting, Motif hangs in a Select error
 	 * message otherwise. */
-	netbeans_disconnect();
+	netbeans_close();
 	getout(0);
 	/* NOTREACHED */
 }
 if (STRCMP(cmd, "DETACH") == 0)
 {
 	/* The IDE is breaking the connection. */
-	if (sd >= 0)
+	netbeans_close();
-	    sock_close(sd);
-	netbeans_disconnect();
 	return;
 }
 bufno = strtol((char *)cmd, &verb, 10);
 short_u		 signmapused;
 };
 typedef struct nbbuf_struct nbbuf_T;
-static nbbuf_T *buf_list = 0;
+static nbbuf_T *buf_list = NULL;
 static int buf_list_size = 0;	/* size of buf_list */
 static int buf_list_used = 0;	/* nr of entries in buf_list actually in use */
-static char **globalsignmap;
+static char **globalsignmap = NULL;
-static int globalsignmaplen;
+static int globalsignmaplen = 0;
-static int globalsignmapused;
+static int globalsignmapused = 0;
 static int  mapsigntype __ARGS((nbbuf_T *, int localsigntype));
 static void addsigntype __ARGS((nbbuf_T *, int localsigntype, char_u *typeName,
 			char_u *tooltip, char_u *glyphfile,
 			char_u *fg, char_u *bg));
 static void print_save_msg __ARGS((nbbuf_T *buf, long nchars));
 static int curPCtype = -1;
 /*
+* Free netbeans resources.
+*/
+static void
+nb_free()
+{
+keyQ_T *key_node = keyHead.next;
+queue_T *cmd_node = head.next;
+nbbuf_T buf;
+buf_T *bufp;
+int i;
+/* free the netbeans buffer list */
+for (i = 0; i < buf_list_used; i++)
+{
+	buf = buf_list[i];
+	vim_free(buf.displayname);
+	vim_free(buf.signmap);
+	if ((bufp=buf.bufp) != NULL)
+	{
+	    buf.bufp->b_netbeans_file = FALSE;
+	    buf.bufp->b_was_netbeans_file = FALSE;
+	}
+}
+vim_free(buf_list);
+buf_list = NULL;
+buf_list_size = 0;
+buf_list_used = 0;
+/* free the queued key commands */
+while(key_node != NULL && key_node != &keyHead)
+{
+	keyQ_T *next = key_node->next;
+	vim_free(key_node->keystr);
+	vim_free(key_node);
+	if (next == &keyHead)
+	{
+	    keyHead.next = &keyHead;
+	    keyHead.prev = &keyHead;
+	    break;
+	}
+	key_node = next;
+}
+/* free the queued netbeans commands */
+while(cmd_node != NULL && cmd_node != &head)
+{
+	queue_T *next = cmd_node->next;
+	vim_free(cmd_node->buffer);
+	vim_free(cmd_node);
+	if (next == &head)
+	{
+	    head.next = &head;
+	    head.prev = &head;
+	    break;
+	}
+	cmd_node = next;
+}
+}
+/*
 * Get the Netbeans buffer number for the specified buffer.
 */
 static int
 nb_getbufno(buf_T *bufp)
 {
 * Is this a NetBeans-owned buffer?
 */
 int
 isNetbeansBuffer(buf_T *bufp)
 {
-return usingNetbeans && bufp->b_netbeans_file;
+return NETBEANS_OPEN && bufp->b_netbeans_file;
 }
 /*
 * NetBeans and Vim have different undo models. In Vim, the file isn't
 * changed if changes are undone via the undo command. In NetBeans, once
 * unmodified but NetBeans thinks it IS modified.
 */
 int
 isNetbeansModified(buf_T *bufp)
 {
-if (usingNetbeans && bufp->b_netbeans_file)
+if (isNetbeansBuffer(bufp))
 {
 	int bufno = nb_getbufno(bufp);
 	if (bufno > 0)
 	    return buf_list[bufno].modified;
 netbeans_end(void)
 {
 int i;
 static char buf[128];
-if (!haveConnection)
+if (!NETBEANS_OPEN)
 	return;
 for (i = 0; i < buf_list_used; i++)
 {
 	if (!buf_list[i].bufp)
 	    nbdebug(("EVT: %s", buf));
 	    nb_send(buf, "netbeans_end");
 	}
 	sprintf(buf, "%d:killed=%d\n", i, r_cmdno);
 	nbdebug(("EVT: %s", buf));
-/*	nb_send(buf, "netbeans_end");    avoid "write failed" messages */
+	/* nb_send(buf, "netbeans_end");    avoid "write failed" messages */
-	if (sd >= 0)
+	ignored = sock_write(nbsock, buf, (int)STRLEN(buf));
-	    ignored = sock_write(sd, buf, (int)STRLEN(buf));
 }
 }
 /*
 * Send a message to netbeans.
 {
 /* Avoid giving pages full of error messages when the other side has
 * exited, only mention the first error until the connection works again. */
 static int did_error = FALSE;
-if (sd < 0)
+if (!NETBEANS_OPEN)
 {
 	if (!did_error)
 	{
 	    nbdebug(("    %s(): write while not connected\n", fun));
 	    EMSG2("E630: %s(): write while not connected", fun);
 	}
 	did_error = TRUE;
 }
-else if (sock_write(sd, buf, (int)STRLEN(buf)) != (int)STRLEN(buf))
+else if (sock_write(nbsock, buf, (int)STRLEN(buf)) != (int)STRLEN(buf))
 {
 	if (!did_error)
 	{
 	    nbdebug(("    %s(): write failed\n", fun));
 	    EMSG2("E631: %s(): write failed", fun);
 static void
 nb_reply_nil(int cmdno)
 {
 char reply[32];
-if (!haveConnection)
-	return;
 nbdebug(("REP %d: <none>\n", cmdno));
 sprintf(reply, "%d\n", cmdno);
 nb_send(reply, "nb_reply_nil");
 }
 */
 static void
 nb_reply_text(int cmdno, char_u *result)
 {
 char_u *reply;
-if (!haveConnection)
-	return;
 nbdebug(("REP %d: %s\n", cmdno, (char *)result));
 reply = alloc((unsigned)STRLEN(result) + 32);
 sprintf((char *)reply, "%d %s\n", cmdno, (char *)result);
 */
 static void
 nb_reply_nr(int cmdno, long result)
 {
 char reply[32];
-if (!haveConnection)
-	return;
 nbdebug(("REP %d: %ld\n", cmdno, result));
 sprintf(reply, "%d %ld\n", cmdno, result);
 nb_send(reply, "nb_reply_nr");
 }
 }
 #define SKIP_STOP 2
 #define streq(a,b) (strcmp(a,b) == 0)
-static int needupdate = 0;
-static int inAtomic = 0;
 /*
 * Do the actual processing of a single netbeans command or function.
 * The difference between a command and function is that a function
 * gets a response (it's required) but a command does not.
 	tok = strtok(NULL, " ");
 }
 vim_free(save_str);
 }
+void
+ex_nbclose(eap)
+exarg_T	*eap UNUSED;
+{
+netbeans_close();
+}
 void
 ex_nbkey(eap)
 exarg_T	*eap;
 {
 (void)netbeans_keystring(eap->arg);
 }
+void
+ex_nbstart(eap)
+exarg_T	*eap;
+{
+netbeans_open((char *)eap->arg, FALSE);
+}
 /*
 * Initialize highlights and signs for use by netbeans  (mostly obsolete)
 */
 static void
 char	buf[MAXPATHL * 2 + 25];
 char_u	*p;
 /* Don't do anything when 'ballooneval' is off, messages scrolled the
 * windows up or we have no connection. */
-if (!p_beval || msg_scrolled > 0 || !haveConnection)
+if (!p_beval || msg_scrolled > 0 || !NETBEANS_OPEN)
 	return;
 if (get_beval_info(beval, TRUE, &wp, &lnum, &text, &col) == OK)
 {
 	/* Send debugger request.  Only when the text is of reasonable
 }
 }
 #endif
 /*
+* Return TRUE when the netbeans connection is closed.
+*/
+int
+netbeans_active(void)
+{
+return NETBEANS_OPEN;
+}
+/*
 * Return netbeans file descriptor.
 */
 int
-netbeans_filedesc (void)
+netbeans_filedesc(void)
 {
-return sd;
+return nbsock;
 }
 #if defined(FEAT_GUI) || defined(PROTO)
 /*
 * Register our file descriptor with the gui event handling system.
 */
 void
 netbeans_gui_register(void)
 {
-if (!NB_HAS_GUI)
+if (!NB_HAS_GUI || !NETBEANS_OPEN)
 	return;
-if (sd > 0)
-{
 # ifdef FEAT_GUI_MOTIF
-	/* tell notifier we are interested in being called
+/* tell notifier we are interested in being called
-	 * when there is input on the editor connection socket
+* when there is input on the editor connection socket
-	 */
+*/
-	if (inputHandler == (XtInputId)NULL)
+if (inputHandler == (XtInputId)NULL)
-	    inputHandler = XtAppAddInput((XtAppContext)app_context, sd,
+	inputHandler = XtAppAddInput((XtAppContext)app_context, nbsock,
-			     (XtPointer)(XtInputReadMask + XtInputExceptMask),
+			 (XtPointer)(XtInputReadMask + XtInputExceptMask),
-						   messageFromNetbeans, NULL);
+					       messageFromNetbeans, NULL);
 # else
 #  ifdef FEAT_GUI_GTK
-	/*
+/*
-	 * Tell gdk we are interested in being called when there
+* Tell gdk we are interested in being called when there
-	 * is input on the editor connection socket
+* is input on the editor connection socket
-	 */
+*/
-	if (inputHandler == 0)
+if (inputHandler == 0)
-	    inputHandler = gdk_input_add((gint)sd, (GdkInputCondition)
+	inputHandler = gdk_input_add((gint)nbsock, (GdkInputCondition)
-		((int)GDK_INPUT_READ + (int)GDK_INPUT_EXCEPTION),
+	    ((int)GDK_INPUT_READ + (int)GDK_INPUT_EXCEPTION),
-						   messageFromNetbeans, NULL);
+					       messageFromNetbeans, NULL);
 #  else
 #   ifdef FEAT_GUI_W32
-	/*
+/*
-	 * Tell Windows we are interested in receiving message when there
+* Tell Windows we are interested in receiving message when there
-	 * is input on the editor connection socket
+* is input on the editor connection socket
-	 */
+*/
-	if (inputHandler == -1)
+if (inputHandler == -1)
-	    inputHandler = WSAAsyncSelect(sd, s_hwnd, WM_NETBEANS, FD_READ);
+	inputHandler = WSAAsyncSelect(nbsock, s_hwnd, WM_NETBEANS, FD_READ);
 #   endif
 #  endif
 # endif
-}
 # ifdef FEAT_BEVAL
 bevalServers |= BEVAL_NETBEANS;
 # endif
 }
 /*
 * Tell netbeans that the window was opened, ready for commands.
 */
 void
-netbeans_startup_done(void)
+netbeans_open(char *params, int abort)
 {
 char *cmd = "0:startupDone=0\n";
-if (!usingNetbeans)
+if (NETBEANS_OPEN)
+{
+	EMSG(_("E511: netbeans already connected"));
 	return;
+}
-netbeans_connect();
-if (!haveConnection)
+if (netbeans_connect(params, abort) != OK)
 	return;
 #ifdef FEAT_GUI
 netbeans_gui_register();
 #endif
 nbdebug(("EVT: %s", cmd));
 nb_send(cmd, "netbeans_startup_done");
+/* update the screen after having added the gutter */
+changed_window_setting();
+update_screen(CLEAR);
+setcursor();
+out_flush();
+#ifdef FEAT_GUI
+gui_update_cursor(TRUE, FALSE);
+gui_mch_flush();
+#endif
 }
 /*
 * Tell netbeans that we're exiting. This should be called right
 * before calling exit.
 void
 netbeans_send_disconnect()
 {
 char buf[128];
-if (haveConnection)
+if (NETBEANS_OPEN)
 {
 	sprintf(buf, "0:disconnect=%d\n", r_cmdno);
 	nbdebug(("EVT: %s", buf));
 	nb_send(buf, "netbeans_disconnect");
 }
 void
 netbeans_frame_moved(int new_x, int new_y)
 {
 char buf[128];
-if (!haveConnection)
+if (!NETBEANS_OPEN)
 	return;
 sprintf(buf, "0:geometry=%d %d %d %d %d\n",
 		    r_cmdno, (int)Columns, (int)Rows, new_x, new_y);
 /*nbdebug(("EVT: %s", buf)); happens too many times during a move */
 int bufno = nb_getbufno(bufp);
 nbbuf_T *bp = nb_get_buf(bufno);
 char    buffer[2*MAXPATHL];
 char_u  *q;
-if (!haveConnection || dosetvisible)
+if (!NETBEANS_OPEN || !bufp->b_netbeans_file || dosetvisible)
 	return;
 q = nb_quote(bufp->b_ffname);
 if (q == NULL || bp == NULL)
 	return;
 char    buffer[2*MAXPATHL];
 char_u  *q;
 nbbuf_T *bp = nb_get_buf(nb_getbufno(bufp));
 int	    bnum;
-if (!haveConnection)
+if (!NETBEANS_OPEN)
 	return;
 q = nb_quote(bufp->b_ffname);
 if (q == NULL)
 	return;
 {
 int		bufno = nb_getbufno(bufp);
 nbbuf_T	*nbbuf = nb_get_buf(bufno);
 char	buffer[2*MAXPATHL];
-if (!haveConnection || bufno == -1)
+if (!NETBEANS_OPEN || bufno == -1)
 	return;
 nbdebug(("netbeans_file_killed:\n"));
 nbdebug(("    Killing bufno: %d", bufno));
 nb_bufp2nbbuf_fire(buf_T *bufp, int *bufnop)
 {
 int		bufno;
 nbbuf_T	*nbbuf;
-if (!haveConnection || !netbeansFireChanges)
+if (!NETBEANS_OPEN || !netbeansFireChanges)
 	return NULL;		/* changes are not reported at all */
 bufno = nb_getbufno(bufp);
 if (bufno <= 0)
 	return NULL;		/* file is not known to NetBeans */
 pos_T	pos;
 long	off;
 char_u	*p;
 char_u	*newtxt;
+if (!NETBEANS_OPEN)
+	return;
 nbbuf = nb_bufp2nbbuf_fire(bufp, &bufno);
 if (nbbuf == NULL)
 	return;
 /* Don't mark as modified for initial read */
 int		bufno;
 nbbuf_T	*nbbuf;
 pos_T	pos;
 long	off;
+if (!NETBEANS_OPEN)
+	return;
 nbbuf = nb_bufp2nbbuf_fire(bufp, &bufno);
 if (nbbuf == NULL)
 	return;
 if (len < 0)
 * Send netbeans an unmodified command.
 */
 void
 netbeans_unmodified(buf_T *bufp UNUSED)
 {
+if (!NETBEANS_OPEN)
+	return;
 #if 0
 char_u	buf[128];
 int		bufno;
 nbbuf_T	*nbbuf;
 netbeans_button_release(int button)
 {
 char	buf[128];
 int		bufno;
+if (!NETBEANS_OPEN)
+	return;
 bufno = nb_getbufno(curbuf);
 if (bufno >= 0 && curwin != NULL && curwin->w_buffer == curbuf)
 {
 	int col = mouse_col - W_WINCOL(curwin)
 char	buf[2*MAXPATHL];
 int		bufno = nb_getbufno(curbuf);
 long	off;
 char_u	*q;
-if (!haveConnection)
+if (!NETBEANS_OPEN)
 	return TRUE;
 if (bufno == -1)
 {
 	nbdebug(("got keycommand for non-NetBeans buffer, opening...\n"));
 	q = curbuf->b_ffname == NULL ? (char_u *)""
 {
 char_u	buf[64];
 int		bufno;
 nbbuf_T	*nbbuf;
+if (!NETBEANS_OPEN)
+	return;
 nbbuf = nb_bufp2nbbuf_fire(bufp, &bufno);
 if (nbbuf == NULL)
 	return;
 nbbuf->modified = 0;
 {
 char_u	buf[64];
 int		bufno;
 nbbuf_T	*nbbuf;
+if (!NETBEANS_OPEN)
+	return;
 nbbuf = nb_bufp2nbbuf_fire(bufp, &bufno);
 if (nbbuf == NULL)
 	return;
 /* Don't mark as modified for initial read */
 int
 netbeans_is_guarded(linenr_T top, linenr_T bot)
 {
 signlist_T	*p;
 int		lnum;
+if (!NETBEANS_OPEN)
+	return FALSE;
 for (p = curbuf->b_signlist; p != NULL; p = p->next)
 	if (p->id >= GUARDEDOFFSET)
 	    for (lnum = top + 1; lnum < bot; lnum++)
 		if (lnum == p->lnum)
 netbeans_draw_multisign_indicator(int row)
 {
 int i;
 int y;
 int x;
+if (!NETBEANS_OPEN)
+	return;
 x = 0;
 y = row * gui.char_height + 2;
 for (i = 0; i < gui.char_height - 3; i++)
 int i;
 int y;
 int x;
 GdkDrawable *drawable = gui.drawarea->window;
+if (!NETBEANS_OPEN)
+	return;
 x = 0;
 y = row * gui.char_height + 2;
 for (i = 0; i < gui.char_height - 3; i++)
 	gdk_draw_point(drawable, gui.text_gc, x+2, y++);
 */
 void
 netbeans_gutter_click(linenr_T lnum)
 {
 signlist_T	*p;
+if (!NETBEANS_OPEN)
+	return;
 for (p = curbuf->b_signlist; p != NULL; p = p->next)
 {
 	if (p->lnum == lnum && p->next && p->next->lnum == lnum)
 	{

Mercurial > vim

comparison src/netbeans.c @ 2210:8c6a66e2b3cc vim73